Module: ppl/ppl Branch: bounded_arithmetic Commit: 4329b457a9b6d298b56756f7ac94595a21b4c0c3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4329b457a9b6d... Author: Alberto Gioia <alberto.gioia1@studenti.unipr.it> Date: Mon Sep 19 12:40:44 2011 +0200 Modified and corrected noisy output. --- tests/Concrete_Expression/linearize_int_and.cc | 6 ++-- tests/Concrete_Expression/linearize_int_lshift.cc | 4 +- tests/Concrete_Expression/linearize_int_or.cc | 22 ++++++++++---------- tests/Concrete_Expression/linearize_int_rshift.cc | 1 - tests/Concrete_Expression/linearize_int_xor.cc | 20 +++++++++--------- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/tests/Concrete_Expression/linearize_int_and.cc b/tests/Concrete_Expression/linearize_int_and.cc index 1fcb831..886c5c5 100644 --- a/tests/Concrete_Expression/linearize_int_and.cc +++ b/tests/Concrete_Expression/linearize_int_and.cc @@ -554,11 +554,11 @@ test07() { bool failed_and = false; - nout << "*** " << known_result << " << " << lf << " ***" << endl; + nout << "*** " << known_result << " & " << lf << " ***" << endl; if (!linearize_int(band, oracle, Integer_Linear_Form_Abstract_Store(), result)) { - nout << "*** Linearization failed, the two linear forms have " - << "different size *** " << endl; + nout << "*** Linearization failed, the two linear forms " + << "do not have the same variables. *** " << endl; failed_and = true; } diff --git a/tests/Concrete_Expression/linearize_int_lshift.cc b/tests/Concrete_Expression/linearize_int_lshift.cc index 35c927d..1262d0f 100644 --- a/tests/Concrete_Expression/linearize_int_lshift.cc +++ b/tests/Concrete_Expression/linearize_int_lshift.cc @@ -1498,7 +1498,7 @@ test12() { } /* - Tests linearization A + 4*B + 3*C + [3, 9] >> 3*A + B + 2*C + [9, 12] + Tests linearization A + 4*B + 3*C + [3, 9] << 3*A + B + 2*C + [9, 12] where A in [1, 2], B in [3, 5] and C in [0, 2]. */ bool @@ -1598,7 +1598,7 @@ test13() { linearize_int(lshift, oracle, Integer_Linear_Form_Abstract_Store(), result); - nout << "*** " << known_result << " >> " << lf << " ***" << endl + nout << "*** " << known_result << " << " << lf << " ***" << endl << "*** result *** " << endl << result << endl; known_result << tmp; diff --git a/tests/Concrete_Expression/linearize_int_or.cc b/tests/Concrete_Expression/linearize_int_or.cc index 3749f8b..a3b0206 100644 --- a/tests/Concrete_Expression/linearize_int_or.cc +++ b/tests/Concrete_Expression/linearize_int_or.cc @@ -143,7 +143,7 @@ test02() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); @@ -222,7 +222,7 @@ test03() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -308,7 +308,7 @@ test04() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -386,7 +386,7 @@ test05() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -508,7 +508,7 @@ bool test07() { Integer_Int_Interval tmp(1); Integer_Int_Interval tmp1(5); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -538,11 +538,11 @@ test07() { bool failed_or = false; - nout << "*** " << known_result << " << " << lf << " ***" << endl; + nout << "*** " << known_result << " | " << lf << " ***" << endl; if (!linearize_int(bor, oracle, Integer_Linear_Form_Abstract_Store(), result)) { - nout << "*** Linearization failed, the two linear forms have " - << "different size *** " << endl; + nout << "*** Linearization failed, the two linear forms " + << "do not have the same variables. *** " << endl; failed_or = true; } @@ -627,7 +627,7 @@ test09() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -722,7 +722,7 @@ test10() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " or B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -816,7 +816,7 @@ test11() { tmp.join_assign(4); Integer_Int_Interval tmp1(5); tmp1.join_assign(9); - nout << "A in " << tmp << "and B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); diff --git a/tests/Concrete_Expression/linearize_int_rshift.cc b/tests/Concrete_Expression/linearize_int_rshift.cc index 6ac8ec9..c3a3958 100644 --- a/tests/Concrete_Expression/linearize_int_rshift.cc +++ b/tests/Concrete_Expression/linearize_int_rshift.cc @@ -306,7 +306,6 @@ test02() { tmp2 *= a1; tmp2 += b1 * tmp3; tmp2 += inh_term1; - std::cout << "tmp2 vale " << tmp2 << std::endl; linearize_int(rshift, oracle1, Integer_Linear_Form_Abstract_Store(), result ); diff --git a/tests/Concrete_Expression/linearize_int_xor.cc b/tests/Concrete_Expression/linearize_int_xor.cc index 86289cb..3492721 100644 --- a/tests/Concrete_Expression/linearize_int_xor.cc +++ b/tests/Concrete_Expression/linearize_int_xor.cc @@ -161,7 +161,7 @@ test02() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); @@ -240,7 +240,7 @@ test03() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -326,7 +326,7 @@ test04() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -404,7 +404,7 @@ test05() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -526,7 +526,7 @@ bool test07() { Integer_Int_Interval tmp(1); Integer_Int_Interval tmp1(5); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -556,11 +556,11 @@ test07() { bool failed_xor = false; - nout << "*** " << known_result << " << " << lf << " ***" << endl; + nout << "*** " << known_result << " ^ " << lf << " ***" << endl; if (!linearize_int(bxor, oracle, Integer_Linear_Form_Abstract_Store(), result )) { - nout << "*** Linearization failed, the two linear forms have " - << "different size *** " << endl; + nout << "*** Linearization failed, the two linear forms " + << "do not have the same variables. *** " << endl; failed_xor = true; } @@ -645,7 +645,7 @@ test09() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1); @@ -740,7 +740,7 @@ test10() { tmp.join_assign(1); Integer_Int_Interval tmp1(2); tmp1.join_assign(3); - nout << "A in " << tmp << " xor B in " << tmp1 << endl; + nout << "A in " << tmp << " and B in " << tmp1 << endl; Test_Oracle oracle(Integer_Interval_Abstract_Store(2)); oracle.int_store.set_interval(Variable(0), tmp); oracle.int_store.set_interval(Variable(1), tmp1);