Commit upstream/1.01 - mccs

+4

-0

CHANGES less more

	0
	1	mccs 1.01 (24/05/11):
	2	* correct some bugs in lp_solver.c: there was some troubleshot in reading solutions from underlying solvers
	3	⏎

+1

-0

makefile less more

205	205	rm -f lpsolver.out
206	206	rm -f installed.txt removed.txt
207	207	rm -f sol
	208	rm -f cplex.log clone0.log
208	209	rm -f /~
209	210
210	211

+15

-2

sources/cplex_solver.c less more

9	9	#include <math.h>
10	10
11	11	#define OUTPUT_MODEL 0
	12	#define USEXNAME 0
12	13
13	14	// solver creation
14	15	abstract_solver *new_cplex_solver() { return new cplex_solver(); }

96	97	lb[i] = 0;
97	98	ub[i] = 1;
98	99	vartype[i] = 'B';
99		varname[(ipkg)->rank] = (ipkg)->versioned_name;
	100	if (USEXNAME) {
	101	char *name;
	102	char buffer[20];
	103
	104	sprintf(buffer, "x%d", i);
	105	if ((name = (char )malloc(strlen(buffer)+1)) == (char )NULL) {
	106	fprintf(stderr, "CUDF error: can not alloc memory for variable name in cplex_solver::end_objective.\n");
	107	exit(-1);
	108	}
	109	strcpy(name, buffer);
	110	varname[(*ipkg)->rank] = name;
	111	} else
	112	varname[(ipkg)->rank] = (ipkg)->versioned_name;
100	113	i++;
101	114	}
102	115

107	120
108	121	sprintf(buffer, "x%d", i);
109	122	if ((name = (char )malloc(strlen(buffer)+1)) == (char )NULL) {
110		fprintf(stderr, "CUDF error: can not alloc memory for variable name in glpk_solver::end_objective.\n");
	123	fprintf(stderr, "CUDF error: can not alloc memory for variable name in cplex_solver::end_objective.\n");
111	124	exit(-1);
112	125	}
113	126	strcpy(name, buffer);

+11

-17

sources/lp_solver.c less more

101	101
102	102	if (verbosity < 2)
103	103	sprintf(command, "cat %s >> %s; %s %s > %s 2> /dev/null",
104		ctlpfilename, lpfilename, lpsolver, lpfilename, lpoutfilename);
	104	ctlpfilename, lpfilename, lpsolver, lpfilename, lpoutfilename);
105	105	else
106	106	sprintf(command, "cat %s >> %s; %s %s \| tee %s",
107	107	ctlpfilename, lpfilename, lpsolver, lpfilename, lpoutfilename);

129	129	}
130	130	break;
131	131	case 'C':
132		if (strncmp(command, "Coin:Infeasible - objective value", 33) == 0)
	132	if ((strncmp(command, "Coin:Infeasible - objective value", 33) == 0) \|\|
	133	(strncmp(command, "CPLEX> MIP - Integer infeasible.", 32) == 0))
133	134	status = 0;
134	135	else if (strncmp(command, "Coin:Optimal - objective value", 30) == 0) {
135	136	status = 1;
136	137	if (sscanf(command+30, "%d", &iobjval) > 0) objval = objvals[iobj] = iobjval;
	138	} else if (strncmp(command, "CPLEX> MIP - Integer optimal solution: Objective = ", 52) == 0) {
	139	status = 1;
	140	if (sscanf(command+52, "%d", &iobjval) > 0) objval = objvals[iobj] = iobjval;
137	141	}
138	142	break;
139	143	}

148	152	for (int i = 0; i < nb_packages; i++) solution[i] = 0;
149	153
150	154	bool eos = false;
151		while ((! eos) && (! feof(fsol)) && (fgets(command, 1000, fsol) != NULL))
	155	while ((! eos) && (! feof(fsol)) && (fgets(command, 1000, fsol) != NULL)) {
152	156	switch (command[0]) {
153	157	case 'x':
154		{
155		int l = 0, v = 0;
156		if ((l = sscanf(command+1, "%d", &rank)) > 0)
157		if (sscanf(command+l+2, "%d", &v) > 0)
158		if (v == 1)
159		solution[rank] = 1;
160		}
	158	if (sscanf(command+1, "%d", &rank) > 0) solution[rank] = 1;
161	159	break;
162	160	case ' ':
163	161	{
164		int i = 1, l = 0, v = 0;
	162	int i = 1;
165	163	for (; ((command[i] != 'x') && (i < 1000)); i++);
166	164	if (command[i] == 'x')
167		if ((l = sscanf(command+i+1, "%d", &rank)) > 0)
168		if (sscanf(command+i+l+2, "%d", &v) > 0)
169		if (v == 1)
170		solution[rank] = 1;
171
	165	if (sscanf(command+i+1, "%d", &rank) > 0) solution[rank] = 1;
172	166	}
173	167	break;
174	168	case '\n':
175		case 'C':
176	169	eos = true;
177	170	break;
178	171	}
	172	}
179	173	} else if (status == 0)
180	174	break;
181	175	}