From 7c5eb10d375319c0978a3deecca28e26e63705bf Mon Sep 17 00:00:00 2001 From: Joachim Klein Date: Wed, 2 Aug 2017 11:34:14 +0000 Subject: [PATCH] PH,PM,PS: cast jints to int in printf On Win32, jints are actually long ints, so printf would need %ld instead of %d. As jints are 32bit, we simply cast to an int to silence format string compiler warning. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@12190 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/hybrid/PH_NondetBoundedUntil.cc | 2 +- prism/src/hybrid/PH_ProbBoundedUntil.cc | 2 +- prism/src/hybrid/PH_ProbCumulReward.cc | 2 +- prism/src/hybrid/PH_ProbInstReward.cc | 2 +- prism/src/hybrid/PH_ProbTransient.cc | 2 +- prism/src/mtbdd/PM_NondetBoundedUntil.cc | 2 +- prism/src/mtbdd/PM_NondetInstReward.cc | 2 +- prism/src/mtbdd/PM_ProbBoundedUntil.cc | 2 +- prism/src/mtbdd/PM_ProbCumulReward.cc | 2 +- prism/src/mtbdd/PM_ProbInstReward.cc | 2 +- prism/src/mtbdd/PM_ProbTransient.cc | 2 +- prism/src/sparse/PS_NondetBoundedUntil.cc | 2 +- prism/src/sparse/PS_NondetCumulReward.cc | 2 +- prism/src/sparse/PS_NondetInstReward.cc | 2 +- prism/src/sparse/PS_NondetMultiReach1.cc | 2 +- prism/src/sparse/PS_NondetMultiReachReward1.cc | 2 +- prism/src/sparse/PS_ProbBoundedUntil.cc | 2 +- prism/src/sparse/PS_ProbCumulReward.cc | 2 +- prism/src/sparse/PS_ProbInstReward.cc | 2 +- prism/src/sparse/PS_ProbTransient.cc | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/prism/src/hybrid/PH_NondetBoundedUntil.cc b/prism/src/hybrid/PH_NondetBoundedUntil.cc index 4c9a7437..f08856cc 100644 --- a/prism/src/hybrid/PH_NondetBoundedUntil.cc +++ b/prism/src/hybrid/PH_NondetBoundedUntil.cc @@ -235,7 +235,7 @@ jboolean min // min or max probabilities (true = min, false = max) // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PH_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/hybrid/PH_ProbBoundedUntil.cc b/prism/src/hybrid/PH_ProbBoundedUntil.cc index 53a53811..02fc14a7 100644 --- a/prism/src/hybrid/PH_ProbBoundedUntil.cc +++ b/prism/src/hybrid/PH_ProbBoundedUntil.cc @@ -199,7 +199,7 @@ jint bound // time bound // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PH_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/hybrid/PH_ProbCumulReward.cc b/prism/src/hybrid/PH_ProbCumulReward.cc index 28366cde..d2be2f17 100644 --- a/prism/src/hybrid/PH_ProbCumulReward.cc +++ b/prism/src/hybrid/PH_ProbCumulReward.cc @@ -194,7 +194,7 @@ jint bound // time bound // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PH_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/hybrid/PH_ProbInstReward.cc b/prism/src/hybrid/PH_ProbInstReward.cc index 4e3b3601..c05de54d 100644 --- a/prism/src/hybrid/PH_ProbInstReward.cc +++ b/prism/src/hybrid/PH_ProbInstReward.cc @@ -158,7 +158,7 @@ jint bound // time bound // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PH_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/hybrid/PH_ProbTransient.cc b/prism/src/hybrid/PH_ProbTransient.cc index 4d0ce09f..50bd5d5b 100644 --- a/prism/src/hybrid/PH_ProbTransient.cc +++ b/prism/src/hybrid/PH_ProbTransient.cc @@ -173,7 +173,7 @@ jint time // time // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, time); + PH_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)time); if (do_ss_detect) PH_PrintToMainLog(env, "max %sdiff=%f, ", measure.isRelative()?"relative ":"", measure.value()); PH_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); diff --git a/prism/src/mtbdd/PM_NondetBoundedUntil.cc b/prism/src/mtbdd/PM_NondetBoundedUntil.cc index 7737642d..e03cdcc7 100644 --- a/prism/src/mtbdd/PM_NondetBoundedUntil.cc +++ b/prism/src/mtbdd/PM_NondetBoundedUntil.cc @@ -131,7 +131,7 @@ jboolean min // min or max probabilities (true = min, false = max) // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PM_PrintToMainLog(env, "sol=%d nodes", DD_GetNumNodes(ddman, sol)); // NB: but tmp was probably bigger than sol (pre min/max-abstract) PM_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); diff --git a/prism/src/mtbdd/PM_NondetInstReward.cc b/prism/src/mtbdd/PM_NondetInstReward.cc index 681955bc..ff947294 100644 --- a/prism/src/mtbdd/PM_NondetInstReward.cc +++ b/prism/src/mtbdd/PM_NondetInstReward.cc @@ -119,7 +119,7 @@ jlong __jlongpointer in // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PM_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/mtbdd/PM_ProbBoundedUntil.cc b/prism/src/mtbdd/PM_ProbBoundedUntil.cc index 820b9dfb..fbd4dfd9 100644 --- a/prism/src/mtbdd/PM_ProbBoundedUntil.cc +++ b/prism/src/mtbdd/PM_ProbBoundedUntil.cc @@ -107,7 +107,7 @@ jint bound // time bound // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PM_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/mtbdd/PM_ProbCumulReward.cc b/prism/src/mtbdd/PM_ProbCumulReward.cc index d2d1d954..5436b7b3 100644 --- a/prism/src/mtbdd/PM_ProbCumulReward.cc +++ b/prism/src/mtbdd/PM_ProbCumulReward.cc @@ -106,7 +106,7 @@ jint bound // time bound // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PM_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/mtbdd/PM_ProbInstReward.cc b/prism/src/mtbdd/PM_ProbInstReward.cc index aa46eb18..3b835fb1 100644 --- a/prism/src/mtbdd/PM_ProbInstReward.cc +++ b/prism/src/mtbdd/PM_ProbInstReward.cc @@ -94,7 +94,7 @@ jint bound // time bound // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PM_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/mtbdd/PM_ProbTransient.cc b/prism/src/mtbdd/PM_ProbTransient.cc index 1bba02a7..301d5a12 100644 --- a/prism/src/mtbdd/PM_ProbTransient.cc +++ b/prism/src/mtbdd/PM_ProbTransient.cc @@ -111,7 +111,7 @@ jint time // time // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, time); + PM_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)time); PM_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/sparse/PS_NondetBoundedUntil.cc b/prism/src/sparse/PS_NondetBoundedUntil.cc index f6f96ad8..32b9c292 100644 --- a/prism/src/sparse/PS_NondetBoundedUntil.cc +++ b/prism/src/sparse/PS_NondetBoundedUntil.cc @@ -179,7 +179,7 @@ jboolean min // min or max probabilities (true = min, false = max) // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PS_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/sparse/PS_NondetCumulReward.cc b/prism/src/sparse/PS_NondetCumulReward.cc index efd7b70e..e471077e 100644 --- a/prism/src/sparse/PS_NondetCumulReward.cc +++ b/prism/src/sparse/PS_NondetCumulReward.cc @@ -210,7 +210,7 @@ jboolean min // min or max probabilities (true = min, false = max) // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PS_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/sparse/PS_NondetInstReward.cc b/prism/src/sparse/PS_NondetInstReward.cc index 52b9564c..0022cf80 100644 --- a/prism/src/sparse/PS_NondetInstReward.cc +++ b/prism/src/sparse/PS_NondetInstReward.cc @@ -173,7 +173,7 @@ jlong __jlongpointer in // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PS_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/sparse/PS_NondetMultiReach1.cc b/prism/src/sparse/PS_NondetMultiReach1.cc index b5f1436d..c1c09da7 100644 --- a/prism/src/sparse/PS_NondetMultiReach1.cc +++ b/prism/src/sparse/PS_NondetMultiReach1.cc @@ -160,7 +160,7 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti PS_PrintToMainLog(env, "%d Target combinations:\n", num_combinations); for (i = 0; i < num_combinations; i++) { PS_PrintToMainLog(env, "#%d: ", i); - PS_PrintToMainLog(env, "%d ", combinationIDs[i]); + PS_PrintToMainLog(env, "%d ", (int)combinationIDs[i]); PS_PrintToMainLog(env, " (%.0f states)\n", DD_GetNumMinterms(ddman, combinations[i], num_rvars)); } diff --git a/prism/src/sparse/PS_NondetMultiReachReward1.cc b/prism/src/sparse/PS_NondetMultiReachReward1.cc index d55f67a3..93eabe92 100644 --- a/prism/src/sparse/PS_NondetMultiReachReward1.cc +++ b/prism/src/sparse/PS_NondetMultiReachReward1.cc @@ -185,7 +185,7 @@ JNIEXPORT jdouble __jlongpointer JNICALL Java_sparse_PrismSparse_PS_1NondetMulti PS_PrintToMainLog(env, "%d Target combinations:\n", num_combinations); for (i = 0; i < num_combinations; i++) { PS_PrintToMainLog(env, "#%d: ", i); - PS_PrintToMainLog(env, "%d ", combinationIDs[i]); + PS_PrintToMainLog(env, "%d ", (int)combinationIDs[i]); PS_PrintToMainLog(env, " (%.0f states)\n", DD_GetNumMinterms(ddman, combinations[i], num_rvars)); } diff --git a/prism/src/sparse/PS_ProbBoundedUntil.cc b/prism/src/sparse/PS_ProbBoundedUntil.cc index 4e33dae5..0567d136 100644 --- a/prism/src/sparse/PS_ProbBoundedUntil.cc +++ b/prism/src/sparse/PS_ProbBoundedUntil.cc @@ -213,7 +213,7 @@ jint bound // time bound // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PS_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/sparse/PS_ProbCumulReward.cc b/prism/src/sparse/PS_ProbCumulReward.cc index a6fa0a77..9f4abd3a 100644 --- a/prism/src/sparse/PS_ProbCumulReward.cc +++ b/prism/src/sparse/PS_ProbCumulReward.cc @@ -215,7 +215,7 @@ jint bound // time bound // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PS_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/sparse/PS_ProbInstReward.cc b/prism/src/sparse/PS_ProbInstReward.cc index fea22117..785eede0 100644 --- a/prism/src/sparse/PS_ProbInstReward.cc +++ b/prism/src/sparse/PS_ProbInstReward.cc @@ -181,7 +181,7 @@ jint bound // time bound // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, bound); + PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)bound); PS_PrintToMainLog(env, "%.2f sec so far\n", ((double)(util_cpu_time() - start2)/1000)); start3 = util_cpu_time(); } diff --git a/prism/src/sparse/PS_ProbTransient.cc b/prism/src/sparse/PS_ProbTransient.cc index 290b49e3..4a6df9ef 100644 --- a/prism/src/sparse/PS_ProbTransient.cc +++ b/prism/src/sparse/PS_ProbTransient.cc @@ -197,7 +197,7 @@ jint time // time // print occasional status update if ((util_cpu_time() - start3) > UPDATE_DELAY) { - PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, time); + PS_PrintToMainLog(env, "Iteration %d (of %d): ", iters, (int)time); 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();