genmodel 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c41eeea8b7f2265cd0c278a3e8f2a8518d02668
-  data.tar.gz: 32eaa70d402fafccd1df954fdb27cca2877ac306
+  metadata.gz: cb21eb0a2b3bee9704f777ba8eb6fdfc5dc201f3
+  data.tar.gz: b57e970b21c5174c0764cf002c9871c09f22f25f
 SHA512:
-  metadata.gz: 7475fef619b7ab809715a21052e3428ac58d4917d950c1e8cc92226c4d6c860b5def07ec3c12ca30047b53d1bbc8baaabbe9171c4bb1c3f6e9df01b7708b9ad6
-  data.tar.gz: 82b145b848170c03d13ddcc957fe0f8b070eb01fe998bd51ae1c90984a3a735b53540b18f827a109e56d1ace293cfd52c3281b2d5ce2045ba09593526bef24f2
+  metadata.gz: a6363350698cb2401603dbe2cd47c05e43ea3c14ba7e65319c878b34c636d83b291f8fe6de3158eb7c4a73097a66f9661f2bc3b02dc69d8cc8aae73c10018942
+  data.tar.gz: 28389755879adbf16ec35fb859d5d0141b07ea89eecbbcaeb50ac611a540bcebb85144615334ab963dff75e994d90c050a778f0202b13f2fa361423038eaba38

data/ext/Genmodel/GenModelCplex.cpp

@@ -597,7 +597,7 @@ long GenModelCplex::Init(string name)
     }
     
     // General settings
-    boolParam["log_output_stdout"] = true;
+    //boolParam["log_output_stdout"] = true;
     SetParam("log_output_stdout", CPX_PARAM_SCRIND, "bool", "Failure to turn on/off log output to stdout");
     SetParam("log_level", 0, "long", "Failure to set log level", false);
     SetParam("use_data_checking", CPX_PARAM_DATACHECK, "bool", "Failure to turn on/off data checking");

data/ext/Genmodel/GenModelOsi.cpp

@@ -19,6 +19,11 @@
 
 using namespace std;
 
+void printmsg(char* msg, GenModelOsi* p)
+{
+    if(false && p->boolParam.count("log_output_stdout") > 0 && p->boolParam["log_output_stdout"])
+        printf("%s", msg);
+}
 
 long GenModelOsi::WriteProblemToLpFile(string filename)
 {
@@ -48,6 +53,7 @@ long GenModelOsi::WriteSolutionToFile(string filename)
 
 long GenModelOsi::Solve()
 {
+    char tmp[4096];
     if(!bcreated)
         throw string("WriteSolutionToFile() not available : Problem not created yet;");
     OsiData* d = static_cast<OsiData*>(solverdata);
@@ -217,40 +223,56 @@ long GenModelOsi::Solve()
     // If time is given then stop after that number of minutes
     if (dblParam.count("time_limit") > 0)
     {
-        printf("Stopping after %f seconds\n", dblParam["time_limit"]);
+        snprintf(tmp,4096,"Stopping after %f seconds\n", dblParam["time_limit"]); printmsg(tmp, this);
         d->mipmodel->setDblParam(CbcModel::CbcMaximumSeconds, dblParam["time_limit"]);
     }
 
     // Switch off most output
     if (d->mipmodel->getNumCols()<3000)
     {
-        d->mipmodel->messageHandler()->setLogLevel(1);
+        if(false && boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+            d->mipmodel->messageHandler()->setLogLevel(1);
+        else
+            d->mipmodel->messageHandler()->setLogLevel(0);
         //d->model->solver()->messageHandler()->setLogLevel(0);
     }
     else
     {
-        d->mipmodel->messageHandler()->setLogLevel(2);
-        d->mipmodel->solver()->messageHandler()->setLogLevel(1);
+        if(false && boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+        {
+            d->mipmodel->messageHandler()->setLogLevel(2);
+            //d->mipmodel->solver()->messageHandler()->setLogLevel(1);
+        }
+        else
+        {
+            d->mipmodel->messageHandler()->setLogLevel(0);
+            //d->mipmodel->solver()->messageHandler()->setLogLevel(0);
+        }
     }
-    d->mipmodel->setPrintFrequency(1);//(50);
+    
+    if(false && boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+        d->mipmodel->setPrintFrequency(1);//(50);
+    else
+        d->mipmodel->setPrintFrequency(0);
 
     double time1 = CoinCpuTime();
     
     // Do complete search
     d->mipmodel->branchAndBound();
     
-    printf(" took %f seconds, %d nodes with objective %f, %s\n",
-           CoinCpuTime()-time1, d->mipmodel->getNodeCount(), d->mipmodel->getObjValue(), (!d->mipmodel->status() ? " Finished" : " Not finished"));
+    snprintf(tmp,4096," took %f seconds, %d nodes with objective %f, %s\n",
+           CoinCpuTime()-time1, d->mipmodel->getNodeCount(), d->mipmodel->getObjValue(), (!d->mipmodel->status() ? " Finished" : " Not finished")); printmsg(tmp, this);
 
     // Print more statistics
-    printf("Cuts at root node changed objective from %f to %f\n", d->mipmodel->getContinuousObjective(), d->mipmodel->rootObjectiveAfterCuts());
+    snprintf(tmp,4096,"Cuts at root node changed objective from %f to %f\n",
+                             d->mipmodel->getContinuousObjective(), d->mipmodel->rootObjectiveAfterCuts()); printmsg(tmp, this);
     
     int numberGenerators = d->mipmodel->numberCutGenerators();
     for (int iGenerator=0;iGenerator<numberGenerators;iGenerator++)
     {
         CbcCutGenerator * generator = d->mipmodel->cutGenerator(iGenerator);
-        printf("%s was tried %d times and created %d cuts of which %d were active after adding rounds of cuts\n", generator->cutGeneratorName(),
-               generator->numberTimesEntered(),generator->numberCutsInTotal(), generator->numberCutsActive());
+        snprintf(tmp,4096,"%s was tried %d times and created %d cuts of which %d were active after adding rounds of cuts\n", generator->cutGeneratorName(),
+               generator->numberTimesEntered(),generator->numberCutsInTotal(), generator->numberCutsActive()); printmsg(tmp, this);
     }
     
     hassolution = d->mipmodel->getIntParam(CbcModel::CbcMaxNumSol) > 0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genmodel
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Mathieu Bouchard