genmodel 0.0.46 → 0.0.47

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjc5YjRiNDdhMjkyODU3NzZlMDdmODVjYWM5MjNjZWFlNWQwNDMxMw==
+    NjVhZWRiNjNiNjE5ZWE0ZWVmYzg5MzkwMmM4YjgzOGFjYzMyMTQyOQ==
   data.tar.gz: !binary |-
-    ODMxYjUxNThkMzkzNWRkNjdmOTk2ZDE4NzUxMjJjMmFiZjgzMzU1MQ==
+    NDA0YzRiYjVhNjVmZTMyNzA3NjNmNzk5Nzk3NmViMzJmNDcyYzZkNQ==
 SHA512:
   metadata.gz: !binary |-
-    NWFlMmYyMDhmYTY2N2QxZDczNTQ5MjgxZjFkODQwOWEwMGI2ODJhMzNjYjkx
-    MDFlZTkzNTczYzYzYWY1MDI0YTM4ZGRkNWJlZTAzM2NhNjg3NmUwY2I2YmZm
-    MGUyMDg3MjYzODJmMGY1YjY5MTY5MWYwYWVkMmEyMTNhNGVlMjY=
+    NjliNWYxNGM3NzgxZGM2ZDUzZDA4NWZiNTEyY2EwOGJmNmNjYmY3YjUzN2I2
+    MjUwM2Q5M2RjODJjZGU0NzU2MTFjMzlhOTkwODBjZjhhZjJmNjg5ZTc5NzEy
+    ZWRmYTM5YjgwNTczNzk5ZTI2OGU0YTM1NjJkNmUyNGNmNzA0MWI=
   data.tar.gz: !binary |-
-    MzMxMGZiOGU4MzZiNTIwYmVhOTBjYTVkNDYxZWNiZDQ2NDEwYjc2MmIzZjI4
-    OWViZTM2ZWE1YzBkNGJmZGMxOWRiMTI2MWRiYTAwOTMxZDQ2Y2U0YmVhODgx
-    MTA5NTU5YjFmYWM4Zjg2NjdjNTM1NzVkZTA3ZGEwMGIzNjRlYmU=
+    ZWJiYTU4ZDdjZGJjODhjNDM2Mzk5MjljMDFlNWUyYzY5Njk4YjAyMmZiYWU2
+    MDE4OWJlYWRmNTU3OWFmODlkZDY1YjhiZWM4ZWE5ZWU5MDNiZjIyYmYzMTgw
+    NjU0NDAxNDUyYjBmNmRlODUyMDA1ZDlmNTYyNTE4YTk1ZjI5NDI=

data/ext/Genmodel/GenModelCplex.cpp

@@ -316,36 +316,18 @@ long GenModelCplex::CreateModel()
 	}
 	status = CPXXnewrows (d->env, d->lp, nr, d->lrhs, d->sense, d->urhs, d->rname);
 	if ( status )
-	{
-		char  errmsg[1024];
-		fprintf (stderr, "Could not create new rows.\n");
-		CPXXgeterrorstring (d->env, status, errmsg);
-		fprintf (stderr, "%s", errmsg);
-		return 1;
-	}
-	//else
-		//printf("Row added!\n");
-
+		return ThrowError(getcplexerror(d->env, status)+string(". ")+string("CreateModel() : Could not create new rows"));
+	
 	if(boolParam.count("mip") > 0 && boolParam["mip"])
 		status = CPXXnewcols (d->env, d->lp, nc, d->obj, d->lb, d->ub, d->type, d->cname);
 	else
 		status = CPXXnewcols (d->env, d->lp, nc, d->obj, d->lb, d->ub, NULL, NULL);
 	if ( status )
-	{
-		char  errmsg[1024];
-		fprintf (stderr, "Could not create new cols.\n");
-		CPXXgeterrorstring (d->env, status, errmsg);
-		fprintf (stderr, "%s", errmsg);
-		return 1;
-	}
-	//status = CPXXnewcols (env, lp, nc, obj, lb, ub, NULL, colname);
-	if ( status )
-		return 1;
-	//else
-		//printf("Col added!\n");
+		return ThrowError(getcplexerror(d->env, status)+string(". ")+string("CreateModel() : Could not create new cols"));
+		
 	status = CPXXchgcoeflist (d->env, d->lp, nz, d->mat_r, d->mat_c, d->mat_v);
 	if ( status )
-		return 1;
+		return ThrowError(getcplexerror(d->env, status)+string(". ")+string("CreateModel() : Could not set coefficients"));
 
 	vector<long>::iterator iti;
 	vector<long>::iterator itj = vars.qj.begin();
@@ -577,7 +559,6 @@ string SolverInfo::inspect() const
 
 string SolverInfo::to_s() const
 {
-	char tmp[10000];
 	string _cpx_results = cpx_results;
 	string _cpx_warning = cpx_warning;
 	string _cpx_error = cpx_error;
@@ -591,8 +572,12 @@ string SolverInfo::to_s() const
   	pos = 0;
   	while((pos = _cpx_log.find("\n", pos)) != std::string::npos) { _cpx_log.replace(pos, 1, "\\n"); pos += 2; }
 
-	snprintf(tmp, 10000, 
+  	size_t buffer_size = 10000+cpx_results.size()+_cpx_warning.size()+_cpx_error.size()+_cpx_log.size();
+  	char tmp[buffer_size];
+
+	snprintf(tmp, buffer_size, 
 		"{\n"
+		"\t\"status_str\" : \"%s\",\n"
 		"\t\"relative_gap\" : \"%f\",\n"
 		"\t\"upper_bound\" : \"%f\",\n"
 		"\t\"lower_bound\" : \"%f\",\n"
@@ -617,17 +602,16 @@ string SolverInfo::to_s() const
 		"\t\"nb_user_cuts\" : %lu,\n"
 		"\t\"nb_lazy_cuts\" : %lu,\n"
 		"\t\"nb_soln_pool_cuts\" : %lu,\n"
+		"\t\"cpx_error\" : \"%s\",\n"
 		"\t\"cpx_results\" : \"%s\",\n"
 		"\t\"cpx_warning\" : \"%s\",\n"
-		"\t\"cpx_error\" : \"%s\",\n"
-		"\t\"cpx_log\" : \"%s\",\n"
-		"\t\"status_str\" : \"%s\""
+		"\t\"cpx_log\" : \"%s\"\n"
 		"}\n",
-		relative_gap,upper_bound,lower_bound,cutoff,nb_node_solved,nb_node_left,nb_threads,nb_iters,nb_solutions,nb_clique_cuts,nb_cover_cuts,nb_disjcut_cuts,
+		status_str.c_str(),relative_gap,upper_bound,lower_bound,cutoff,nb_node_solved,nb_node_left,nb_threads,nb_iters,nb_solutions,nb_clique_cuts,nb_cover_cuts,nb_disjcut_cuts,
 		nb_flow_cover_cuts,nb_flow_path_cuts,nb_fractionnal_cuts,nb_gub_cover_cuts,nb_implied_bound_cuts,nb_lift_project_cuts,nb_flow_mc_flow_cuts,nb_flow_mir_cuts,
-		nb_zero_half_cuts,nb_user_cuts,nb_lazy_cuts,nb_soln_pool_cuts,_cpx_results.c_str(),_cpx_warning.c_str(),_cpx_error.c_str(),_cpx_log.c_str(), status_str.c_str()
+		nb_zero_half_cuts,nb_user_cuts,nb_lazy_cuts,nb_soln_pool_cuts,_cpx_error.c_str(),_cpx_results.c_str(),_cpx_warning.c_str(),_cpx_log.c_str()
 	);
-	
+
 	return string(tmp);
 }
 
@@ -656,13 +640,16 @@ SolverInfo GenModelCplex::GetSolverInfo()
 
 int mip_cb(CPXCENVptr env, void *cbdata, int wherefrom, void *cbhandle)
 {
-	printf("Callback called\n");
 	GenModelCplex* pgm = static_cast<GenModelCplex*>(cbhandle);
 	CplexData* d = static_cast<CplexData*>(pgm->solverdata);
 
 	vector<vector<double> > solutions;
 	vector<double> solution_objvals;
 
+	size_t nb_clique_cuts = 0, nb_cover_cuts = 0, nb_disjcut_cuts = 0, nb_flow_cover_cuts = 0, nb_flow_path_cuts = 0, nb_fractionnal_cuts = 0, nb_gub_cover_cuts = 0, 
+			nb_implied_bound_cuts = 0, nb_lift_project_cuts = 0, nb_flow_mc_flow_cuts = 0, nb_flow_mir_cuts = 0, nb_zero_half_cuts = 0, nb_user_cuts = 0, 
+			nb_lazy_cuts = 0, nb_soln_pool_cuts = 0;
+
 	if(pgm->boolParam.count("maximize") > 0 && pgm->boolParam["maximize"])
 	{
 		CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_BEST_INTEGER, &(d->solver_info.lower_bound));
@@ -680,28 +667,60 @@ int mip_cb(CPXCENVptr env, void *cbdata, int wherefrom, void *cbhandle)
 	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_MIP_ITERATIONS_LONG, &(d->solver_info.nb_iters));
 	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_USER_THREADS, &(d->solver_info.nb_threads));
 
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_CLIQUE_COUNT, &(d->solver_info.nb_clique_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_COVER_COUNT, &(d->solver_info.nb_cover_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_DISJCUT_COUNT, &(d->solver_info.nb_disjcut_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_FLOWCOVER_COUNT, &(d->solver_info.nb_flow_cover_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_FLOWPATH_COUNT, &(d->solver_info.nb_flow_path_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_FRACCUT_COUNT, &(d->solver_info.nb_fractionnal_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_GUBCOVER_COUNT, &(d->solver_info.nb_gub_cover_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_IMPLBD_COUNT, &(d->solver_info.nb_implied_bound_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_LANDPCUT_COUNT, &(d->solver_info.nb_lift_project_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_MCFCUT_COUNT, &(d->solver_info.nb_flow_mc_flow_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_MIRCUT_COUNT, &(d->solver_info.nb_flow_mir_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_ZEROHALFCUT_COUNT, &(d->solver_info.nb_zero_half_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_USERCUT_COUNT, &(d->solver_info.nb_user_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_TABLECUT_COUNT, &(d->solver_info.nb_lazy_cuts));
-	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_SOLNPOOLCUT_COUNT, &(d->solver_info.nb_soln_pool_cuts));
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_CLIQUE_COUNT, &nb_clique_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_COVER_COUNT, &nb_cover_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_DISJCUT_COUNT, &nb_disjcut_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_FLOWCOVER_COUNT, &nb_flow_cover_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_FLOWPATH_COUNT, &nb_flow_path_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_FRACCUT_COUNT, &nb_fractionnal_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_GUBCOVER_COUNT, &nb_gub_cover_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_IMPLBD_COUNT, &nb_implied_bound_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_LANDPCUT_COUNT, &nb_lift_project_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_MCFCUT_COUNT, &nb_flow_mc_flow_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_MIRCUT_COUNT, &nb_flow_mir_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_ZEROHALFCUT_COUNT, &nb_zero_half_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_USERCUT_COUNT, &nb_user_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_TABLECUT_COUNT, &nb_lazy_cuts);
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_SOLNPOOLCUT_COUNT, &nb_soln_pool_cuts);
+
+	d->solver_info.nb_clique_cuts += nb_clique_cuts;
+	d->solver_info.nb_cover_cuts += nb_cover_cuts;
+	d->solver_info.nb_disjcut_cuts += nb_disjcut_cuts;
+	d->solver_info.nb_flow_cover_cuts += nb_flow_cover_cuts;
+	d->solver_info.nb_flow_path_cuts += nb_flow_path_cuts;
+	d->solver_info.nb_fractionnal_cuts += nb_fractionnal_cuts;
+	d->solver_info.nb_gub_cover_cuts += nb_gub_cover_cuts;
+	d->solver_info.nb_implied_bound_cuts += nb_implied_bound_cuts;
+	d->solver_info.nb_lift_project_cuts += nb_lift_project_cuts;
+	d->solver_info.nb_flow_mc_flow_cuts += nb_flow_mc_flow_cuts;
+	d->solver_info.nb_flow_mir_cuts += nb_flow_mir_cuts;
+	d->solver_info.nb_zero_half_cuts += nb_zero_half_cuts;
+	d->solver_info.nb_user_cuts += nb_user_cuts;
+	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);
 
 	if(d->stop_solver)
 		return 1;
-	
-	d->solver_info.nb_solutions = CPXXgetsolnpoolnumsolns(d->env, d->lp);
 
-	return d->original_mip_cb(env, cbdata, wherefrom, d->original_handle);
+	return 0;
+}
+
+int sol_cb (CPXCENVptr env, void *cbdata, int wherefrom, void *cbhandle, double objval, double *x, int *isfeas_p, int *useraction_p)
+{
+	GenModelCplex* pgm = static_cast<GenModelCplex*>(cbhandle);
+	CplexData* d = static_cast<CplexData*>(pgm->solverdata);
+	++(d->solver_info.nb_solutions);
+	*isfeas_p = 1;
+	*useraction_p = 0;
+	return 0;
+}
+
+int cut_cb(CPXCENVptr env, void *cbdata, int wherefrom, void *cbhandle, int *useraction_p)
+{
+	*useraction_p = CPX_CALLBACK_DEFAULT;
+	return mip_cb(env, cbdata, wherefrom, cbhandle);
 }
 
 void msg_function(void* cbhandle, const char* msg)
@@ -762,15 +781,24 @@ long GenModelCplex::Init(string name)
 
     if(boolParam.count("fill_solver_info") > 0)
     {
-    	printf("solver_info ON\n");
-    	/*status = CPXXgetmipcallbackfunc(d->env, &(d->original_mip_cb), &(d->original_handle));
-    	if (status)
-            return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to get the default mip callback function"));
+    	//printf("solver_info ON\n");
+    	// status = CPXXgetmipcallbackfunc(d->env, &(d->original_mip_cb), &(d->original_handle));
+    	// 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 = 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);
+		if (status)
+            return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the solution callback function"));
+           
 
     	CPXCHANNELptr cpxresults, cpxwarning, cpxerror, cpxlog;
     	status = CPXXgetchannels(d->env, &cpxresults, &cpxwarning, &cpxerror, &cpxlog);

metadata

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