Browse Source

Typo in non-convergence error messages.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@24 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 20 years ago
parent
commit
e799b672d6
  1. 2
      prism/src/hybrid/PH_JOR.cc
  2. 2
      prism/src/hybrid/PH_NondetReachReward.cc
  3. 2
      prism/src/hybrid/PH_NondetUntil.cc
  4. 2
      prism/src/hybrid/PH_PSOR.cc
  5. 2
      prism/src/hybrid/PH_Power.cc
  6. 2
      prism/src/hybrid/PH_SOR.cc
  7. 2
      prism/src/mtbdd/PM_JOR.cc
  8. 2
      prism/src/mtbdd/PM_NondetReachReward.cc
  9. 2
      prism/src/mtbdd/PM_NondetUntil.cc
  10. 2
      prism/src/mtbdd/PM_Power.cc
  11. 2
      prism/src/sparse/PS_JOR.cc
  12. 2
      prism/src/sparse/PS_NondetReachReward.cc
  13. 2
      prism/src/sparse/PS_NondetUntil.cc
  14. 2
      prism/src/sparse/PS_Power.cc
  15. 2
      prism/src/sparse/PS_SOR.cc

2
prism/src/hybrid/PH_JOR.cc

@ -300,7 +300,7 @@ jdouble omega // omega (over-relaxation parameter)
delete soln2;
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

2
prism/src/hybrid/PH_NondetReachReward.cc

@ -323,7 +323,7 @@ jboolean min // min or max probabilities (true = min, false = max)
delete soln3;
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

2
prism/src/hybrid/PH_NondetUntil.cc

@ -273,7 +273,7 @@ jboolean min // min or max probabilities (true = min, false = max)
delete soln3;
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

2
prism/src/hybrid/PH_PSOR.cc

@ -338,7 +338,7 @@ jboolean forwards // forwards or backwards?
free(soln2);
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

2
prism/src/hybrid/PH_Power.cc

@ -233,7 +233,7 @@ jboolean transpose // transpose A? (i.e. solve xA=x not Ax=x?)
delete soln2;
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

2
prism/src/hybrid/PH_SOR.cc

@ -428,7 +428,7 @@ jboolean fwds // forwards or backwards?
free(soln2);
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PH_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

2
prism/src/mtbdd/PM_JOR.cc

@ -186,7 +186,7 @@ jdouble omega // omega (jor parameter)
Cudd_RecursiveDeref(ddman, b);
// if the iterative method didn't terminate, this is an error
if (!done) { Cudd_RecursiveDeref(ddman, sol); PM_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { Cudd_RecursiveDeref(ddman, sol); PM_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)sol;
}

2
prism/src/mtbdd/PM_NondetReachReward.cc

@ -191,7 +191,7 @@ jboolean min // min or max probabilities (true = min, false = max)
Cudd_RecursiveDeref(ddman, new_mask);
// if the iterative method didn't terminate, this is an error
if (!done) { Cudd_RecursiveDeref(ddman, sol); PM_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { Cudd_RecursiveDeref(ddman, sol); PM_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)sol;
}

2
prism/src/mtbdd/PM_NondetUntil.cc

@ -165,7 +165,7 @@ jboolean min // min or max probabilities (true = min, false = max)
Cudd_RecursiveDeref(ddman, a);
// if the iterative method didn't terminate, this is an error
if (!done) { Cudd_RecursiveDeref(ddman, sol); PM_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { Cudd_RecursiveDeref(ddman, sol); PM_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)sol;
}

2
prism/src/mtbdd/PM_Power.cc

@ -151,7 +151,7 @@ jboolean transpose // transpose A? (i.e. solve xA=b not Ax=b?)
Cudd_RecursiveDeref(ddman, b);
// if the iterative method didn't terminate, this is an error
if (!done) { Cudd_RecursiveDeref(ddman, sol); PM_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { Cudd_RecursiveDeref(ddman, sol); PM_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)sol;
}

2
prism/src/sparse/PS_JOR.cc

@ -307,7 +307,7 @@ jdouble omega // omega (over-relaxation parameter)
delete soln2;
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

2
prism/src/sparse/PS_NondetReachReward.cc

@ -250,7 +250,7 @@ jboolean min // min or max probabilities (true = min, false = max)
delete soln2;
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;*/
}

2
prism/src/sparse/PS_NondetUntil.cc

@ -220,7 +220,7 @@ jboolean min // min or max probabilities (true = min, false = max)
delete soln2;
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

2
prism/src/sparse/PS_Power.cc

@ -250,7 +250,7 @@ jboolean transpose // transpose A? (i.e. solve xA=x not Ax=x?)
delete soln2;
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

2
prism/src/sparse/PS_SOR.cc

@ -295,7 +295,7 @@ jboolean forwards // forwards or backwards?
if (b != NULL) if (compact_b) free_dist_vector(b_dist); else free(b_vec);
// if the iterative method didn't terminate, this is an error
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increase the maximum number of iterations", iters); return 0; }
if (!done) { delete soln; PS_SetErrorMessage("Iterative method did not converge within %d iterations.\nConsider using a different numerical method or increasing the maximum number of iterations", iters); return 0; }
return (int)soln;
}

Loading…
Cancel
Save