CoMISo/NSolver: Fixed load/save of GUROBI solutions/models.

git-svn-id: http://www.openflipper.org/svnrepo/CoMISo/trunk@116 1355f012-dd97-4b2f-ae87-10fa9f823a57

CoMISo/NSolver/GUROBISolver.cc

@@ -14,6 +14,8 @@
 
 #include "GUROBISolver.hh"
 
+#include <stdexcept>
+
 //== NAMESPACES ===============================================================
 
 namespace COMISO {
@@ -138,6 +140,7 @@ solve(NProblemInterface*                  _problem,
 
     model.set(GRB_IntAttr_ModelSense, 1);
     model.setObjective(objective);
+    model.update();
 
 
     //----------------------------------------------
@@ -165,8 +168,6 @@ solve(NProblemInterface*                  _problem,
         std::cout << "Reading solution from file \"" << solution_input_path_ << "\"." << std::endl;
     }
 
-    model.optimize();
-
     //----------------------------------------------
     // 5. store result
     //----------------------------------------------
@@ -179,13 +180,22 @@ solve(NProblemInterface*                  _problem,
     }
     else
     {
-      // store loaded result
-      GurobiHelper::readSolutionVectorFromSOL(x, solution_input_path_);
+        std::cout << "Loading stored solution from \"" << solution_input_path_ << "\"." << std::endl;
+        // store loaded result
+        const size_t oldSize = x.size();
+        x.clear();
+        GurobiHelper::readSolutionVectorFromSOL(x, solution_input_path_);
+        if (oldSize != x.size()) {
+            std::cerr << "oldSize != x.size() <=> " << oldSize << " != " << x.size() << std::endl;
+            throw std::runtime_error("Loaded solution vector doesn't have expected dimension.");
+        }
     }
 
     _problem->store_result(P(x));
 
-    std::cout << "GUROBI Objective: " << model.get(GRB_DoubleAttr_ObjVal) << std::endl;
+    // ObjVal is only available if the optimize was called.
+    if (solution_input_path_.empty())
+        std::cout << "GUROBI Objective: " << model.get(GRB_DoubleAttr_ObjVal) << std::endl;
     return true;
   }
   catch(GRBException e)

CoMISo/NSolver/GurobiHelper.cc

@@ -51,9 +51,9 @@ static void moveConstantTermIntoConstrainedVariable(GRBModel &model) {
     //tmpModel.getObjective().addConstant(-constantTerm);
     model.getObjective() -= constantTerm;
 #if OUTPUT_CONSTANT_AS_CONT
-    model.addVar(constantTerm, constantTerm, 1, GRB_CONTINUOUS, "constant");
+    model.addVar(constantTerm, constantTerm, 1, GRB_CONTINUOUS, "MIQ_synthetic_constant");
 #else
-    model.addVar(1, 1, constantTerm, GRB_INTEGER, "constant");
+    model.addVar(1, 1, constantTerm, GRB_INTEGER, "MIQ_synthetic_constant");
 #endif
 }
 
@@ -144,7 +144,7 @@ void GurobiHelper::importInitialSolutionIntoModel(GRBModel &model, const std::st
 
     //moveConstantTermIntoConstrainedVariable(model);
     const double constantTerm = model.getObjective().getLinExpr().getConstant();
-    model.addVar(constantTerm, constantTerm, 0, GRB_CONTINUOUS, "constant");
+    model.addVar(constantTerm, constantTerm, 0, GRB_CONTINUOUS, "MIQ_synthetic_constant");
 
     model.update();
     model.read(fileName);
@@ -157,15 +157,15 @@ void GurobiHelper::readSolutionVectorFromSOL(std::vector<double> &out_solution_,
     //    throw std::runtime_error("Unable to open file \"" + fileName + "\".");
 
     static const boost::regex commentRe("\\s*#", boost::regex_constants::perl);
-    static const boost::regex variableRe("\\s*\\S+\\s+([-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?)", boost::regex_constants::perl);
+    static const boost::regex variableRe("\\s*(\\S+)\\s+([-+]?[0-9]*\\.?[0-9]+(?:[eE][-+]?[0-9]+)?)", boost::regex_constants::perl);
 
     std::string line;
     while (solFile) {
         std::getline(solFile, line);
         if (boost::regex_search(line, commentRe, boost::match_continuous)) continue;
         boost::smatch match;
-        if (boost::regex_search(line, match, variableRe, boost::match_continuous)) {
-            out_solution_.push_back(boost::lexical_cast<double>(match[1]));
+        if (boost::regex_search(line, match, variableRe, boost::match_continuous) && match[1] != "MIQ_synthetic_constant") {
+            out_solution_.push_back(boost::lexical_cast<double>(match[2]));
         }
     }
 }