Add diagnostic on the number of active facilities #25

benchmarks/objectives.sh

@@ -1,8 +1,7 @@
 #!/bin/sh
 
-cost_pserv="-agregate[-pserv[type,0][10],-pserv[type,1][18],-pserv[type,2][6],-pserv[type,3][4],-pserv[type,4][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]"
+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-]]"
-

src/cudf.c

@@ -749,22 +749,30 @@ void print_messages(ostream & out, PSLProblem *problem, abstract_solver *solver)
 			capa += solver->get_solution(problem->rankX(*i, k)) * problem->getServer(k)->getMaxConnections();
 		}
 	}
-	//Display installed pservers.
-	int pserv[problem->serverTypeCount()];
-	int tot_pserv = 0;
-	int tot_rel_pserv = 0;
+	//Display pserver messages.
+	CUDFcoefficient tot_facilities=0;
+	CUDFcoefficient tot_pserv = 0;
+	CUDFcoefficient tot_rel_pserv = 0;
+	CUDFcoefficient pserv[problem->serverTypeCount()];
 	for (int k = 0; k < problem->serverTypeCount(); ++k) {
 		pserv[k]=0;
 	}
 	for(NodeIterator i = problem->nbegin() ; i!=  problem->nend() ; i++) {
-		tot_pserv += solver->get_solution(problem->rankX(*i));
-		if(i->isReliableFromRoot()) {
-			tot_rel_pserv += solver->get_solution(problem->rankX(*i));
-		}
-		for (int k = 0; k < problem->serverTypeCount(); ++k) {
-			pserv[k] += solver->get_solution(problem->rankX(*i, k));
+		CUDFcoefficient _pserv = solver->get_solution(problem->rankX(*i));
+		if(_pserv > 0) {
+			tot_facilities++;
+			tot_pserv += _pserv;
+			if(i->isReliableFromRoot()) {
+				tot_rel_pserv += _pserv;
+			}
+			for (int k = 0; k < problem->serverTypeCount(); ++k) {
+				CUDFcoefficient _pservk = solver->get_solution(problem->rankX(*i, k));
+				capa += _pservk * problem->getServer(k)->getMaxConnections();
+				pserv[k] += _pservk;
+			}
 		}
 	}
+	out << "d FACILITIES " << tot_facilities << endl;
 	out << "d PSERVERS " << tot_pserv << endl;
 	if(problem->serverTypeCount() > 1) {
 		out << "d VEC_PSERVERS ";