PS: cleanup format strings

%ld instead of %d for nnz
 %ld for number of iterations / fgw.right (continuous time computations)


git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12186 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/sparse/PS_ExportMDP.cc

@@ -97,10 +97,10 @@ jstring fn		// filename
 	
 	// print file header
 	switch (export_type) {
-	case EXPORT_PLAIN: export_string("%d %d %d\n", n, nc, nnz); break;
+	case EXPORT_PLAIN: export_string("%d %d %ld\n", n, nc, nnz); break;
 	case EXPORT_MATLAB: for (i = 0; i < ndsm->k; i++) export_string("%s%d = sparse(%d,%d);\n", export_name, i+1, n, n); break;
 	case EXPORT_DOT: case EXPORT_DOT_STATES: export_string("digraph %s {\nsize=\"8,5\"\nnode [shape=box];\n", export_name); break;
-	case EXPORT_ROWS: export_string("%d %d %d\n", n, nc, nnz); break;
+	case EXPORT_ROWS: export_string("%d %d %ld\n", n, nc, nnz); break;
 	}
 	
 	// print main part of file

prism/src/sparse/PS_ExportSubMDP.cc

@@ -84,9 +84,9 @@ jstring fn		// filename
 	
 	// print file header
 	switch (export_type) {
-	case EXPORT_PLAIN: export_string("%d %d %d\n", n, nc, nnz); break;
+	case EXPORT_PLAIN: export_string("%d %d %ld\n", n, nc, nnz); break;
 	case EXPORT_MATLAB: for (i = 0; i < ndsm->k; i++) export_string("%s%d = sparse(%d,%d);\n", export_name, i+1, n, n); break;
-	case EXPORT_ROWS: export_string("%d %d %d\n", n, nc, nnz); break;
+	case EXPORT_ROWS: export_string("%d %d %ld\n", n, nc, nnz); break;
 	}
 	
 	// print main part of file

prism/src/sparse/PS_JOR.cc

@@ -137,7 +137,7 @@ jdouble omega		// omega (over-relaxation parameter)
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_a?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_a?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// get vector of diags, either by extracting from mtbdd or

prism/src/sparse/PS_JORInterval.cc

@@ -149,7 +149,7 @@ jint flags
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_a?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_a?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// get vector of diags, either by extracting from mtbdd or

prism/src/sparse/PS_NondetBoundedUntil.cc

@@ -106,7 +106,7 @@ jboolean min		// min or max probabilities (true = min, false = max)
 	kb = ndsm->mem;
 	kbt = kb;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// get vector for yes

prism/src/sparse/PS_NondetCumulReward.cc

@@ -101,7 +101,7 @@ jboolean min				// min or max probabilities (true = min, false = max)
 	kb = (nnz*12.0+nc*4.0+n*4.0)/1024.0;
 	kbt = kb;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// build sparse matrix (rewards)
@@ -111,7 +111,7 @@ jboolean min				// min or max probabilities (true = min, false = max)
 	nnz_r = ndsm_r->nnz;
 	nc_r = ndsm_r->nc;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc_r, nnz_r, ndsm_r->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc_r, nnz_r, ndsm_r->k);
 	kb = (nnz_r*12.0+nc_r*4.0+n*4.0)/1024.0;
 	kbt += kb;
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");

prism/src/sparse/PS_NondetInstReward.cc

@@ -100,7 +100,7 @@ jlong __jlongpointer in
 	kb = (nnz*12.0+nc*4.0+n*4.0)/1024.0;
 	kbt = kb;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// create solution/iteration vectors

prism/src/sparse/PS_NondetMultiReach.cc

@@ -173,7 +173,7 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
     kb = ndsm->mem;
     kbt = kb;
     // print out info
-    PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+    PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
     PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 
     // If needed, and if info is available, build a vector of action indices for the MDP

prism/src/sparse/PS_NondetMultiReach1.cc

@@ -199,7 +199,7 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
     kb = ndsm->mem;
     kbt = kb;
     // print out info
-    PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+    PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
     PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 
     // If needed, and if info is available, build a vector of action indices for the MDP

prism/src/sparse/PS_NondetMultiReachReward.cc

@@ -214,7 +214,7 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
     kb = ndsm->mem;
     kbt = kb;
     // print out info
-    PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+    PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
     PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 
     // If needed, and if info is available, build a vector of action indices for the MDP

prism/src/sparse/PS_NondetMultiReachReward1.cc

@@ -239,7 +239,7 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti
     kb = ndsm->mem;
     kbt = kb;
     // print out info
-    PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+    PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
     PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 
     // If needed, and if info is available, build a vector of action indices for the MDP

prism/src/sparse/PS_NondetReachReward.cc

@@ -140,7 +140,7 @@ jboolean min				// min or max probabilities (true = min, false = max)
 	kb = (nnz*12.0+nc*4.0+n*4.0)/1024.0;
 	kbt = kb;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// if needed, and if info is available, build a vector of action indices for the MDP
@@ -171,7 +171,7 @@ jboolean min				// min or max probabilities (true = min, false = max)
 	nnz_r = ndsm_r->nnz;
 	nc_r = ndsm_r->nc;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc_r, nnz_r, ndsm_r->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc_r, nnz_r, ndsm_r->k);
 	kb = (nnz_r*12.0+nc_r*4.0+n*4.0)/1024.0;
 	kbt += kb;
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");

prism/src/sparse/PS_NondetReachRewardInterval.cc

@@ -155,7 +155,7 @@ jint flags
 	kb = (nnz*12.0+nc*4.0+n*4.0)/1024.0;
 	kbt = kb;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// if needed, and if info is available, build a vector of action indices for the MDP
@@ -186,7 +186,7 @@ jint flags
 	nnz_r = ndsm_r->nnz;
 	nc_r = ndsm_r->nc;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc_r, nnz_r, ndsm_r->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc_r, nnz_r, ndsm_r->k);
 	kb = (nnz_r*12.0+nc_r*4.0+n*4.0)/1024.0;
 	kbt += kb;
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");

prism/src/sparse/PS_NondetUntil.cc

@@ -138,7 +138,7 @@ jlong _strat				// strategy storage
 	kb = ndsm->mem;
 	kbt = kb;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// if needed, and if info is available, build a vector of action indices for the MDP

prism/src/sparse/PS_NondetUntilInterval.cc

@@ -151,7 +151,7 @@ jint flags
 	kb = ndsm->mem;
 	kbt = kb;
 	// print out info
-	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%d, k=%d] ", n, nc, nnz, ndsm->k);
+	PS_PrintToMainLog(env, "[n=%d, nc=%d, nnz=%ld, k=%d] ", n, nc, nnz, ndsm->k);
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// if needed, and if info is available, build a vector of action indices for the MDP

prism/src/sparse/PS_Power.cc

@@ -122,7 +122,7 @@ jboolean transpose	// transpose A? (i.e. solve xA=x not Ax=x?)
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_a?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_a?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// build b vector (if present)

prism/src/sparse/PS_PowerInterval.cc

@@ -129,7 +129,7 @@ jint flags
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_a?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_a?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// build b vector (if present)

prism/src/sparse/PS_ProbBoundedUntil.cc

@@ -116,7 +116,7 @@ jint bound		// time bound
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_tr?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_tr?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// get vector of yes

prism/src/sparse/PS_ProbCumulReward.cc

@@ -111,7 +111,7 @@ jint bound			// time bound
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_tr?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_tr?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// multiply transition rewards by transition probs and sum rows

prism/src/sparse/PS_ProbInstReward.cc

@@ -106,7 +106,7 @@ jint bound			// time bound
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_tr?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_tr?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// create solution/iteration vectors

prism/src/sparse/PS_ProbTransient.cc

@@ -110,7 +110,7 @@ jint time		// time
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_tr?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_tr?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// create solution/iteration vectors

prism/src/sparse/PS_SOR.cc

@@ -138,7 +138,7 @@ jboolean forwards	// forwards or backwards?
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_a?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_a?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// get vector of diags, either by extracting from mtbdd or

prism/src/sparse/PS_SORInterval.cc

@@ -150,7 +150,7 @@ jint flags
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_a?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_a?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// get vector of diags, either by extracting from mtbdd or

prism/src/sparse/PS_StochBoundedUntil.cc

@@ -130,7 +130,7 @@ jlong __jlongpointer mu	// probs for multiplying
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_tr?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_tr?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// get vector of diagonals
@@ -306,7 +306,7 @@ jlong __jlongpointer mu	// probs for multiplying
 		
 		// print occasional status update
 		if ((util_cpu_time() - start3) > UPDATE_DELAY) {
-			PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, fgw.right);
+			PS_PrintToMainLog(env, "Iteration %ld (of %ld): ", iters, fgw.right);
 			if (do_ss_detect) PS_PrintToMainLog(env, "max %sdiff=%f, ", measure.isRelative()?"relative ":"", measure.value());
 			PS_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000));
 			start3 = util_cpu_time();

prism/src/sparse/PS_StochCumulReward.cc

@@ -118,7 +118,7 @@ jdouble time		// time bound
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_tr?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_tr?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// get vector of diagonals
@@ -316,7 +316,7 @@ jdouble time		// time bound
 		
 		// print occasional status update
 		if ((util_cpu_time() - start3) > UPDATE_DELAY) {
-			PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, fgw.right);
+			PS_PrintToMainLog(env, "Iteration %ld (of %ld): ", iters, fgw.right);
 			if (do_ss_detect) PS_PrintToMainLog(env, "max %sdiff=%f, ", measure.isRelative()?"relative ":"", measure.value());
 			PS_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000));
 			start3 = util_cpu_time();

prism/src/sparse/PS_StochTransient.cc

@@ -114,7 +114,7 @@ jdouble time		// time bound
 	}
 	kbt = kb;
 	// print some info
-	PS_PrintToMainLog(env, "[n=%d, nnz=%d%s] ", n, nnz, compact_tr?", compact":"");
+	PS_PrintToMainLog(env, "[n=%d, nnz=%ld%s] ", n, nnz, compact_tr?", compact":"");
 	PS_PrintMemoryToMainLog(env, "[", kb, "]\n");
 	
 	// get vector of diagonals
@@ -285,7 +285,7 @@ jdouble time		// time bound
 		
 		// print occasional status update
 		if ((util_cpu_time() - start3) > UPDATE_DELAY) {
-			PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, fgw.right);
+			PS_PrintToMainLog(env, "Iteration %ld (of %ld): ", iters, fgw.right);
 			if (do_ss_detect) PS_PrintToMainLog(env, "max %sdiff=%f, ", measure.isRelative()?"relative ":"", measure.value());
 			PS_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000));
 			start3 = util_cpu_time();