s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

%d to %ld (remaining files) 

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@1932 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Vojtech Forejt 16 years ago
parent
93f250b941
commit
a385efdea6
6 changed files with 18 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      prism/src/hybrid/PH_StochCumulReward.cc
  2. 6
      prism/src/hybrid/PH_StochTransient.cc
  3. 6
      prism/src/mtbdd/PM_StochCumulReward.cc
  4. 6
      prism/src/mtbdd/PM_StochTransient.cc
  5. 6
      prism/src/sparse/PS_StochCumulReward.cc
  6. 6
      prism/src/sparse/PS_StochTransient.cc

6
prism/src/hybrid/PH_StochCumulReward.cc
View File

@ -210,7 +210,7 @@ jdouble time // time bound
for (i = fgw.left; i <= fgw.right; i++) { for (i = fgw.left; i <= fgw.right; i++) {
fgw.weights[i-fgw.left] /= fgw.total_weight; fgw.weights[i-fgw.left] /= fgw.total_weight;
} }
PH_PrintToMainLog(env, "Fox-Glynn: left = %d, right = %d\n", fgw.left, fgw.right);
PH_PrintToMainLog(env, "Fox-Glynn: left = %ld, right = %ld\n", fgw.left, fgw.right);
// modify the poisson probabilities to what we need for this computation // modify the poisson probabilities to what we need for this computation
// first make the kth value equal to the sum of the values for 0...k // first make the kth value equal to the sum of the values for 0...k
@ -297,7 +297,7 @@ jdouble time // time bound
// add to sum // add to sum
for (i = 0; i < n; i++) sum[i] += weight * soln2[i]; for (i = 0; i < n; i++) sum[i] += weight * soln2[i];
PH_PrintToMainLog(env, "\nSteady state detected at iteration %d\n", iters);
PH_PrintToMainLog(env, "\nSteady state detected at iteration %ld\n", iters);
num_iters = iters; num_iters = iters;
break; break;
} }
@ -324,7 +324,7 @@ jdouble time // time bound
// print iters/timing info // print iters/timing info
if (num_iters == -1) num_iters = fgw.right; if (num_iters == -1) num_iters = fgw.right;
PH_PrintToMainLog(env, "\nIterative method: %d iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
PH_PrintToMainLog(env, "\nIterative method: %ld iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
// catch exceptions: register error, free memory // catch exceptions: register error, free memory
} catch (std::bad_alloc e) { } catch (std::bad_alloc e) {

6
prism/src/hybrid/PH_StochTransient.cc
View File

@ -193,7 +193,7 @@ jdouble time // time bound
for (i = fgw.left; i <= fgw.right; i++) { for (i = fgw.left; i <= fgw.right; i++) {
fgw.weights[i-fgw.left] /= fgw.total_weight; fgw.weights[i-fgw.left] /= fgw.total_weight;
} }
PH_PrintToMainLog(env, "Fox-Glynn: left = %d, right = %d\n", fgw.left, fgw.right);
PH_PrintToMainLog(env, "Fox-Glynn: left = %ld, right = %ld\n", fgw.left, fgw.right);
// set up vectors // set up vectors
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -266,7 +266,7 @@ jdouble time // time bound
} }
// add to sum // add to sum
for (i = 0; i < n; i++) sum[i] += weight * soln2[i]; for (i = 0; i < n; i++) sum[i] += weight * soln2[i];
PH_PrintToMainLog(env, "\nSteady state detected at iteration %d\n", iters);
PH_PrintToMainLog(env, "\nSteady state detected at iteration %ld\n", iters);
num_iters = iters; num_iters = iters;
break; break;
} }
@ -291,7 +291,7 @@ jdouble time // time bound
// print iters/timing info // print iters/timing info
if (num_iters == -1) num_iters = fgw.right; if (num_iters == -1) num_iters = fgw.right;
PH_PrintToMainLog(env, "\nIterative method: %d iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
PH_PrintToMainLog(env, "\nIterative method: %ld iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
// catch exceptions: register error, free memory // catch exceptions: register error, free memory
} catch (std::bad_alloc e) { } catch (std::bad_alloc e) {

6
prism/src/mtbdd/PM_StochCumulReward.cc
View File

@ -135,7 +135,7 @@ jdouble time // time bound
for (i = fgw.left; i <= fgw.right; i++) { for (i = fgw.left; i <= fgw.right; i++) {
fgw.weights[i-fgw.left] /= fgw.total_weight; fgw.weights[i-fgw.left] /= fgw.total_weight;
} }
PM_PrintToMainLog(env, "Fox-Glynn: left = %d, right = %d\n", fgw.left, fgw.right);
PM_PrintToMainLog(env, "Fox-Glynn: left = %ld, right = %ld\n", fgw.left, fgw.right);
// modify the poisson probabilities to what we need for this computation // modify the poisson probabilities to what we need for this computation
// first make the kth value equal to the sum of the values for 0...k // first make the kth value equal to the sum of the values for 0...k
@ -206,7 +206,7 @@ jdouble time // time bound
// add to sum // add to sum
Cudd_Ref(tmp); Cudd_Ref(tmp);
sum = DD_Apply(ddman, APPLY_PLUS, sum, DD_Apply(ddman, APPLY_TIMES, tmp, DD_Constant(ddman, weight))); sum = DD_Apply(ddman, APPLY_PLUS, sum, DD_Apply(ddman, APPLY_TIMES, tmp, DD_Constant(ddman, weight)));
PM_PrintToMainLog(env, "\nSteady state detected at iteration %d\n", iters);
PM_PrintToMainLog(env, "\nSteady state detected at iteration %ld\n", iters);
num_iters = iters; num_iters = iters;
Cudd_RecursiveDeref(ddman, tmp); Cudd_RecursiveDeref(ddman, tmp);
break; break;
@ -235,7 +235,7 @@ jdouble time // time bound
// print iters/timing info // print iters/timing info
if (num_iters == -1) num_iters = fgw.right; if (num_iters == -1) num_iters = fgw.right;
PM_PrintToMainLog(env, "\nIterative method: %d iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
PM_PrintToMainLog(env, "\nIterative method: %ld iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
// free memory // free memory
Cudd_RecursiveDeref(ddman, q); Cudd_RecursiveDeref(ddman, q);

6
prism/src/mtbdd/PM_StochTransient.cc
View File

@ -168,7 +168,7 @@ jdouble time // time
for (i = fgw.left; i <= fgw.right; i++) { for (i = fgw.left; i <= fgw.right; i++) {
fgw.weights[i-fgw.left] /= fgw.total_weight; fgw.weights[i-fgw.left] /= fgw.total_weight;
} }
PM_PrintToMainLog(env, "Fox-Glynn: left = %d, right = %d\n", fgw.left, fgw.right);
PM_PrintToMainLog(env, "Fox-Glynn: left = %ld, right = %ld\n", fgw.left, fgw.right);
// PM_PrintToMainLog(env, "right-left = %d\n", fgw.right-fgw.left); // PM_PrintToMainLog(env, "right-left = %d\n", fgw.right-fgw.left);
// PM_PrintToMainLog(env, "total_weight = %f\n", fgw.total_weight); // PM_PrintToMainLog(env, "total_weight = %f\n", fgw.total_weight);
@ -264,7 +264,7 @@ jdouble time // time
// add to sum // add to sum
Cudd_Ref(tmp); Cudd_Ref(tmp);
sum = DD_Apply(ddman, APPLY_PLUS, sum, DD_Apply(ddman, APPLY_TIMES, tmp, DD_Constant(ddman, weight))); sum = DD_Apply(ddman, APPLY_PLUS, sum, DD_Apply(ddman, APPLY_TIMES, tmp, DD_Constant(ddman, weight)));
PM_PrintToMainLog(env, "\nSteady state detected at iteration %d\n", iters);
PM_PrintToMainLog(env, "\nSteady state detected at iteration %ld\n", iters);
num_iters = iters; num_iters = iters;
Cudd_RecursiveDeref(ddman, tmp); Cudd_RecursiveDeref(ddman, tmp);
break; break;
@ -293,7 +293,7 @@ jdouble time // time
// print iterations/timing info // print iterations/timing info
if (num_iters == -1) num_iters = fgw.right; if (num_iters == -1) num_iters = fgw.right;
PM_PrintToMainLog(env, "\nIterative method: %d iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
PM_PrintToMainLog(env, "\nIterative method: %ld iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
// free memory // free memory
if (combine) { if (combine) {

6
prism/src/sparse/PS_StochCumulReward.cc
View File

@ -199,7 +199,7 @@ jdouble time // time bound
for (i = fgw.left; i <= fgw.right; i++) { for (i = fgw.left; i <= fgw.right; i++) {
fgw.weights[i-fgw.left] /= fgw.total_weight; fgw.weights[i-fgw.left] /= fgw.total_weight;
} }
PS_PrintToMainLog(env, "Fox-Glynn: left = %d, right = %d\n", fgw.left, fgw.right);
PS_PrintToMainLog(env, "Fox-Glynn: left = %ld, right = %ld\n", fgw.left, fgw.right);
// modify the poisson probabilities to what we need for this computation // modify the poisson probabilities to what we need for this computation
// first make the kth value equal to the sum of the values for 0...k // first make the kth value equal to the sum of the values for 0...k
@ -322,7 +322,7 @@ jdouble time // time bound
// add to sum // add to sum
for (i = 0; i < n; i++) sum[i] += weight * soln2[i]; for (i = 0; i < n; i++) sum[i] += weight * soln2[i];
PS_PrintToMainLog(env, "\nSteady state detected at iteration %d\n", iters);
PS_PrintToMainLog(env, "\nSteady state detected at iteration %ld\n", iters);
num_iters = iters; num_iters = iters;
break; break;
} }
@ -349,7 +349,7 @@ jdouble time // time bound
// print iters/timing info // print iters/timing info
if (num_iters == -1) num_iters = fgw.right; if (num_iters == -1) num_iters = fgw.right;
PS_PrintToMainLog(env, "\nIterative method: %d iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
PS_PrintToMainLog(env, "\nIterative method: %ld iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
// catch exceptions: register error, free memory // catch exceptions: register error, free memory
} catch (std::bad_alloc e) { } catch (std::bad_alloc e) {

6
prism/src/sparse/PS_StochTransient.cc
View File

@ -181,7 +181,7 @@ jdouble time // time bound
for (i = fgw.left; i <= fgw.right; i++) { for (i = fgw.left; i <= fgw.right; i++) {
fgw.weights[i-fgw.left] /= fgw.total_weight; fgw.weights[i-fgw.left] /= fgw.total_weight;
} }
PS_PrintToMainLog(env, "Fox-Glynn: left = %d, right = %d\n", fgw.left, fgw.right);
PS_PrintToMainLog(env, "Fox-Glynn: left = %ld, right = %ld\n", fgw.left, fgw.right);
// set up vectors // set up vectors
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -291,7 +291,7 @@ jdouble time // time bound
} }
// add to sum // add to sum
for (i = 0; i < n; i++) sum[i] += weight * soln2[i]; for (i = 0; i < n; i++) sum[i] += weight * soln2[i];
PS_PrintToMainLog(env, "\nSteady state detected at iteration %d\n", iters);
PS_PrintToMainLog(env, "\nSteady state detected at iteration %ld\n", iters);
num_iters = iters; num_iters = iters;
break; break;
} }
@ -316,7 +316,7 @@ jdouble time // time bound
// print iters/timing info // print iters/timing info
if (num_iters == -1) num_iters = fgw.right; if (num_iters == -1) num_iters = fgw.right;
PS_PrintToMainLog(env, "\nIterative method: %d iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
PS_PrintToMainLog(env, "\nIterative method: %ld iterations in %.2f seconds (average %.6f, setup %.2f)\n", num_iters, time_taken, time_for_iters/num_iters, time_for_setup);
// catch exceptions: register error, free memory // catch exceptions: register error, free memory
} catch (std::bad_alloc e) { } catch (std::bad_alloc e) {

Write Preview
Loading…
Cancel
Save