working on the bonmin interface

coin-or · Dec 20, 2017 · 5555a53 · 5555a53
1 parent 6ebc7f9
commit 5555a53
Show file tree

Hide file tree

Showing 10 changed files with 554 additions and 217 deletions.
diff --git a/README.md b/README.md
@@ -23,6 +23,10 @@ Hassan Hijazi, Los Alamos National Laboratory, The Australian National Universit
 
 Guanglei Wang, The Australian National University | guanglei.wang@anu.edu.au
 
+Ksenia Bestuzheva, The Australian National University | k_best_7@mail.ru
+
+Carleton Coffrin, Los Alamos National Laboratory,| cjc@lanl.gov
+
 *****************************
 See [INSTALL.md](INSTALL.md) for instructions on compiling Gravity
 

diff --git a/cmake/FindBONMIN.cmake b/cmake/FindBONMIN.cmake
@@ -1,4 +1,4 @@
-set(BONMIN_ROOT_DIR "/home/kbestuzheva/Bonmin-1.8.4" CACHE PATH "BONMIN root directory.")
+set(BONMIN_ROOT_DIR "$ENV{BONMIN_ROOT_DIR}" CACHE PATH "BONMIN root directory.")
 
 message("Looking for Bonmin in ${BONMIN_ROOT_DIR}")
 

diff --git a/include/gravity/BonminProgram.h b/include/gravity/BonminProgram.h
@@ -5,11 +5,12 @@
 #include <coin/BonTMINLP.hpp>
 #include <coin/IpIpoptApplication.hpp>
 #include <coin/IpTNLP.hpp>
-#include <Gravity/model.h>
+#include <gravity/model.h>
 
 using   Ipopt::IpoptApplication;
 using namespace  Ipopt;
 using namespace Bonmin;
+using namespace gravity;
 
 class BonminProgram : public TMINLP {
 public:
@@ -67,12 +68,9 @@ class BonminProgram : public TMINLP {
                         Index* jCol, Number* values);
 
     /** Method called by Ipopt */
-    virtual void finalize_solution(
-            TMINLP::SolverReturn              status    ,
-            Index                             n         ,
-            const Number*                     x         ,
-            Number                            obj_value
-    );
+    virtual void finalize_solution(TMINLP::SolverReturn status,
+                                   Index n, const Number* x, Number obj_value);
+
 
     virtual bool get_variables_linearity(Index n, TNLP::LinearityType* var_types);
     virtual bool get_constraints_linearity(Index m, TNLP::LinearityType* const_types);

diff --git a/include/gravity/IpoptProgram.h b/include/gravity/IpoptProgram.h
@@ -1,13 +1,9 @@
 //
 //  IpoptProgram.h
-//  PowerTools++
-//
-//  Created by Hassan on 30/01/2015.
-//  Copyright (c) 2015 NICTA. All rights reserved.
 //
 
-#ifndef __PowerTools____IpoptProgram__
-#define __PowerTools____IpoptProgram__
+#ifndef __Gravity____IpoptProgram__
+#define __Gravity____IpoptProgram__
 
 #include <stdio.h>
 #include <assert.h>
@@ -101,4 +97,4 @@ class IpoptProgram : public TNLP {
 
 
 
-#endif /* defined(__PowerTools____IpoptProgram__) */
+#endif /* defined(__Gravity____IpoptProgram__) */
diff --git a/include/gravity/func.h b/include/gravity/func.h
@@ -105,6 +105,7 @@ namespace gravity {
         }
 
         string to_str() const;
+        string to_str(size_t) const;
         void print(bool endline = true) const;
         func_ get_derivative(const param_ &v) const;
         vector<shared_ptr<param_>> get_nl_vars() const;
@@ -185,8 +186,18 @@ namespace gravity {
 
 
         string to_str() const;
+        string to_str(size_t) const;
+        void print(size_t inst) const{
+            cout << to_str(inst) << endl;
+        }
+        void print_expanded() const{
+            auto nb_inst = get_nb_instances();
+            for (unsigned inst = 0; inst<nb_inst; inst++) {
+                print(inst);
+            }
+        }
 
-        void print(bool endline = true) const;
+        void print() const;
 
         void print_tree() const;
 
@@ -1572,7 +1583,8 @@ namespace gravity {
         Real eval(){ return eval(0);};
         string to_str(bool display_input=false) const;
         void print(bool endline=false, bool display_input=false);
-
+        void print(size_t index);
+
     };
 
 
@@ -1590,6 +1602,7 @@ namespace gravity {
     void poly_print(const constant_* c);
 
     string poly_to_str(const constant_* c);
+    string poly_to_str(const constant_* c, size_t inst);
 
 
     func_ operator+(const constant_& c1, const constant_& c2);

diff --git a/include/gravity/param.h b/include/gravity/param.h
@@ -89,6 +89,19 @@ class param_: public constant_ {
     void set_name(const string s) {
         _name = s;
     };
+
+    string get_name(size_t inst) const {
+        string name = _name;
+        if (_is_indexed) {
+            name += to_string(_ids->at(inst));
+        }
+        else {
+            name += to_string(inst);
+        }
+        return name;
+    };
+
+
     NType get_intype() const {
         return _intype;
     }
@@ -1366,10 +1379,21 @@ class param: public param_ {
     }
 
     /** Output */
-    void print(bool vals=false) const {
-        cout << this->to_str(vals);
+
+
+    string to_str(size_t index) const {
+        if (_is_indexed) {
+            return to_string(_val->at(_ids->at(index)));
+        }
+        else {
+            return to_string(_val->at(index));
+        }
     }
 
+    void print(size_t index) const {
+        cout << to_str(index);
+    }
+
     string to_str(bool vals=false) const {
         string str = get_name();
         if (vals) {
@@ -1380,18 +1404,14 @@ class param: public param_ {
             }
             str += "];\n";
         }
-//        if(vals) {
-//            str += " = [ ";
-//            for(int i = 0 ; i < get_dim(); i++) {
-//                str += "(" + ;
-//                str += std::to_string(eval(i));
-//                str += " ";
-//            }
-//            str += "];";
-//        }
         return str;
     }
 
+    void print(bool vals=false) const {
+        cout << this->to_str(vals);
+    }
+
+
     type getvalue() const {
         if (_is_indexed) {
             return (_val->at(_indices->begin()->second));