Multi-obj: SCIP, GCG #239

Author: glebbelov

solvers/gcgmp/gcgmpcommon.cc

@@ -9,13 +9,12 @@ SCIP_DECL_PROBDELORIG(probdataDelOrigNl)
   int i;
 
   assert((*probdata)->vars != NULL || (*probdata)->nvars == 0);
-  assert((*probdata)->linconss != NULL || (*probdata)->nlinconss == 0);
+  assert((*probdata)->linconss.size() || (*probdata)->nlinconss == 0);
 
   for( i = 0; i < (*probdata)->nlinconss; ++i )
   {
     SCIP_CALL( SCIPreleaseCons(scip, &(*probdata)->linconss[i]) );
   }
-  SCIPfreeBlockMemoryArray(scip, &(*probdata)->linconss, (*probdata)->nlinconss);
 
   for( i = 0; i < (*probdata)->nvars; ++i )
   {

solvers/gcgmp/gcgmpcommon.h

@@ -1,6 +1,7 @@
 #ifndef GCGCOMMON_H
 #define GCGCOMMON_H
 
+#include <vector>
 #include <string>
 
 #include "mp/backend-to-model-api.h"
@@ -18,9 +19,9 @@ struct SCIP_ProbData
    SCIP_VAR**            vars;               /**< variables in the order given by AMPL */
    int                   nvars;              /**< number of variables */
 
-   SCIP_CONS**           linconss;           /**< linear constraints in the order given by AMPL */
-   int                   i;                  /**< shows free slot of linear constraints */
-   int                   nlinconss;          /**< number of linear constraints */
+   std::vector<SCIP_CONS*>  linconss;        /**< linear constraints in the order given by AMPL */
+   int                   i = 0;              /**< shows free slot of linear constraints */
+   int                   nlinconss = 0;      /**< number of linear constraints */
 
    gcg::PARTIALDECOMP*   decomp;             /**< user partialdecomp */
 };

solvers/gcgmp/gcgmpmodelapi.cc

@@ -6,9 +6,10 @@ namespace mp {
 void GcgModelAPI::InitProblemModificationPhase(const FlatModelInfo* flat_model_info) {
   // Allocate storage if needed:
   int n_linear_cons = flat_model_info->GetNumberOfConstraintsOfGroup(CG_Linear);
+  if (getPROBDATA()->nlinconss)
+    GCG_CCALL( SCIPfreeTransform(getSCIP()) );                  // allow model update
   getPROBDATA()->nlinconss = n_linear_cons;
-  getPROBDATA()->i = 0;
-  GCG_CCALL( SCIPallocBlockMemoryArray(getSCIP(), &getPROBDATA()->linconss, getPROBDATA()->nlinconss) );
+  getPROBDATA()->linconss.resize(n_linear_cons);
 }
 
 void GcgModelAPI::AddVariables(const VarArrayDef& v) {
@@ -43,6 +44,9 @@ void GcgModelAPI::SetLinearObjective( int iobj, const LinearObjective& lo ) {
     GCG_CCALL( SCIPsetObjsense(getSCIP(), 
                     obj::Type::MAX==lo.obj_sense() ? SCIP_OBJSENSE_MAXIMIZE : SCIP_OBJSENSE_MINIMIZE) );
     SCIP_VAR** vars = getPROBDATA()->vars;
+    for (int i = 0; i < getPROBDATA()->nvars; i++) {
+      GCG_CCALL( SCIPchgVarObj(getSCIP(), vars[i], 0.0) );          // zero out
+    }
     for (int i = 0; i < lo.num_terms(); i++) {
       GCG_CCALL( SCIPchgVarObj(getSCIP(), vars[lo.vars()[i]], lo.coefs()[i]) );
     }

solvers/scipmp/scipmpcommon.cc

@@ -7,13 +7,12 @@ SCIP_DECL_PROBDELORIG(probdataDelOrigNl)
   int i;
 
   assert((*probdata)->vars != NULL || (*probdata)->nvars == 0);
-  assert((*probdata)->linconss != NULL || (*probdata)->nlinconss == 0);
+  assert((*probdata)->linconss.size() || (*probdata)->nlinconss == 0);
 
   for( i = 0; i < (*probdata)->nlinconss; ++i )
   {
     SCIP_CALL( SCIPreleaseCons(scip, &(*probdata)->linconss[i]) );
   }
-  SCIPfreeBlockMemoryArray(scip, &(*probdata)->linconss, (*probdata)->nlinconss);
 
   for( i = 0; i < (*probdata)->nvars; ++i )
   {

solvers/scipmp/scipmpcommon.h

@@ -1,6 +1,7 @@
 #ifndef SCIPCOMMON_H
 #define SCIPCOMMON_H
 
+#include <vector>
 #include <string>
 
 #include "mp/backend-to-model-api.h"
@@ -16,9 +17,9 @@ struct SCIP_ProbData
    SCIP_VAR**            vars;               /**< variables in the order given by AMPL */
    int                   nvars;              /**< number of variables */
 
-   SCIP_CONS**           linconss;           /**< linear constraints in the order given by AMPL */
-   int                   i;                  /**< shows free slot of linear constraints */
-   int                   nlinconss;          /**< number of linear constraints */
+   std::vector<SCIP_CONS*>  linconss;        /**< linear constraints in the order given by AMPL */
+   int                   i = 0;              /**< shows free slot of linear constraints */
+   int                   nlinconss = 0;      /**< number of linear constraints */
 };
 
 namespace mp {

solvers/scipmp/scipmpmodelapi.cc

@@ -5,9 +5,10 @@ namespace mp {
 void ScipModelAPI::InitProblemModificationPhase(const FlatModelInfo* flat_model_info) {
   // Allocate storage if needed:
   int n_linear_cons = flat_model_info->GetNumberOfConstraintsOfGroup(CG_Linear);
+  if (getPROBDATA()->nlinconss)
+    SCIP_CCALL( SCIPfreeTransform(getSCIP()) );                  // allow model update
   getPROBDATA()->nlinconss = n_linear_cons;
-  getPROBDATA()->i = 0;
-  SCIP_CCALL( SCIPallocBlockMemoryArray(getSCIP(), &getPROBDATA()->linconss, getPROBDATA()->nlinconss) );
+  getPROBDATA()->linconss.resize(n_linear_cons);
 }
 
 void ScipModelAPI::AddVariables(const VarArrayDef& v) {
@@ -42,6 +43,9 @@ void ScipModelAPI::SetLinearObjective( int iobj, const LinearObjective& lo ) {
     SCIP_CCALL( SCIPsetObjsense(getSCIP(), 
                     obj::Type::MAX==lo.obj_sense() ? SCIP_OBJSENSE_MAXIMIZE : SCIP_OBJSENSE_MINIMIZE) );
     SCIP_VAR** vars = getPROBDATA()->vars;
+    for (int i = 0; i < getPROBDATA()->nvars; i++) {
+      SCIP_CCALL( SCIPchgVarObj(getSCIP(), vars[i], 0.0) );          // zero out
+    }
     for (int i = 0; i < lo.num_terms(); i++) {
       SCIP_CCALL( SCIPchgVarObj(getSCIP(), vars[lo.vars()[i]], lo.coefs()[i]) );
     }