genmodel 0.0.42 → 0.0.44

data/ext/Genmodel/GenModelCplex.cpp

@@ -10,7 +10,7 @@ string getcplexerror(CPXENVptr env, int status)
     char  errmsg[4096];
     snprintf(errmsg, 4096, "CPLEX error %d : ", status);
     string prefix = string(errmsg);
-    CPXgeterrorstring (env, status, errmsg);
+    CPXXgeterrorstring (env, status, errmsg);
     return prefix+string(errmsg);
 }
 
@@ -30,7 +30,7 @@ long GenModelCplex::WriteProblemToLpFile(string filename)
         throw string("WriteProblemToLpFile() not available : Problem not created yet;");
     
     CplexData* d = static_cast<CplexData*>(solverdata);
-    CPXwriteprob(d->env, d->lp, filename.c_str(), "LP");
+    CPXXwriteprob(d->env, d->lp, filename.c_str(), "LP");
     return 0;
 }
 
@@ -40,39 +40,52 @@ long GenModelCplex::WriteSolutionToFile(string filename)
         throw string("WriteSolutionToFile() not available : Problem not created yet;");
     
     CplexData* d = static_cast<CplexData*>(solverdata);
-    CPXsolwrite (d->env, d->lp, filename.c_str());
+    CPXXsolwrite (d->env, d->lp, filename.c_str());
     return 0;
 }
 
 long GenModelCplex::Solve()
 {
+	
     if(!bcreated)
         throw string("Solve() not available : Problem not created yet");
+    try{
 	CplexData* d = static_cast<CplexData*>(solverdata);
 	int status = 0;
     if(boolParam.count("mip") > 0 && boolParam["mip"])
-        status = CPXmipopt(d->env, d->lp);
+        status = CPXXmipopt(d->env, d->lp);
 	else if(boolParam.count("qp") > 0 && boolParam["qp"])
-		status = CPXqpopt(d->env, d->lp);
+		status = CPXXqpopt(d->env, d->lp);
 	else if(strParam.count("algo") > 0 && strParam["algo"] == "interior")
-		status = CPXbaropt(d->env, d->lp);
+		status = CPXXbaropt(d->env, d->lp);
 	else if(strParam.count("algo") > 0 && strParam["algo"] == "dual")
-		status = CPXdualopt(d->env, d->lp);
+		status = CPXXdualopt(d->env, d->lp);
 	else if(strParam.count("algo") > 0 && strParam["algo"] == "primal")
-		status = CPXprimopt(d->env, d->lp);
+		status = CPXXprimopt(d->env, d->lp);
 	else if(strParam.count("algo") > 0 && strParam["algo"] == "concurrent")
 	{
 		//printf("choosing concurrent algo\n");
-		CPXsetintparam (d->env, CPX_PARAM_LPMETHOD, CPX_ALG_CONCURRENT);
-		status = CPXlpopt(d->env, d->lp);
+		CPXXsetintparam (d->env, CPX_PARAM_LPMETHOD, CPX_ALG_CONCURRENT);
+		status = CPXXlpopt(d->env, d->lp);
 	}
 	else if(strParam.count("algo") > 0 && strParam["algo"] == "sifting")
 	{
-		CPXsetintparam (d->env, CPX_PARAM_LPMETHOD, CPX_ALG_SIFTING);
-		status = CPXlpopt(d->env, d->lp);
+		CPXXsetintparam (d->env, CPX_PARAM_LPMETHOD, CPX_ALG_SIFTING);
+		status = CPXXlpopt(d->env, d->lp);
 	}
 	else
-		status = CPXlpopt(d->env, d->lp);
+		status = CPXXlpopt(d->env, d->lp);
+	if(status)
+		ThrowError(getcplexerror(d->env, status)+string(". ")+string("Solve() : Solve failed"));
+	}
+	catch(string str)
+	{
+		throw string("Solve() error : ")+str;
+	}
+	catch(...)
+	{
+		throw ThrowError(string("Solve() : Solve failed with unknown error"));
+	}
 
 	return 0;
 }
@@ -81,6 +94,7 @@ long GenModelCplex::SetSol()
 {
     if(!bcreated)
         throw string("SetSol() not available : Problem not created yet");
+    try {
 	vars.sol.clear();
 	vars.sol.resize(vars.n,0);
 	vars.rc.clear();
@@ -102,16 +116,16 @@ long GenModelCplex::SetSol()
 	d->rcost = new double[nc];
 	d->slack = new double[nr];
 
-	int tempstat = CPXgetstat (d->env, d->lp);
+	int tempstat = CPXXgetstat (d->env, d->lp);
 	int tempfeas;
 	int tempdualfeas;
 	int temphassol;
-	int currmeth = CPXgetmethod(d->env, d->lp);
+	int currmeth = CPXXgetmethod(d->env, d->lp);
 
     
-	status = CPXsolninfo(d->env, d->lp, &currmeth, &temphassol, &tempfeas, &tempdualfeas);
+	status = CPXXsolninfo(d->env, d->lp, &currmeth, &temphassol, &tempfeas, &tempdualfeas);
     if ( status )
-        return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set set solution (CPXsolninfo)"));
+        return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set set solution (CPXXsolninfo)"));
 
 	feasible = static_cast<bool>(tempfeas);
 	dualfeasible = static_cast<bool>(tempdualfeas);
@@ -121,11 +135,11 @@ long GenModelCplex::SetSol()
 		return 0;
 
 	if(boolParam.count("mip") > 0 && boolParam["mip"])
-		status = CPXsolution (d->env, d->lp, &solstat, &objval, d->x, NULL, NULL, NULL);
+		status = CPXXsolution (d->env, d->lp, &solstat, &objval, d->x, NULL, NULL, NULL);
 	else
-		status = CPXsolution (d->env, d->lp, &solstat, &objval, d->x, d->dual, d->slack, d->rcost);
+		status = CPXXsolution (d->env, d->lp, &solstat, &objval, d->x, d->dual, d->slack, d->rcost);
     if ( status )
-        return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set set solution (CPXsolution)"));
+        return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set set solution (CPXXsolution)"));
 
 	solstat = tempstat;
 
@@ -143,6 +157,15 @@ long GenModelCplex::SetSol()
     
     if(boolParam.count("print_version") > 0 && boolParam["print_version"])
         printf("*********** Genmodel version = %s ***********\n", version.c_str());
+	}
+    catch(string str)
+	{
+		throw string("SetSol() error : ")+str;
+	}
+	catch(...)
+	{
+		throw ThrowError(string("SetSol() : Solution retrieval failed with unknown error"));
+	}
 
 	return 0;
 }
@@ -162,9 +185,9 @@ long GenModelCplex::AddCut(int* cols, double* vals, int nz, double rhs, char sen
     if(!bcreated)
         return ThrowError("AddCut() not available : Problem not created yet");
 	CplexData* d = (CplexData*)solverdata;
-	int rmatbeg = 0;
+	int64_t rmatbeg = 0;
 
-	CPXaddrows(d->env, d->lp, 0, 1, nz, &rhs, &sense, &rmatbeg, cols, vals, NULL, (char**)(&name));
+	CPXXaddrows(d->env, d->lp, 0, 1, nz, &rhs, &sense, &rmatbeg, cols, vals, NULL, (char**)(&name));
 	d->nr++;
 
 	return 0;
@@ -175,7 +198,7 @@ long GenModelCplex::AddSolverCol(vector<int>& ind, vector<double>& val, double o
     if(!bcreated)
         return ThrowError("AddSolverCol() not available : Problem not created yet");
 	AddModelCol(ind, val, obj, lb, ub, name, type);
-	AddCol(&ind[0], &val[0], int(ind.size()), obj, lb, ub, name.c_str(), type);
+	AddCol(&ind[0], &val[0], ind.size(), obj, lb, ub, name.c_str(), type);
 
 	return 0;
 }
@@ -185,7 +208,7 @@ long GenModelCplex::AddCol(int* newi, double* newcol, int nz, double obj, double
     if(!bcreated)
         return ThrowError("AddCol() not available : Problem not created yet");
 	CplexData* d = (CplexData*)solverdata;
-	int cmatbeg = 0;
+	int64_t cmatbeg = 0;
 
 	double clb = lb;
 	if(clb == numeric_limits<double>::infinity())
@@ -194,16 +217,16 @@ long GenModelCplex::AddCol(int* newi, double* newcol, int nz, double obj, double
 		clb = -CPX_INFBOUND;
 
 	double cub = ub;
-		if(cub == numeric_limits<double>::infinity())
-			cub = CPX_INFBOUND;
-		else if(cub == -numeric_limits<double>::infinity())
-			cub = -CPX_INFBOUND;
+	if(cub == numeric_limits<double>::infinity())
+		cub = CPX_INFBOUND;
+	else if(cub == -numeric_limits<double>::infinity())
+		cub = -CPX_INFBOUND;
 
-	CPXaddcols(d->env, d->lp, 1, nz, &obj, &cmatbeg, newi, newcol, &clb, &cub, (char**)(&name));
+	CPXXaddcols(d->env, d->lp, 1, nz, &obj, &cmatbeg, newi, newcol, &clb, &cub, (char**)(&name));
 	if(type != 'C')
 	{
 		int cind = d->nc;
-		CPXchgctype(d->env, d->lp, 1, &cind, &type);
+		CPXXchgctype(d->env, d->lp, 1, &cind, &type);
 	}
 	d->nc++;
 
@@ -222,9 +245,9 @@ long GenModelCplex::CreateModel()
 	d->onr = nr;
 
 	if(boolParam.count("maximize") > 0 && boolParam["maximize"])
-		CPXchgobjsen (d->env, d->lp, CPX_MAX);
+		CPXXchgobjsen (d->env, d->lp, CPX_MAX);
 	else
-		CPXchgobjsen (d->env, d->lp, CPX_MIN);
+		CPXXchgobjsen (d->env, d->lp, CPX_MIN);
 	d->lrhs = new double[nr];
 	d->urhs = new double[nr];
 	d->sense = new char[nr];
@@ -291,12 +314,12 @@ long GenModelCplex::CreateModel()
 
 		//printf("%ld (%s) -> %f %f %f %c\n", i, vars.name[i].c_str(), d->obj[i], d->lb[i], d->ub[i], d->type[i]);
 	}
-	status = CPXnewrows (d->env, d->lp, nr, d->lrhs, d->sense, d->urhs, d->rname);
+	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");
-		CPXgeterrorstring (d->env, status, errmsg);
+		CPXXgeterrorstring (d->env, status, errmsg);
 		fprintf (stderr, "%s", errmsg);
 		return 1;
 	}
@@ -304,23 +327,23 @@ long GenModelCplex::CreateModel()
 		//printf("Row added!\n");
 
 	if(boolParam.count("mip") > 0 && boolParam["mip"])
-		status = CPXnewcols (d->env, d->lp, nc, d->obj, d->lb, d->ub, d->type, d->cname);
+		status = CPXXnewcols (d->env, d->lp, nc, d->obj, d->lb, d->ub, d->type, d->cname);
 	else
-		status = CPXnewcols (d->env, d->lp, nc, d->obj, d->lb, d->ub, NULL, NULL);
+		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");
-		CPXgeterrorstring (d->env, status, errmsg);
+		CPXXgeterrorstring (d->env, status, errmsg);
 		fprintf (stderr, "%s", errmsg);
 		return 1;
 	}
-	//status = CPXnewcols (env, lp, nc, obj, lb, ub, NULL, colname);
+	//status = CPXXnewcols (env, lp, nc, obj, lb, ub, NULL, colname);
 	if ( status )
 		return 1;
 	//else
 		//printf("Col added!\n");
-	status = CPXchgcoeflist (d->env, d->lp, nz, d->mat_r, d->mat_c, d->mat_v);
+	status = CPXXchgcoeflist (d->env, d->lp, nz, d->mat_r, d->mat_c, d->mat_v);
 	if ( status )
 		return 1;
 
@@ -330,7 +353,7 @@ long GenModelCplex::CreateModel()
 
 	vector<vector<pair<int,double> > > qptemp;
 	qptemp.resize(nc);
-	int* qpbeg = NULL;
+	int64_t* qpbeg = NULL;
 	int* qpnum = NULL;
 	int* qpind = NULL;
 	double* qpv = NULL;
@@ -339,7 +362,7 @@ long GenModelCplex::CreateModel()
 	if(!vars.qi.empty())
 	{
         boolParam["qp"] = true;
-		qpbeg = new int[nc];
+		qpbeg = new int64_t[nc];
 		qpnum = new int[nc];
 	}
     if(boolParam.count("qp_mat") == 0 || boolParam["qp_mat"])
@@ -371,7 +394,7 @@ long GenModelCplex::CreateModel()
                     qpnz++;
                 }
             }
-            status = CPXcopyquad(d->env, d->lp, qpbeg, qpnum, qpind, qpv);
+            status = CPXXcopyquad(d->env, d->lp, qpbeg, qpnum, qpind, qpv);
             delete[] qpbeg;
             delete[] qpnum;
             delete[] qpind;
@@ -390,12 +413,12 @@ long GenModelCplex::CreateModel()
 	return 0;
 }
 
-long AddQuadraticVector(vector<int>& ind, vector<double>& val)
+long AddQuadraticVector(vector<size_t>& ind, vector<double>& val)
 {
     return 0;
 }
 
-long AddQuadraticMatrix(vector<int>& indi, vector<int>& indj, vector<double>& val)
+long AddQuadraticMatrix(vector<size_t>& indi, vector<size_t>& indj, vector<double>& val)
 {
     return 0;
 }
@@ -430,7 +453,7 @@ long GenModelCplex::ChangeBulkBounds(int count, int * ind, char * type, double *
 		}
 	}
 
-	CPXchgbds(d->env, d->lp, count, ind, type, vals);
+	CPXXchgbds(d->env, d->lp, count, ind, type, vals);
 
 	return 0;
 }
@@ -446,7 +469,7 @@ long GenModelCplex::ChangeBulkObjectives(int count, int * ind, double * vals)
 		vars.obj[i] = vals[i];
 	}
 
-	CPXchgobj(d->env, d->lp, count, ind, vals);
+	CPXXchgobj(d->env, d->lp, count, ind, vals);
 
 	return 0;
 }
@@ -473,7 +496,7 @@ long GenModelCplex::ChangeBulkNz(int count, int* rind, int* cind, double * vals)
             consts[rind[i]].AddNz(cind[i], vals[i]);
     }
     
-    CPXchgcoeflist(d->env, d->lp, count, rind, cind, vals);
+    CPXXchgcoeflist(d->env, d->lp, count, rind, cind, vals);
     
     return 0;
 }
@@ -485,9 +508,9 @@ long GenModelCplex::DeleteMipStarts()
     if(!bcreated)
         return ThrowError("ChangeBulkNz() not available : Problem not created yet");
 	CplexData* d = (CplexData*)solverdata;
-	int n = CPXgetnummipstarts(d->env, d->lp);
+	int n = CPXXgetnummipstarts(d->env, d->lp);
 	if (n > 0)
-		CPXdelmipstarts(d->env, d->lp, 0, n - 1);
+		CPXXdelmipstarts(d->env, d->lp, 0, n - 1);
 
 	return 0;
 }
@@ -498,9 +521,9 @@ double GenModelCplex::GetMIPRelativeGap()
         return ThrowError("ChangeBulkNz() not available : Problem not created yet");
 	CplexData* d = (CplexData*)solverdata;
 	double gap = 0, bestobjval = 0;
-	CPXgetbestobjval(d->env, d->lp, &bestobjval);
-	if (bestobjval > 0)	// If the optimal solution is found by the presolve, the CPXgetbestobjval = 0, and the CPXgetmiprelgap ~ 1
-		CPXgetmiprelgap(d->env, d->lp, &gap);
+	CPXXgetbestobjval(d->env, d->lp, &bestobjval);
+	if (bestobjval > 0)	// If the optimal solution is found by the presolve, the CPXXgetbestobjval = 0, and the CPXXgetmiprelgap ~ 1
+		CPXXgetmiprelgap(d->env, d->lp, &gap);
 	
 	return gap;
 }
@@ -511,7 +534,7 @@ long GenModelCplex::SwitchToMip()
         return ThrowError("SwitchToMip() not available : Problem not created yet");
     vector<int> ind;
     vector<char> type;
-    for(int i = 0; i < int(vars.type.size()); i++)
+    for(size_t i = 0; i < vars.type.size(); i++)
     {
         if(vars.type[i] == 'B' || vars.type[i] == 'I' || vars.type[i] == 'S' || vars.type[i] == 'N')
         {
@@ -520,7 +543,7 @@ long GenModelCplex::SwitchToMip()
         }
     }
     CplexData* d = static_cast<CplexData*>(solverdata);
-    CPXchgctype(d->env, d->lp, int(ind.size()), &(ind[0]), &(type[0]));
+    CPXXchgctype(d->env, d->lp, ind.size(), &(ind[0]), &(type[0]));
     boolParam["mip"] = true;
     
     return 0;
@@ -532,7 +555,7 @@ long GenModelCplex::SwitchToLp()
         return ThrowError("SwitchToLp() not available : Problem not created yet");
     vector<int> ind;
     vector<char> type;
-    for(int i = 0; i < int(vars.type.size()); i++)
+    for(size_t i = 0; i < vars.type.size(); i++)
     {
         if(vars.type[i] == 'B' || vars.type[i] == 'I' || vars.type[i] == 'S' || vars.type[i] == 'N')
         {
@@ -541,12 +564,153 @@ long GenModelCplex::SwitchToLp()
         }
     }
     CplexData* d = static_cast<CplexData*>(solverdata);
-    CPXchgctype(d->env, d->lp, int(ind.size()), &(ind[0]), &(type[0]));
+    CPXXchgctype(d->env, d->lp, ind.size(), &(ind[0]), &(type[0]));
     boolParam["mip"] = false;
     
     return 0;
 }
 
+string SolverInfo::inspect() const
+{
+	return to_s();
+}
+
+string SolverInfo::to_s() const
+{
+	char tmp[10000];
+	string _cpx_results = cpx_results;
+	string _cpx_warning = cpx_warning;
+	string _cpx_error = cpx_error;
+	string _cpx_log = cpx_log;
+	size_t pos = 0;
+  	while((pos = _cpx_results.find("\n", pos)) != std::string::npos) { _cpx_results.replace(pos, 1, "\\n"); pos += 2; }
+  	pos = 0;
+  	while((pos = _cpx_warning.find("\n", pos)) != std::string::npos) { _cpx_warning.replace(pos, 1, "\\n"); pos += 2; }
+  	pos = 0;
+  	while((pos = _cpx_error.find("\n", pos)) != std::string::npos) { _cpx_error.replace(pos, 1, "\\n"); pos += 2; }
+  	pos = 0;
+  	while((pos = _cpx_log.find("\n", pos)) != std::string::npos) { _cpx_log.replace(pos, 1, "\\n"); pos += 2; }
+
+	snprintf(tmp, 10000, 
+		"{\n"
+		"\t\"relative_gap\" : \"%f\",\n"
+		"\t\"upper_bound\" : \"%f\",\n"
+		"\t\"lower_bound\" : \"%f\",\n"
+		"\t\"cutoff\" : \"%f\",\n"
+		"\t\"nb_node_solved\" : %lu,\n"
+		"\t\"nb_node_left\" : %lu,\n"
+		"\t\"nb_threads\" : %lu,\n"
+		"\t\"nb_iters\" : %lu,\n"
+		"\t\"nb_solutions\" : %lu,\n"
+		"\t\"nb_clique_cuts\" : %lu,\n"
+		"\t\"nb_cover_cuts\" : %lu,\n"
+		"\t\"nb_disjcut_cuts\" : %lu,\n"
+		"\t\"nb_flow_cover_cuts\" : %lu,\n"
+		"\t\"nb_flow_path_cuts\" : %lu,\n"
+		"\t\"nb_fractionnal_cuts\" : %lu,\n"
+		"\t\"nb_gub_cover_cuts\" : %lu,\n"
+		"\t\"nb_implied_bound_cuts\" : %lu,\n"
+		"\t\"nb_lift_project_cuts\" : %lu,\n"
+		"\t\"nb_flow_mc_flow_cuts\" : %lu,\n"
+		"\t\"nb_flow_mir_cuts\" : %lu,\n"
+		"\t\"nb_zero_half_cuts\" : %lu,\n"
+		"\t\"nb_user_cuts\" : %lu,\n"
+		"\t\"nb_lazy_cuts\" : %lu,\n"
+		"\t\"nb_soln_pool_cuts\" : %lu,\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\""
+		"}\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,
+		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()
+	);
+	
+	return string(tmp);
+}
+
+SolverInfo GenModelCplex::GetSolverInfo()
+{
+	if(!bcreated)
+	{
+        ThrowError("GetSolverInfo() not available : Problem not created yet");
+        return SolverInfo();
+	}
+	CplexData* d = static_cast<CplexData*>(solverdata);
+	printf("solstat = %ld\n", solstat);
+	if(solstat == numeric_limits<int>::infinity())
+		d->solver_info.status_str = "No status assigned.";
+	else
+	{
+		char status_str[CPXMESSAGEBUFSIZE];
+		char* _status = CPXXgetstatstring(d->env, solstat, status_str);
+		if (_status == NULL)
+            ThrowError(string("Failure to get the status string"));
+		d->solver_info.status_str = status_str;
+		printf("GetSolverInfo : status = %s [%s] [%s]\n", _status, status_str, d->solver_info.status_str.c_str());
+	}
+
+    return d->solver_info;
+}
+
+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;
+
+	if(pgm->boolParam.count("maximize") > 0 && pgm->boolParam["maximize"])
+	{
+		CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_BEST_INTEGER, &(d->solver_info.lower_bound));
+		CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_BEST_REMAINING, &(d->solver_info.upper_bound));
+	}
+	else
+	{
+		CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_BEST_REMAINING, &(d->solver_info.lower_bound));
+		CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_BEST_INTEGER, &(d->solver_info.upper_bound));	
+	}
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_NODE_COUNT_LONG, &(d->solver_info.nb_node_solved));
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_NODES_LEFT_LONG, &(d->solver_info.nb_node_left));
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_MIP_REL_GAP, &(d->solver_info.relative_gap));
+	CPXXgetcallbackinfo(d->env, cbdata, wherefrom, CPX_CALLBACK_INFO_CUTOFF, &(d->solver_info.cutoff));
+	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));
+
+	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);
+}
+
+void msg_function(void* cbhandle, const char* msg)
+{
+	string* p_str = static_cast<string*>(cbhandle);
+	(*p_str) += msg;
+} 
+
 long GenModelCplex::Init(string name)
 {
     
@@ -579,7 +743,7 @@ long GenModelCplex::Init(string name)
 	CplexData* d = static_cast<CplexData*>(solverdata);
 	int status = 0;
 
-	d->env = CPXopenCPLEX (&status);
+	d->env = CPXXopenCPLEX (&status);
 
 	// If an error occurs
 	if ( d->env == NULL )
@@ -591,11 +755,45 @@ long GenModelCplex::Init(string name)
     // Log file
     if(strParam.count("log_file") > 0)
     {
-        d->cpxfileptr =  CPXfopen(strParam["log_file"].c_str(), "w");
-        status = CPXsetlogfile(d->env, d->cpxfileptr);
-        if ( status )
+        d->cpxfileptr =  CPXXfopen(strParam["log_file"].c_str(), "w");
+        status = CPXXsetlogfile(d->env, d->cpxfileptr);
+        if (status)
             return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the log file"));
     }
+
+    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"));
+
+		status = CPXXsetmipcallbackfunc(d->env, mip_cb, this);
+		if (status)
+            return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the mip callback function"));
+           */
+
+    	CPXCHANNELptr cpxresults, cpxwarning, cpxerror, cpxlog;
+    	status = CPXXgetchannels(d->env, &cpxresults, &cpxwarning, &cpxerror, &cpxlog);
+    	if (status)
+            return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to get the solver channels"));
+    
+	    status = CPXXaddfuncdest(d->env, cpxresults, &(d->solver_info.cpx_results), msg_function);
+	    if (status)
+	    	return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the results channel callback function"));
+	    
+	    status = CPXXaddfuncdest(d->env, cpxwarning, &(d->solver_info.cpx_warning), msg_function);
+	    if (status)
+	    	return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the warning channel callback function"));
+	    
+	    status = CPXXaddfuncdest(d->env, cpxerror, &(d->solver_info.cpx_error), msg_function);
+	    if (status)
+	    	return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the error channel callback function"));
+	    
+	    status = CPXXaddfuncdest(d->env, cpxlog, &(d->solver_info.cpx_log), msg_function);
+	    if (status)
+	    	return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to set the log channel callback function"));
+	}
     
     // General settings
     //boolParam["log_output_stdout"] = true;
@@ -627,6 +825,19 @@ long GenModelCplex::Init(string name)
     }
     
     // Tolerance and limits
+    
+    SetParam("memory_emphasis", CPX_PARAM_MEMORYEMPHASIS, "bool", "Failure to set memory emphasis");
+    SetParam("node_file_memory_mode", CPX_PARAM_NODEFILEIND, "long", "Failure to set node file memory mode");
+    /*
+    	0 No node file
+		1 Node file in memory and compressed; default
+		2 Node file on disk
+		3 Node file on disk and compressed
+	*/
+	SetParam("tree_memory_limit", CPX_PARAM_TRELIM, "dbl", "Failure to set tree memory limit"); // In megabytes
+	SetParam("work_memory_limit", CPX_PARAM_WORKMEM, "dbl", "Failure to set work memory limit"); // In megabytes
+		
+    
     SetParam("time_limit", CPX_PARAM_TILIM, "dbl", "Failure to set time limit");
     SetParam("max_iteration_limit", CPX_PARAM_ITLIM, "long", "Failure to set the maximal number of simplex iterations");
     SetParam("bounds_feasibility_tolerance", CPX_PARAM_EPRHS, "dbl", "Failure to set bounds feasibility tolerance");
@@ -641,7 +852,7 @@ long GenModelCplex::Init(string name)
     
 
 	// Create the problem
-	d->lp = CPXcreateprob (d->env, &status, name.c_str());
+	d->lp = CPXXcreateprob (d->env, &status, name.c_str());
 	if ( d->lp == NULL )
         return ThrowError(getcplexerror(d->env, status)+string(". ")+string("Failure to create Cplex optimization problem"));
 
@@ -654,11 +865,11 @@ long GenModelCplex::SetDirectParam(int whichparam, genmodel_param value, string
 {
     int status = 0;
     if(type == "dbl")
-        status = CPXsetdblparam (static_cast<CplexData*>(solverdata)->env, whichparam, value.dblval);
+        status = CPXXsetdblparam (static_cast<CplexData*>(solverdata)->env, whichparam, value.dblval);
     else if(type == "long")
-        status = CPXsetintparam (static_cast<CplexData*>(solverdata)->env, whichparam, value.longval);
+        status = CPXXsetintparam (static_cast<CplexData*>(solverdata)->env, whichparam, value.longval);
     else if(type == "str")
-        status = CPXsetstrparam (static_cast<CplexData*>(solverdata)->env, whichparam, value.strval);
+        status = CPXXsetstrparam (static_cast<CplexData*>(solverdata)->env, whichparam, value.strval);
     if ( status )
         return ThrowError(getcplexerror(static_cast<CplexData*>(solverdata)->env, status)+string(". ")+message);
     
@@ -721,7 +932,7 @@ long GenModelCplex::Init(string name) {return cpx_not_implemented();}
 long GenModelCplex::CreateModel(string filename, int type, string dn) {return cpx_not_implemented();}
 long GenModelCplex::CreateModel() {return cpx_not_implemented();}
 long GenModelCplex::AddSolverCol(vector<int>& ind, vector<double>& val, double obj, double lb, double ub, string name, char type) {return cpx_not_implemented();}
-long GenModelCplex::AddSolverRow(vector<int>& ind, vector<double>& val, double rhs, char sense, string name) {return cpx_not_implemented();}
+long GenModelCplex::AddSolverRow(vector<size_t>& ind, vector<double>& val, double rhs, char sense, string name) {return cpx_not_implemented();}
 long GenModelCplex::AddCol(int* newi, double* newcol, int nz, double obj, double lb, double ub, const char* name, char type) {return cpx_not_implemented();}
 long GenModelCplex::AddCut(int* cols, double* vals, int nz, double rhs, char sense, const char* name) {return cpx_not_implemented();}
 long GenModelCplex::ChangeBulkBounds(int count, int * ind, char * type, double * vals) {return cpx_not_implemented();}
@@ -761,6 +972,9 @@ long CplexData::Reset()
 	env = NULL;
 	lp = NULL;
     cpxfileptr = NULL;
+    stop_solver = false;
+    original_mip_cb = NULL;
+    original_handle = NULL;
 
 	return 0;
 }
@@ -817,6 +1031,7 @@ long CplexData::ClearStructure()
 			delete[] rname[i];
 		delete[] rname;
 	}
+
     Reset();
     
     return 0;
@@ -827,15 +1042,15 @@ long CplexData::Delete()
 #ifdef CPLEX_MODULE
 	if(lp != NULL)
 	{
-		CPXfreeprob(env, &lp);
+		CPXXfreeprob(env, &lp);
 	}
 	if(env != NULL)
 	{
-		CPXcloseCPLEX(&env);
+		CPXXcloseCPLEX(&env);
 	}
     if(cpxfileptr != NULL)
     {
-        CPXfclose(cpxfileptr);
+        CPXXfclose(cpxfileptr);
     }
 
 	ClearStructure();