April 2012 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Test PIP_Problem/ weightwatch1 requires unbounded coefficients.
by Enea Zaffanella 11 Apr '12

11 Apr '12

Module: ppl/ppl Branch: master Commit: ebf2319c2e73d90dd89d4baca45b91834a089f50 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ebf2319c2e73… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Apr 11 17:25:13 2012 +0200 Test PIP_Problem/weightwatch1 requires unbounded coefficients. --- tests/PIP_Problem/weightwatch1.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/PIP_Problem/weightwatch1.cc b/tests/PIP_Problem/weightwatch1.cc index 653d129..0218b12 100644 --- a/tests/PIP_Problem/weightwatch1.cc +++ b/tests/PIP_Problem/weightwatch1.cc @@ -183,5 +183,5 @@ test01() { } // namespace BEGIN_MAIN - DO_TEST(test01); + DO_TEST_F64(test01); END_MAIN

1 0

[GIT] ppl/ppl(master): Modified signature of function set_deterministic_timeout().
by Enea Zaffanella 11 Apr '12

11 Apr '12

Module: ppl/ppl Branch: master Commit: 04c81f986d57e815bf6e987478008e69c97273be URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=04c81f986d57… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Apr 11 15:31:41 2012 +0200 Modified signature of function set_deterministic_timeout(). --- interfaces/C/ppl_c_header.h | 23 +++++++++++++------ interfaces/C/ppl_c_implementation_common.cc | 7 ++++- interfaces/C/tests/weightwatch1.c | 4 +- interfaces/Java/jni/ppl_java_globals.cc | 14 +++++++---- .../Parma_Polyhedra_Library.java | 23 ++++++++++++++----- .../Java/tests/Parma_Polyhedra_Library_test2.java | 2 +- interfaces/OCaml/ppl_ocaml_common.cc | 12 +++++++--- interfaces/OCaml/ppl_ocaml_globals.ml | 2 +- interfaces/OCaml/ppl_ocaml_globals.mli | 2 +- interfaces/OCaml/tests/test1.ml | 4 +- interfaces/Prolog/Prolog_interface_sysindep.dox | 10 ++++++-- ...erface_generator_prolog_procedure_generators.m4 | 2 +- interfaces/Prolog/ppl_prolog_common.cc | 15 ++++++++---- interfaces/Prolog/ppl_prolog_common.defs.hh | 3 +- src/Threshold_Watcher.inlines.hh | 5 +++- src/globals.defs.hh | 14 ++++++++++++ src/globals.inlines.hh | 9 +++++++ 17 files changed, 109 insertions(+), 42 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=04c81f98…

1 0

[GIT] ppl/ppl(master): Fixed a bug in the Prolog interface whereby predicate ppl_set_deterministic_timeout /1.
by Roberto Bagnara 07 Apr '12

07 Apr '12

Module: ppl/ppl Branch: master Commit: 0f021f3e7bd4d84cc2ebff07d41af4ae2ef5c9d3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0f021f3e7bd4… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 7 19:33:27 2012 +0200 Fixed a bug in the Prolog interface whereby predicate ppl_set_deterministic_timeout/1. It was flagging arguments bigger than 4294967295 as erroneous. --- NEWS | 4 ++++ interfaces/Prolog/ppl_prolog_common.cc | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 1b83c0f..8efb8a6 100644 --- a/NEWS +++ b/NEWS @@ -34,6 +34,10 @@ o Two BibTeX databases of papers related to the Parma Polyhedra Library Bugfixes ======== +o Fixed a bug in the Prolog interface whereby predicate + ppl_set_deterministic_timeout/1 was flagging arguments bigger than + 4294967295 as erroneous. + o Minor documentation fixes. o Portability improved. diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index af94425..47c45d3 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -1930,11 +1930,11 @@ ppl_set_deterministic_timeout(Prolog_term_ref t_weight) { // In case a deterministic timeout was already set. reset_deterministic_timeout(); static deterministic_timeout_exception e; - unsigned weight - = term_to_unsigned<unsigned>(t_weight, - "ppl_set_deterministic_timeout/1"); - p_deterministic_timeout_object = - new Weightwatch(weight, abandon_expensive_computations, e); + unsigned long long weight + = term_to_unsigned<unsigned long long>(t_weight, + "ppl_set_deterministic_timeout/1"); + p_deterministic_timeout_object + = new Weightwatch(weight, abandon_expensive_computations, e); return PROLOG_SUCCESS; } CATCH_ALL;

1 0

[GIT] ppl/ppl(master): Revert "The function ppl_set_deterministic_timeout() in the C interface now takes an unsigned long long parameter."
by Roberto Bagnara 07 Apr '12

07 Apr '12

Module: ppl/ppl Branch: master Commit: 2bd121ac6dd6ab6fd9429117d2348c1ce5091b3a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2bd121ac6dd6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 7 19:27:28 2012 +0200 Revert "The function ppl_set_deterministic_timeout() in the C interface now takes an unsigned long long parameter." This reverts commit 7781b2d72ad31906c830a16a942b31ac305924c2. --- NEWS | 4 ---- interfaces/C/ppl_c_header.h | 2 +- interfaces/C/ppl_c_implementation_common.cc | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/NEWS b/NEWS index d11adc3..1b83c0f 100644 --- a/NEWS +++ b/NEWS @@ -30,10 +30,6 @@ o Added new Box<ITV> methods o Two BibTeX databases of papers related to the Parma Polyhedra Library have been added to the distribution (in the `doc' directory). -o The function ppl_set_deterministic_timeout() in the C interface now - takes an unsigned long long parameter (it erroneously used to take - an unsigned int). - Bugfixes ======== diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index aa8d02d..11ed31c 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -420,7 +420,7 @@ ppl_reset_timeout PPL_PROTO((void)); weight thresholds when upgrading to newer version of the PPL. */ int -ppl_set_deterministic_timeout PPL_PROTO((unsigned long long weight)); +ppl_set_deterministic_timeout PPL_PROTO((unsigned weight)); /*! \brief Resets the deterministic timeout so that the computation is not interrupted. diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index d0c5e6b..045765c 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -259,7 +259,7 @@ ppl_reset_timeout(void) try { CATCH_ALL int -ppl_set_deterministic_timeout(unsigned long long weight) try { +ppl_set_deterministic_timeout(unsigned weight) try { // In case a deterministic timeout was already set. reset_deterministic_timeout(); static timeout_exception e;

1 0

[GIT] ppl/ppl(master): Substituted "alpha testing" with "beta testing".
by Roberto Bagnara 07 Apr '12

07 Apr '12

Module: ppl/ppl Branch: master Commit: 6e61b4cb77286d02bb152f4285d32cc3e088633a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6e61b4cb7728… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 7 19:08:46 2012 +0200 Substituted "alpha testing" with "beta testing". --- interfaces/C/ppl_c_header.h | 2 +- .../Parma_Polyhedra_Library.java | 2 +- interfaces/OCaml/OCaml_interface.dox | 2 +- interfaces/Prolog/Prolog_interface_sysindep.dox | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 066ced4..aa8d02d 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -413,7 +413,7 @@ ppl_reset_timeout PPL_PROTO((void)); (CPU, operating system, compiler, etc.). \warning - The weight mechanism is under alpha testing. In particular, + The weight mechanism is under beta testing. In particular, there is still no clear relation between the weight threshold and the actual computational complexity. As a consequence, client applications should be ready to reconsider the tuning of these diff --git a/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java b/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java index ca8295e..a843288 100644 --- a/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java +++ b/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java @@ -282,7 +282,7 @@ public class Parma_Polyhedra_Library { (CPU, operating system, compiler, etc.). \warning - The weight mechanism is under alpha testing. In particular, + The weight mechanism is under beta testing. In particular, there is still no clear relation between the weight threshold and the actual computational complexity. As a consequence, client applications should be ready to reconsider the tuning of these diff --git a/interfaces/OCaml/OCaml_interface.dox b/interfaces/OCaml/OCaml_interface.dox index cc61254..757ce02 100644 --- a/interfaces/OCaml/OCaml_interface.dox +++ b/interfaces/OCaml/OCaml_interface.dox @@ -227,7 +227,7 @@ included with all instantiations of the OCaml interfaces. Its behavior will only depend on (some of the) computations performed in the PPL library and it will be otherwise independent from the computation environment (CPU, operating system, compiler, etc.). - The weight mechanism is under alpha testing: client applications + The weight mechanism is under beta testing: client applications should be ready to reconsider the tuning of these weight thresholds when upgrading to newer version of the PPL. diff --git a/interfaces/Prolog/Prolog_interface_sysindep.dox b/interfaces/Prolog/Prolog_interface_sysindep.dox index 9d10d31..9ee52d8 100644 --- a/interfaces/Prolog/Prolog_interface_sysindep.dox +++ b/interfaces/Prolog/Prolog_interface_sysindep.dox @@ -430,7 +430,7 @@ that are included with all instantiations of the Prolog interfaces. Its behavior will only depend on (some of the) computations performed in the PPL library and it will be otherwise independent from the computation environment (CPU, operating system, compiler, etc.). - The weight mechanism is under alpha testing: client applications + The weight mechanism is under beta testing: client applications should be ready to reconsider the tuning of these weight thresholds when upgrading to newer version of the PPL.

1 0

[GIT] ppl/ppl(master): The function ppl_set_deterministic_timeout() in the C interface now takes an unsigned long long parameter.
by Roberto Bagnara 07 Apr '12

07 Apr '12

Module: ppl/ppl Branch: master Commit: 7781b2d72ad31906c830a16a942b31ac305924c2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7781b2d72ad3… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 7 19:02:56 2012 +0200 The function ppl_set_deterministic_timeout() in the C interface now takes an unsigned long long parameter. It erroneously used to take an unsigned int. --- NEWS | 4 ++++ interfaces/C/ppl_c_header.h | 2 +- interfaces/C/ppl_c_implementation_common.cc | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 1b83c0f..d11adc3 100644 --- a/NEWS +++ b/NEWS @@ -30,6 +30,10 @@ o Added new Box<ITV> methods o Two BibTeX databases of papers related to the Parma Polyhedra Library have been added to the distribution (in the `doc' directory). +o The function ppl_set_deterministic_timeout() in the C interface now + takes an unsigned long long parameter (it erroneously used to take + an unsigned int). + Bugfixes ======== diff --git a/interfaces/C/ppl_c_header.h b/interfaces/C/ppl_c_header.h index 237e35f..066ced4 100644 --- a/interfaces/C/ppl_c_header.h +++ b/interfaces/C/ppl_c_header.h @@ -420,7 +420,7 @@ ppl_reset_timeout PPL_PROTO((void)); weight thresholds when upgrading to newer version of the PPL. */ int -ppl_set_deterministic_timeout PPL_PROTO((unsigned weight)); +ppl_set_deterministic_timeout PPL_PROTO((unsigned long long weight)); /*! \brief Resets the deterministic timeout so that the computation is not interrupted. diff --git a/interfaces/C/ppl_c_implementation_common.cc b/interfaces/C/ppl_c_implementation_common.cc index 045765c..d0c5e6b 100644 --- a/interfaces/C/ppl_c_implementation_common.cc +++ b/interfaces/C/ppl_c_implementation_common.cc @@ -259,7 +259,7 @@ ppl_reset_timeout(void) try { CATCH_ALL int -ppl_set_deterministic_timeout(unsigned weight) try { +ppl_set_deterministic_timeout(unsigned long long weight) try { // In case a deterministic timeout was already set. reset_deterministic_timeout(); static timeout_exception e;

1 0

[GIT] ppl/ppl(master): Profiled.
by Roberto Bagnara 07 Apr '12

07 Apr '12

Module: ppl/ppl Branch: master Commit: fc119cc72ae7d0e6e273b4436ada333e3e2c8111 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fc119cc72ae7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 7 18:58:33 2012 +0200 Profiled. --- src/PIP_Tree.cc | 153 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 85 insertions(+), 68 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=fc119cc7…

1 0

[GIT] ppl/ppl(master): New test program.
by Roberto Bagnara 07 Apr '12

07 Apr '12

Module: ppl/ppl Branch: master Commit: e5e0f990123db2349c4d27c2fd0bea9b5851961d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e5e0f990123d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 7 18:41:48 2012 +0200 New test program. --- tests/PIP_Problem/Makefile.am | 5 +- tests/PIP_Problem/{bug1.cc => weightwatch1.cc} | 71 ++++++++++++++++++++++- 2 files changed, 71 insertions(+), 5 deletions(-) diff --git a/tests/PIP_Problem/Makefile.am b/tests/PIP_Problem/Makefile.am index 1d7bc47..8bab0f7 100644 --- a/tests/PIP_Problem/Makefile.am +++ b/tests/PIP_Problem/Makefile.am @@ -54,7 +54,8 @@ $(top_builddir)/src/libppl.la \ TESTS = \ ascii_dump_load1 \ exceptions1 \ -pipproblem1 pipproblem2 pipproblem3 +pipproblem1 pipproblem2 pipproblem3 \ +weightwatch1 XFAIL_TESTS = @@ -72,6 +73,8 @@ pipproblem1_SOURCES = pipproblem1.cc pipproblem2_SOURCES = pipproblem2.cc pipproblem3_SOURCES = pipproblem3.cc +weightwatch1_SOURCES = weightwatch1.cc + check_PROGRAMS = \ $(TESTS) \ $(BUGS) diff --git a/tests/PIP_Problem/bug1.cc b/tests/PIP_Problem/weightwatch1.cc similarity index 63% rename from tests/PIP_Problem/bug1.cc rename to tests/PIP_Problem/weightwatch1.cc index 76c7f68..653d129 100644 --- a/tests/PIP_Problem/bug1.cc +++ b/tests/PIP_Problem/weightwatch1.cc @@ -1,4 +1,4 @@ -/* Reproduce Mantis issue [PPL 0000353]. +/* Test PIP_Problem (and MIP_Problem) with respect to deterministic timeouts. Copyright (C) 2001-2010 Roberto Bagnara <bagnara(a)cs.unipr.it> Copyright (C) 2010-2012 BUGSENG srl (http://bugseng.com) @@ -33,6 +33,33 @@ using std::ios_base; namespace { +typedef +Parma_Polyhedra_Library::Threshold_Watcher<Weightwatch_Traits> Weightwatch; + +class Deterministic_Timeout + : virtual public std::exception, + public Parma_Polyhedra_Library::Throwable { +public: + const char* what() const throw() { + return "deterministic timeout in weightwatch1.cc"; + } + + void throw_me() const { + throw *this; + } + + int priority() const { + return 0; + } + + ~Deterministic_Timeout() throw() { + } +}; + +void too_fat() { + throw Deterministic_Timeout(); +} + bool test01() { Variable A(0); @@ -109,12 +136,48 @@ test01() { cs.insert(O >= 0); cs.insert(H >= 0); - PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + try { + PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + + Weightwatch ww(200000000, too_fat); - if (pip.is_satisfiable()) + (void) pip.is_satisfiable(); + + // Should not get there. + return false; + } + // Note: other exceptions are just propagated. + catch (const Deterministic_Timeout& e) { + // Expected timeout exception. + nout << endl << e.what() << endl; + + try { + MIP_Problem mip(cs.space_dimension(), cs.begin(), cs.end(), params); + // Set all variable to be constrained to have an integer value. + mip.add_to_integer_space_dimensions(Variables_Set(A, F1)); + + Weightwatch ww(4000000, too_fat); + + if (mip.is_satisfiable()) { + nout << "mip is satisfiable?!" << endl; + return false; + } + + return true; + } + // Note: other exceptions are just propagated. + catch (const Deterministic_Timeout& e) { + // Unexpected timeout exception. + nout << endl << e.what() << endl; + return false; + } + + // Should never get here. return false; + } - return true; + // Should never get here. + return false; } } // namespace

1 0

[GIT] ppl/ppl(master): Comments improved.
by Roberto Bagnara 07 Apr '12

07 Apr '12

Module: ppl/ppl Branch: master Commit: a218c114b0f2e7ac8f1f0c76b9757bde7ad77ff8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a218c114b0f2… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Apr 7 18:38:17 2012 +0200 Comments improved. --- tests/MIP_Problem/mipproblem1.cc | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/MIP_Problem/mipproblem1.cc b/tests/MIP_Problem/mipproblem1.cc index 3371ab3..46eb895 100644 --- a/tests/MIP_Problem/mipproblem1.cc +++ b/tests/MIP_Problem/mipproblem1.cc @@ -1367,7 +1367,7 @@ test06() { if (pg != pg_kr) return false; - // Set Variable A to be constrained to have an integer value. + // Set variable A to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(A)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1379,7 +1379,7 @@ test06() { if (pg != pg_kr) return false; - // Set Variable B to be constrained to have an integer value. + // Set variable B to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(B)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1426,7 +1426,7 @@ test07() { if (pg != pg_kr) return false; - // Set Variable A to be constrained to have an integer value. + // Set variable A to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(A)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1442,7 +1442,7 @@ test07() { if (pg != pg_kr) return false; - // Set Variable B to be constrained to have an integer value. + // Set variable B to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(B)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1506,7 +1506,7 @@ test08() { if (pg != pg_kr) return false; - // Set Variable A to be constrained to have an integer value. + // Set variable A to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(A)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1523,7 +1523,7 @@ test08() { if (pg != pg_kr) return false; - // Set Variable B to be constrained to have an integer value. + // Set variable B to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(B)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1539,7 +1539,7 @@ test08() { if (pg != pg_kr) return false; - // Set Variable C to be constrained to have an integer value. + // Set variable C to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(C)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1555,7 +1555,7 @@ test08() { if (pg != pg_kr) return false; - // Set Variable D to be constrained to have an integer value. + // Set variable D to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(D)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1606,7 +1606,7 @@ test09() { if (pg != pg_kr) return false; - // Set Variable A to be constrained to have an integer value. + // Set variable A to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(A)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1619,7 +1619,7 @@ test09() { if (pg != pg_kr) return false; - // Set Variable B to be constrained to have an integer value. + // Set variable B to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(B)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den); @@ -1632,7 +1632,7 @@ test09() { if (pg != pg_kr) return false; - // Set Variable C to be constrained to have an integer value. + // Set variable C to be constrained to have an integer value. mip.add_to_integer_space_dimensions(Variables_Set(C)); pg = mip.optimizing_point(); mip.evaluate_objective_function(pg, num, den);

1 0

[GIT] ppl/ppl(master): Ignore always unhandled bits.
by Abramo Bagnara 07 Apr '12

07 Apr '12

Module: ppl/ppl Branch: master Commit: e4dbb6e73d34028361b3ae69cd7324318a0ff720 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e4dbb6e73d34… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Sat Apr 7 15:54:20 2012 +0200 Ignore always unhandled bits. --- src/Linear_Row.cc | 62 +++++++++++++++++++++++++++++------------------------ 1 files changed, 34 insertions(+), 28 deletions(-) diff --git a/src/Linear_Row.cc b/src/Linear_Row.cc index a3646c4..86204ac 100644 --- a/src/Linear_Row.cc +++ b/src/Linear_Row.cc @@ -142,37 +142,35 @@ PPL::Linear_Row::all_homogeneous_terms_are_zero() const { namespace { // These are the keywords that indicate the individual assertions. -const char* rpi_valid = "RPI_V"; -const char* is_rpi = "RPI"; -const char* nnc_valid = "NNC_V"; -const char* is_nnc = "NNC"; -const char* bit_names[] = {rpi_valid, is_rpi, nnc_valid, is_nnc}; +const char* rpi_valid_text = "RPI_V"; +const char* is_rpi_text = "RPI"; +const char* nnc_valid_text = "NNC_V"; +const char* is_nnc_text = "NNC"; +const char* bit_texts[] = {rpi_valid_text, is_rpi_text, + nnc_valid_text, is_nnc_text}; } // namespace void PPL::Linear_Row::Flags::ascii_dump(std::ostream& s) const { -#ifndef NDEBUG - s << (test_bits(1U << Flags::rpi_validity_bit) ? '+' : '-') - << rpi_valid << ' '; + bool is_rpi = test_bits(1U << Flags::rpi_bit); + bool is_nnc = test_bits(1U << Flags::nnc_bit); + bool rpi_valid; + bool nnc_valid; +#ifdef NDEBUG + // Dump unhandled bits always as true so to permit loading from a + // debug enabled executable without failing assertions. + rpi_valid = true; + nnc_valid = true; #else - // NOTE: dump the (unavailable) validity bit as set to avoid - // crashes when ascii_loading with assertions turned on. - s << '+' << rpi_valid << ' '; + rpi_valid = test_bits(1U << Flags::rpi_validity_bit); + nnc_valid = test_bits(1U << Flags::nnc_validity_bit); #endif - s << (test_bits(1U << Flags::rpi_bit) ? '+' : '-') - << is_rpi << ' ' - << ' '; -#ifndef NDEBUG - s << (test_bits(1U << Flags::nnc_validity_bit) ? '+' : '-') - << nnc_valid << ' '; -#else - // NOTE: dump the (unavailable) validity bit as set to avoid - // crashes when ascii_loading with assertions turned on. - s << '+' << nnc_valid << ' '; -#endif - s << (test_bits(1U << Flags::nnc_bit) ? '+' : '-') - << is_nnc; + s << (rpi_valid ? '+' : '-') << rpi_valid_text << ' ' + << (is_rpi ? '+' : '-') << is_rpi_text << ' ' + << ' ' + << (nnc_valid ? '+' : '-') << nnc_valid_text << ' ' + << (is_nnc ? '+' : '-') << is_nnc_text; } PPL_OUTPUT_DEFINITIONS_ASCII_ONLY(Linear_Row::Flags) @@ -183,15 +181,23 @@ PPL::Linear_Row::Flags::ascii_load(std::istream& s) { // Assume that the bits are used in sequence. reset_bits(std::numeric_limits<base_type>::max()); for (unsigned int bit = 0; - bit < (sizeof(bit_names) / sizeof(char*)); + bit < (sizeof(bit_texts) / sizeof(char*)); ++bit) { if (!(s >> str)) return false; - if (str[0] == '+') - set_bits(1U << (Dense_Row::Flags::first_free_bit + bit)); + if (str[0] == '+') { + bool load = true; +#ifdef NDEBUG + // Do not load unhandled bits. + if (bit == rpi_validity_bit || bit == nnc_validity_bit) + load = false; +#endif + if (load) + set_bits(1U << (Dense_Row::Flags::first_free_bit + bit)); + } else if (str[0] != '-') return false; - if (str.compare(1, strlen(bit_names[bit]), bit_names[bit]) != 0) + if (str.compare(1, strlen(bit_texts[bit]), bit_texts[bit]) != 0) return false; } return true;

1 0