Module: ppl/ppl Branch: master Commit: da2c524c22e01f64ad90f1d38c0a18e506091086 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=da2c524c22e01... Author: Enea Zaffanella <zaffanella@cs.unipr.it> Date: Mon Apr 23 13:29:55 2012 +0200 Corrected expected results for (overflowing) tests on bounded coefficients. --- demos/ppl_lpsol/expected_int16_a | 62 +++++++++++++++++-------- demos/ppl_lpsol/expected_int8_a | 20 ++++++++ interfaces/Prolog/tests/expected_pchk_int8_a | 2 +- 3 files changed, 63 insertions(+), 21 deletions(-) diff --git a/demos/ppl_lpsol/expected_int16_a b/demos/ppl_lpsol/expected_int16_a index 95ea251..2bfba03 100644 --- a/demos/ppl_lpsol/expected_int16_a +++ b/demos/ppl_lpsol/expected_int16_a @@ -3,21 +3,27 @@ PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -n ex1.mps Feasible problem. *** ./ppl_lpsol -s -p1 -oobtained -n lseu.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -n markshare1.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -n markshare2.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -n mip.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -n p0033.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -n unboundedmin.mps Feasible problem. *** ./ppl_lpsol -s -p1 -oobtained -m ex1.mps -PPL error code -6: Positive overflow. +Optimum value: -3 +Optimum location: +x1 = 1 +x2 = 2 *** ./ppl_lpsol -s -p1 -oobtained -M ex1.mps -PPL error code -6: Positive overflow. +Optimum value: 2 +Optimum location: +x1 = 2 +x2 = 0 *** ./ppl_lpsol -s -p1 -oobtained -m mip.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -M mip.mps @@ -25,11 +31,14 @@ PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -m p0033.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -M p0033.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -m unboundedmin.mps Unbounded problem. *** ./ppl_lpsol -s -p1 -oobtained -M unboundedmin.mps -PPL error code -6: Positive overflow. +Optimum value: 0 +Optimum location: +x1 = 0 +x2 = 0 *** ./ppl_lpsol -s -p1 -oobtained -r -m adlittle.mps PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M adlittle.mps @@ -51,9 +60,15 @@ PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M egout.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m ex1.mps -PPL error code -6: Positive overflow. +Optimum value: -3.75 +Optimum location: +x1 = 1.25 +x2 = 2.5 *** ./ppl_lpsol -s -p1 -oobtained -r -M ex1.mps -PPL error code -6: Positive overflow. +Optimum value: 2.5 +Optimum location: +x1 = 2.5 +x2 = 0 *** ./ppl_lpsol -s -p1 -oobtained -r -m kb2.mps PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M kb2.mps @@ -61,15 +76,15 @@ PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m lseu.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M lseu.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m markshare1.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M markshare1.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m markshare2.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M markshare2.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m mas76.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M mas76.mps @@ -77,7 +92,7 @@ PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m mip.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M mip.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m noswot.mps PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M noswot.mps @@ -85,13 +100,17 @@ PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m p0033.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M p0033.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m pk1.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M pk1.mps -PPL error code -6: Negative overflow. -*** ./ppl_lpsol -s -p1 -oobtained -r -m sample.mps PPL error code -6: Positive overflow. +*** ./ppl_lpsol -s -p1 -oobtained -r -m sample.mps +Optimum value: -733.3333333 +Optimum location: +x1 = 33.33333333 +x2 = 66.66666667 +x3 = 0 *** ./ppl_lpsol -s -p1 -oobtained -r -M sample.mps Optimum value: 0 Optimum location: @@ -113,7 +132,10 @@ PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m unboundedmin.mps Unbounded problem. *** ./ppl_lpsol -s -p1 -oobtained -r -M unboundedmin.mps -PPL error code -6: Positive overflow. +Optimum value: 0 +Optimum location: +x1 = 0 +x2 = 0 *** ppl_lpsol -e -r -oobtained bgprtr.mps PPL error code -6: Negative overflow. *** ppl_lpsol -e -r -oobtained ex1.mps @@ -129,7 +151,7 @@ X2 = 4.571428571 X3 = 0.5714285714 X4 = 3 *** ppl_lpsol -e -r -oobtained sample.mps -PPL error code -6: Negative overflow. +PPL error code -6: Positive overflow. *** ppl_lpsol -e -r -oobtained unboundedmin.mps Optimum value: 0 Optimum location: diff --git a/demos/ppl_lpsol/expected_int8_a b/demos/ppl_lpsol/expected_int8_a index faa63f3..f00b5d1 100644 --- a/demos/ppl_lpsol/expected_int8_a +++ b/demos/ppl_lpsol/expected_int8_a @@ -9,14 +9,19 @@ PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -n markshare2.mps PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -n mip.mps +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -n p0033.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -n unboundedmin.mps Feasible problem. *** ./ppl_lpsol -s -p1 -oobtained -m ex1.mps +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -M ex1.mps +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -m mip.mps +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -M mip.mps +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -m p0033.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -M p0033.mps @@ -24,6 +29,10 @@ PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -m unboundedmin.mps Unbounded problem. *** ./ppl_lpsol -s -p1 -oobtained -M unboundedmin.mps +Optimum value: 0 +Optimum location: +x1 = 0 +x2 = 0 *** ./ppl_lpsol -s -p1 -oobtained -r -m adlittle.mps PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M adlittle.mps @@ -45,7 +54,12 @@ PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M egout.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m ex1.mps +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M ex1.mps +Optimum value: 2.5 +Optimum location: +x1 = 2.5 +x2 = 0 *** ./ppl_lpsol -s -p1 -oobtained -r -m kb2.mps PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M kb2.mps @@ -67,7 +81,9 @@ PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M mas76.mps PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m mip.mps +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M mip.mps +PPL error code -6: Positive overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m noswot.mps PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -M noswot.mps @@ -99,6 +115,10 @@ PPL error code -6: Negative overflow. *** ./ppl_lpsol -s -p1 -oobtained -r -m unboundedmin.mps Unbounded problem. *** ./ppl_lpsol -s -p1 -oobtained -r -M unboundedmin.mps +Optimum value: 0 +Optimum location: +x1 = 0 +x2 = 0 *** ppl_lpsol -e -r -oobtained bgprtr.mps PPL error code -6: Positive overflow. *** ppl_lpsol -e -r -oobtained ex1.mps diff --git a/interfaces/Prolog/tests/expected_pchk_int8_a b/interfaces/Prolog/tests/expected_pchk_int8_a index 45056d1..c1a4555 100644 --- a/interfaces/Prolog/tests/expected_pchk_int8_a +++ b/interfaces/Prolog/tests/expected_pchk_int8_a @@ -3,5 +3,5 @@ Error: an overflow has been detected by the PPL: Positive overflow. Error: an overflow has been detected by the PPL: Negative overflow. -Error: an overflow has been detected by the PPL: Negative overflow. +Error: an overflow has been detected by the PPL: Positive overflow. OK