Fix compatibility issues with grigrid of logging messages #25

benchmarks/objectives.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
-bad_pserv="-pserv[reliable,0],-pserv[type,1],-pserv[type,4]"
 cost_pserv="-agregate[-pserv[type,0][10],-pserv[type,1][18],-pserv[type,2][6],-pserv[type,3][4],-pserv[type,4][1]]"
 dist_pserv="-agregate[-conn[length,1][1],-conn[length,2][2],-conn[length,3][3]]"
-capa_pserv="+agregate[-pserv[type,0-1][500],-pserv[type,2][300],-pserv[type,3][100],-pserv[type,4][20]]"
 sum_bandw="+agregate[-local[stage,1-][5000],-bandw[stage,1-]]"
+capa_pserv="+agregate[-pserv[type,0-1][500],-pserv[type,2][300],-pserv[type,3][100],-pserv[type,4][20]]"
+bad_pserv="-pserv[reliable,0],-pserv[type,1],-pserv[type,4]"

src/cudf.c

@@ -586,8 +586,9 @@ int main(int argc, char *argv[]) {
 				out << "================================================================" << endl;
 				out << "c " << solver->objectiveCount() << " OBJECTIVES " << obj_descr << endl;
 			}
-			out << "s OPTIMAL" << endl;
+			out << "s OPTIMUM" << endl;
 			out << "o " << obj << endl;
+			out << "d OBJECTIVE " << obj << endl; //For compatibility with grigrid scripts
 			if(verbosity >= DEFAULT) {
 				print_solution(out, the_problem, solver);
 				if(verbosity >= VERBOSE) {
@@ -739,9 +740,9 @@ void export_solution(PSLProblem *problem, abstract_solver *solver,char* objectiv
 void print_messages(ostream & out, PSLProblem *problem, abstract_solver *solver)
 {
 
-	out << "d TIME " << solver->timeCount() << endl;
+	out << "d RUNTIME " << solver->timeCount() << endl;
 	out << "d NODES " << solver->nodeCount() << endl;
-	out << "d SOLUTIONS " << solver->solutionCount() << endl;
+	out << "d NBSOLS " << solver->solutionCount() << endl;
 	//Compute total pserver capacity
 	double capa = 0;
 	for(NodeIterator i = problem->nbegin() ; i!=  problem->nend() ; i++) {