genmodel 0.0.47 → 0.0.48

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjVhZWRiNjNiNjE5ZWE0ZWVmYzg5MzkwMmM4YjgzOGFjYzMyMTQyOQ==
+    ZGM0YjRkZTgxY2JiYWI3NzJmMmJmZGMyMjk0OWU5NzJhZjJmYTI5Ng==
   data.tar.gz: !binary |-
-    NDA0YzRiYjVhNjVmZTMyNzA3NjNmNzk5Nzk3NmViMzJmNDcyYzZkNQ==
+    NzQ5NGNmNDI4NmQzZmE4YWQxZTA0ZDVjOTQ5OWVhN2ZkZThjYmVjMw==
 SHA512:
   metadata.gz: !binary |-
-    NjliNWYxNGM3NzgxZGM2ZDUzZDA4NWZiNTEyY2EwOGJmNmNjYmY3YjUzN2I2
-    MjUwM2Q5M2RjODJjZGU0NzU2MTFjMzlhOTkwODBjZjhhZjJmNjg5ZTc5NzEy
-    ZWRmYTM5YjgwNTczNzk5ZTI2OGU0YTM1NjJkNmUyNGNmNzA0MWI=
+    YWViMjRiMWEyODJlYjA1MGUwOTQ3OWExOGQ4YTUyZGNkYTEzOWQ2OGE3NjA1
+    OGJhNzk2NDU4M2ViY2UxOTY2NjY0NzMxYjM3NWM2YjI2ODE2OTBkMjczYzA0
+    NWM5Yjk1MDdiNTU5ZGNhZDU2N2U4ZDZjZDMxYzczYjQxYWJmZTc=
   data.tar.gz: !binary |-
-    ZWJiYTU4ZDdjZGJjODhjNDM2Mzk5MjljMDFlNWUyYzY5Njk4YjAyMmZiYWU2
-    MDE4OWJlYWRmNTU3OWFmODlkZDY1YjhiZWM4ZWE5ZWU5MDNiZjIyYmYzMTgw
-    NjU0NDAxNDUyYjBmNmRlODUyMDA1ZDlmNTYyNTE4YTk1ZjI5NDI=
+    ODIxM2QwMjQ4YmQ0YWFmMmEyOGM0MGRkMzczYTg3MjFjNmIzYTM5MTY5ZTJl
+    ZGQ4NDQxNWIxMmEyYmM1ZGM1NjQ4MzAxMGMxZGE5NzQ4NDY1ODQ4NTJkMzI0
+    NTJhZGQxMTBlZmUxOWRlNzhhYTMzNTE3M2YwMTQ4ZDkwOTdmNmY=

data/ext/Genmodel/GenModelCplex.cpp

@@ -699,7 +699,7 @@ int mip_cb(CPXCENVptr env, void *cbdata, int wherefrom, void *cbhandle)
 	d->solver_info.nb_lazy_cuts += nb_lazy_cuts;
 	d->solver_info.nb_soln_pool_cuts += nb_soln_pool_cuts;
 
-	//d->solver_info.nb_solutions = CPXXgetsolnpoolnumsolns(d->env, d->lp);
+	//d->solver_info.nb_solutions += CPXXgetsolnpoolnumsolns(d->env, d->lp);
 
 	if(d->stop_solver)
 		return 1;
@@ -786,18 +786,24 @@ long GenModelCplex::Init(string name)
     	// if (status)
         // 		return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to get the default mip callback function"));
 
-        status = CPXXsetusercutcallbackfunc(d->env, cut_cb, this);
-        if (status)
-            return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the cut callback function"));
+        // status = CPXXsetusercutcallbackfunc(d->env, cut_cb, this);
+        // if (status)
+        //     return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the cut callback function"));
         
 
-		status = CPXXsetmipcallbackfunc(d->env, mip_cb, this);
-		if (status)
-            return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the mip callback function"));
+		// status = CPXXsetmipcallbackfunc(d->env, mip_cb, this);
+		// if (status)
+  //           return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the mip callback function"));
 
-        status = CPXXsetincumbentcallbackfunc(d->env, sol_cb, this);
+    	status = CPXXsetinfocallbackfunc(d->env, mip_cb, this);
 		if (status)
-            return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the solution callback function"));
+             return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the mip callback function"));
+
+        
+
+  //       status = CPXXsetincumbentcallbackfunc(d->env, sol_cb, this);
+		// if (status)
+  //           return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the solution callback function"));
            
 
     	CPXCHANNELptr cpxresults, cpxwarning, cpxerror, cpxlog;
@@ -828,6 +834,18 @@ long GenModelCplex::Init(string name)
     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");
     SetParam("nb_threads", CPX_PARAM_THREADS, "long", "Failure to set the number of threads");
+    SetParam("nb_threads", CPX_PARAM_PARALLELMODE, "long", "Failure to set the parallel mode");
+    /*
+    	-1 : Enable opportunistic parallel search mode
+    	0 : Automatic: let CPLEX decide whether to invoke deterministic or opportunistic search; default
+    	1 : Enable deterministic parallel search mode
+    */
+    SetParam("nb_threads", CPX_PARAM_MIPSEARCH, "long", "Failure to set the mip search mode");
+    /*
+    	0 : Automatic: let CPLEX choose; default
+    	1 : Apply traditional branch and cut strategy; disable dynamic search
+    	2 : Apply dynamic search
+    */
     if(boolParam.count("use_preprocessor") > 0 && !boolParam["use_preprocessor"])
 	{
         SetDirectParam(CPX_PARAM_AGGFILL, long2param(0), "long", "Failure to use preprocessor (CPX_PARAM_AGGFILL)");

metadata

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