- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Removed unused parameter name.
by Roberto Bagnara 26 Mar '12

26 Mar '12

Module: ppl/ppl Branch: master Commit: 30c55629fd03c729ee85c34a21206f986590d7f2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=30c55629fd03… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 26 10:39:05 2012 +0200 Removed unused parameter name. --- tests/Random_Number_Generator.inlines.hh | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tests/Random_Number_Generator.inlines.hh b/tests/Random_Number_Generator.inlines.hh index ce33d3a..89f8513 100644 --- a/tests/Random_Number_Generator.inlines.hh +++ b/tests/Random_Number_Generator.inlines.hh @@ -73,9 +73,8 @@ Random_Number_Generator::Random_Number_Generator(const unsigned long seed) template <typename T> inline void -Random_Number_Generator::get(T& x, unsigned int info) { +Random_Number_Generator::get(T& x, unsigned int) { using Implementation::Random_Numbers::Random_Number_Generator_Aux; - used(info); static Random_Number_Generator_Aux<T> aux(max_bits); mpz_class n; if (std::numeric_limits<T>::is_bounded) {

1 0

[GIT] ppl/ppl(sparse_matrices): Restored (after adapting it) commented out code.
by Enea Zaffanella 26 Mar '12

26 Mar '12

Module: ppl/ppl Branch: sparse_matrices Commit: daa305b4da6b5e5e29b6623b39ba88ce9fe03570 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=daa305b4da6b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 26 09:53:15 2012 +0200 Restored (after adapting it) commented out code. --- src/Polyhedron_nonpublic.cc | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/Polyhedron_nonpublic.cc b/src/Polyhedron_nonpublic.cc index b948e04..f6f20ec 100644 --- a/src/Polyhedron_nonpublic.cc +++ b/src/Polyhedron_nonpublic.cc @@ -1342,12 +1342,7 @@ PPL::Polyhedron::strongly_minimize_generators() const { } gs.sys.index_first_pending = gs.num_rows(); - - /* FIXME: Check why the following does not work anymore. - if (gs_sorted) - gs.set_sorted(true); - */ - gs.set_sorted(false); + gs.set_sorted(gs_sorted); PPL_ASSERT(gs.sys.OK());

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 26 Mar '12

26 Mar '12

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=faaf9b9fc423… Merge: c1bbb658bf1d016b739e9119d4fe0160b69f9974 ae14af77fe6d4f08fdf971dbcefd2c00b52fd329 Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Mon Mar 26 09:11:57 2012 +0200 Merge branch 'master' into sparse_matrices Conflicts: src/CO_Tree.inlines.hh src/Congruence.inlines.hh src/Congruence_System.defs.hh src/Congruence_System.inlines.hh src/Constraint_System.defs.hh src/Grid.defs.hh src/Grid_simplify.cc src/Grid_widenings.cc src/Linear_Row.inlines.hh src/MIP_Problem.cc src/PIP_Tree.cc src/PIP_Tree.defs.hh src/Polyhedron.defs.hh src/Polyhedron_nonpublic.cc src/Scalar_Products.cc src/Scalar_Products.defs.hh URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae14af77fe6d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Mar 25 10:18:08 2012 +0200 Corrected wrong assertion after call to Grid::simplify(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9ef3a1838508… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 24 18:58:43 2012 +0100 Added missing uses of `$EXEEXT'. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=533fae3d1b73… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 24 18:56:03 2012 +0100 Added missing link options. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4dd838e58b17… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 24 15:51:38 2012 +0100 Useless declarations removed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f5b1ab576f8c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 24 15:50:31 2012 +0100 Fixed debugging code. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6677f1f4e72b… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Mar 24 14:56:05 2012 +0100 Corrected test for has_{upper,lower}_bound so as to avoid calling the predicate on zero-dim boxes. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=666ee3e53fbc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Mar 24 14:03:14 2012 +0100 Restored the build. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d4483b02e066… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Mar 23 20:04:38 2012 +0000 Added comments. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8d571fcfe081… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 23 20:50:12 2012 +0100 Added `@extra_includes@' to `AM_CPPFLAGS'. (Thanks to Joao M. Santos Silva.) URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a1ae10fce329… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 23 20:22:26 2012 +0100 Portability improved. (Thanks to Tim Donahue.) URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6f410b958859… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 23 20:18:02 2012 +0100 Fixed lots of parameter names. Detected by ECLAIR service funparam. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c3aa23db3483… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Mar 23 18:31:34 2012 +0100 Fixed lots of parameter names. Detected by ECLAIR service funparam. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c05ad33bb7f8… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Mar 22 10:10:05 2012 +0100 Fixed indentation.

1 0

[GIT] ppl/ppl(master): Keep macro names within the PPL namespace.
by Roberto Bagnara 25 Mar '12

25 Mar '12

Module: ppl/ppl Branch: master Commit: 59bbf2ad8eeaaa4506c572785f178fd7fdbd9826 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=59bbf2ad8eea… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 25 21:18:47 2012 +0200 Keep macro names within the PPL namespace. --- src/BD_Shape.inlines.hh | 2 +- src/Box.templates.hh | 4 ++-- src/Grid_Certificate.cc | 2 +- src/Interval.inlines.hh | 8 ++++---- src/MIP_Problem.inlines.hh | 2 +- src/PIP_Tree.cc | 10 ++++------ src/checked_float.inlines.hh | 4 ++-- src/compiler.hh | 6 +++--- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/BD_Shape.inlines.hh b/src/BD_Shape.inlines.hh index 4c8b8fc..221d2f5 100644 --- a/src/BD_Shape.inlines.hh +++ b/src/BD_Shape.inlines.hh @@ -892,7 +892,7 @@ inline void BD_Shape<T>::drop_some_non_integer_points_helper(N& elem) { if (!is_integer(elem)) { Result r = floor_assign_r(elem, elem, ROUND_DOWN); - used(r); + PPL_USED(r); PPL_ASSERT(r == V_EQ); reset_shortest_path_closed(); } diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 169a197..f32c505 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1515,8 +1515,8 @@ Box<ITV>::wrap_assign(const Variables_Set& vars, complexity_threshold, wrap_individually, "Box"); #else // Specialized implementation. - used(wrap_individually); - used(complexity_threshold); + PPL_USED(wrap_individually); + PPL_USED(complexity_threshold); Box& x = *this; // Dimension-compatibility check for `*cs_p', if any. diff --git a/src/Grid_Certificate.cc b/src/Grid_Certificate.cc index 72959df..defaff4 100644 --- a/src/Grid_Certificate.cc +++ b/src/Grid_Certificate.cc @@ -56,7 +56,7 @@ PPL::Grid_Certificate::Grid_Certificate(const Grid& gr) Grid& mgr = const_cast<Grid&>(gr); bool empty = Grid::simplify(mgr.con_sys, mgr.dim_kinds); // Avoid possible compiler warning. - used(empty); + PPL_USED(empty); PPL_ASSERT(!empty); mgr.set_congruences_minimized(); diff --git a/src/Interval.inlines.hh b/src/Interval.inlines.hh index 1f1b2f0..15c9959 100644 --- a/src/Interval.inlines.hh +++ b/src/Interval.inlines.hh @@ -480,7 +480,7 @@ Interval<To_Boundary, To_Info>::refine_universal(Relation_Symbol rel, Result ru = Boundary_NS::assign(UPPER, upper(), info(), LOWER, f_lower(x), SCALAR_INFO, !is_open(LOWER, f_lower(x), f_info(x))); - used(ru); + PPL_USED(ru); return I_ANY; } case LESS_OR_EQUAL: @@ -490,7 +490,7 @@ Interval<To_Boundary, To_Info>::refine_universal(Relation_Symbol rel, info().clear_boundary_properties(UPPER); Result ru = Boundary_NS::assign(UPPER, upper(), info(), LOWER, f_lower(x), SCALAR_INFO); - used(ru); + PPL_USED(ru); return I_ANY; } case GREATER_THAN: @@ -501,7 +501,7 @@ Interval<To_Boundary, To_Info>::refine_universal(Relation_Symbol rel, Result rl = Boundary_NS::assign(LOWER, lower(), info(), UPPER, f_upper(x), SCALAR_INFO, !is_open(UPPER, f_upper(x), f_info(x))); - used(rl); + PPL_USED(rl); return I_ANY; } case GREATER_OR_EQUAL: @@ -511,7 +511,7 @@ Interval<To_Boundary, To_Info>::refine_universal(Relation_Symbol rel, info().clear_boundary_properties(LOWER); Result rl = Boundary_NS::assign(LOWER, lower(), info(), UPPER, f_upper(x), SCALAR_INFO); - used(rl); + PPL_USED(rl); return I_ANY; } case EQUAL: diff --git a/src/MIP_Problem.inlines.hh b/src/MIP_Problem.inlines.hh index 0a538b2..c2dd27d 100644 --- a/src/MIP_Problem.inlines.hh +++ b/src/MIP_Problem.inlines.hh @@ -160,7 +160,7 @@ MIP_Problem::integer_space_dimensions() const { inline MIP_Problem::Control_Parameter_Value MIP_Problem::get_control_parameter(Control_Parameter_Name name) const { - used(name); + PPL_USED(name); PPL_ASSERT(name == PRICING); return pricing; } diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index a0165ec..4ee628d 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1303,7 +1303,7 @@ PIP_Decision_Node::solve(const PIP_Problem& pip, #ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, "=== SOLVING DECISION NODE\n"); #else - used(indent_level); + PPL_USED(indent_level); #endif PPL_ASSERT(true_child != 0); Matrix context_true(context); @@ -2370,7 +2370,7 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, #ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, "=== SOLVING NODE\n"); #else - used(indent_level); + PPL_USED(indent_level); #endif // Reset current solution as invalid. solution_valid = false; @@ -3158,7 +3158,7 @@ PIP_Solution_Node::generate_cut(const dimension_type index, std::cerr << std::setw(2 * indent_level) << "" << "Row " << index << " requires cut generation.\n"; #else - used(indent_level); + PPL_USED(indent_level); #endif // #ifdef NOISY_PIP const dimension_type num_rows = tableau.t.num_rows(); @@ -3491,10 +3491,8 @@ PIP_Tree_Node::print(std::ostream& s, const int indent) const { void PIP_Tree_Node::print_tree(std::ostream& s, const int indent, - const std::vector<bool>& pip_dim_is_param, + const std::vector<bool>&, dimension_type first_art_dim) const { - used(pip_dim_is_param); - using namespace IO_Operators; // Print artificial parameters. diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh index 7f261a2..495bc7a 100644 --- a/src/checked_float.inlines.hh +++ b/src/checked_float.inlines.hh @@ -134,12 +134,12 @@ fpu_inverse_rounding(Rounding_Dir dir) { inline void limit_precision(const float& v) { - cc_flush(v); + PPL_CC_FLUSH(v); } inline void limit_precision(const double& v) { - cc_flush(v); + PPL_CC_FLUSH(v); } inline void diff --git a/src/compiler.hh b/src/compiler.hh index 08017f6..578b83b 100644 --- a/src/compiler.hh +++ b/src/compiler.hh @@ -36,7 +36,7 @@ namespace Parma_Polyhedra_Library { the compiler. */ #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) -#define used(v) (void)(v) +#define PPL_USED(v) (void)(v) #ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS /*! \brief @@ -46,12 +46,12 @@ namespace Parma_Polyhedra_Library { #endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS) template <typename T> inline void -cc_flush(const T& x) { +PPL_CC_FLUSH(const T& x) { #if defined(__GNUC__) || defined(__INTEL_COMPILER) __asm__ __volatile__ ("" : "+m" (const_cast<T&>(x))); #else // FIXME: is it possible to achieve the same effect in a portable way? - used(x); + PPL_USED(x); #endif }

1 0

[GIT] ppl/ppl(master): Only build `ppl_pl' for checking and install it only when shared libraries are disabled.
by Roberto Bagnara 25 Mar '12

25 Mar '12

Module: ppl/ppl Branch: master Commit: a52b5e5ddecd7a8582f41a851c74f6aacf1398b9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a52b5e5ddecd… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 25 19:57:52 2012 +0200 Only build `ppl_pl' for checking and install it only when shared libraries are disabled. --- interfaces/Prolog/SWI/Makefile.am | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 25bc781..f517ca3 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -176,9 +176,6 @@ $(NO_UNDEFINED_FLAG) \ -module \ -avoid-version -bin_PROGRAMS = ppl_pl -ppl_pl_SOURCES = ppl_pl.cc - pkgdata_DATA = ppl_swiprolog.pl CLPQ_TESTS_NONSTRICT = \ @@ -195,7 +192,7 @@ schedule.clpq CLPQ_TESTS = $(CLPQ_TESTS_NONSTRICT) $(CLPQ_TESTS_STRICT) -check_PROGRAMS = pl_clpq pl_clpq2 +check_PROGRAMS = ppl_pl pl_clpq pl_clpq2 pl_clpq_SOURCES = pl_clpq.cc pl_clpq2_SOURCES = pl_clpq.cc @@ -223,6 +220,15 @@ LIBPPL_SWIPROLOG_LINK_OPTIONS = -L.libs -lppl_swiprolog endif !ENABLE_STATIC +# Apart from the internal testing purposes, `ppl_pl' only makes +# sense when shared libraries are disabled. +if !ENABLE_SHARED +bin_PROGRAMS = ppl_pl +endif !ENABLE_SHARED + +ppl_pl_SOURCES = ppl_pl.cc + + ppl_pl$(EXEEXT): libppl_swiprolog.la ppl_pl.o $(SWI_PROLOG_LD) -pl $(SWI_PROLOG) -cc "$(CC)" -c++ "$(CXX)" -ld "$(CXX)" \ -ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " "/"` \

1 0

[GIT] ppl/ppl(master): Cater for versions of SWI-Prolog configured with `--disable-libdirversion' .
by Roberto Bagnara 25 Mar '12

25 Mar '12

Module: ppl/ppl Branch: master Commit: 3f70fc76500b85748b84b7c6263afecc188281a3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3f70fc76500b… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 25 15:26:14 2012 +0200 Cater for versions of SWI-Prolog configured with `--disable-libdirversion'. --- m4/ac_check_swi_prolog.m4 | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/m4/ac_check_swi_prolog.m4 b/m4/ac_check_swi_prolog.m4 index 2c7fd8d..8ea56fd 100644 --- a/m4/ac_check_swi_prolog.m4 +++ b/m4/ac_check_swi_prolog.m4 @@ -62,7 +62,10 @@ then # In Fedora, SWI-Prolog.h is installed only in /usr/include/pl, which, # IMHO, is a bug (https://bugzilla.redhat.com/show_bug.cgi?id=471071). SWI_PROLOG_INCLUDE_OPTIONS="-I${swi_prolog_base}/include -I/usr/include/pl" - SWI_PROLOG_LD_OPTIONS="-L${swi_prolog_base}/lib/${swi_prolog_arch} ${swi_prolog_lib} ${swi_prolog_libs}" + # If SWI-Prolog was configured with `--disable-libdirversion', then + # the files are not in the `${swi_prolog_arch}' subdirectory. Since + # currently there is no way to know that, we look in both places. + SWI_PROLOG_LD_OPTIONS="-L${swi_prolog_base}/lib/${swi_prolog_arch} -L${swi_prolog_base}/lib ${swi_prolog_lib} ${swi_prolog_libs}" ac_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $SWI_PROLOG_INCLUDE_OPTIONS" AC_LANG_PUSH(C++)

1 0

[GIT] ppl/ppl(master): Make sure the trailing ^M are suppressed under Windows.
by Roberto Bagnara 25 Mar '12

25 Mar '12

Module: ppl/ppl Branch: master Commit: a09c726988797c7f1fe7bc3f4896c647fa6b1088 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a09c72698879… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 25 14:57:50 2012 +0200 Make sure the trailing ^M are suppressed under Windows. --- m4/ac_check_swi_prolog.m4 | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/m4/ac_check_swi_prolog.m4 b/m4/ac_check_swi_prolog.m4 index 0b0ed5b..2c7fd8d 100644 --- a/m4/ac_check_swi_prolog.m4 +++ b/m4/ac_check_swi_prolog.m4 @@ -45,11 +45,11 @@ then fi if test x$swi_prolog != x then - swi_prolog_base=`$swi_prolog -dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="$[[a-z]]:$\{0,1\}$.*$";/\2/'` - swi_prolog_version=`$swi_prolog -dump-runtime-variables | grep PLVERSION= | sed 's/PLVERSION="$.*$";/\1/'` - swi_prolog_arch=`$swi_prolog -dump-runtime-variables | grep PLARCH= | sed 's/PLARCH="$.*$";/\1/'` - swi_prolog_libs=`$swi_prolog -dump-runtime-variables | grep PLLIBS= | sed 's/PLLIBS="$.*$";/\1/'` - swi_prolog_lib=`$swi_prolog -dump-runtime-variables | grep PLLIB= | sed 's/PLLIB="$.*$";/\1/'` + swi_prolog_base=`$swi_prolog -dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="$[[a-z]]:$\{0,1\}$.*$";.*/\2/'` + swi_prolog_version=`$swi_prolog -dump-runtime-variables | grep PLVERSION= | sed 's/PLVERSION="$.*$";.*/\1/'` + swi_prolog_arch=`$swi_prolog -dump-runtime-variables | grep PLARCH= | sed 's/PLARCH="$.*$";.*/\1/'` + swi_prolog_libs=`$swi_prolog -dump-runtime-variables | grep PLLIBS= | sed 's/PLLIBS="$.*$";.*/\1/'` + swi_prolog_lib=`$swi_prolog -dump-runtime-variables | grep PLLIB= | sed 's/PLLIB="$.*$";.*/\1/'` dnl Additional version checks could be inserted here, if necessary.

1 0

[GIT] ppl/ppl(master): Remove the drive indication SWI-Prolog prepends to the PLBASE path under Windows .
by Roberto Bagnara 25 Mar '12

25 Mar '12

Module: ppl/ppl Branch: master Commit: 4580fa8886eae9074274fe1fbc0636757288b152 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4580fa8886ea… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sun Mar 25 11:59:44 2012 +0200 Remove the drive indication SWI-Prolog prepends to the PLBASE path under Windows. --- m4/ac_check_swi_prolog.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/m4/ac_check_swi_prolog.m4 b/m4/ac_check_swi_prolog.m4 index f36683e..0b0ed5b 100644 --- a/m4/ac_check_swi_prolog.m4 +++ b/m4/ac_check_swi_prolog.m4 @@ -45,7 +45,7 @@ then fi if test x$swi_prolog != x then - swi_prolog_base=`$swi_prolog -dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="$.*$";/\1/'` + swi_prolog_base=`$swi_prolog -dump-runtime-variables | grep PLBASE= | sed 's/PLBASE="$[[a-z]]:$\{0,1\}$.*$";/\2/'` swi_prolog_version=`$swi_prolog -dump-runtime-variables | grep PLVERSION= | sed 's/PLVERSION="$.*$";/\1/'` swi_prolog_arch=`$swi_prolog -dump-runtime-variables | grep PLARCH= | sed 's/PLARCH="$.*$";/\1/'` swi_prolog_libs=`$swi_prolog -dump-runtime-variables | grep PLLIBS= | sed 's/PLLIBS="$.*$";/\1/'`

1 0

[GIT] ppl/ppl(master): Corrected wrong assertion after call to Grid:: simplify().
by Enea Zaffanella 25 Mar '12

25 Mar '12

Module: ppl/ppl Branch: master Commit: ae14af77fe6d4f08fdf971dbcefd2c00b52fd329 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae14af77fe6d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sun Mar 25 10:18:08 2012 +0200 Corrected wrong assertion after call to Grid::simplify(). --- src/Grid_Certificate.cc | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Grid_Certificate.cc b/src/Grid_Certificate.cc index ad957f6..72959df 100644 --- a/src/Grid_Certificate.cc +++ b/src/Grid_Certificate.cc @@ -54,14 +54,10 @@ PPL::Grid_Certificate::Grid_Certificate(const Grid& gr) // Minimize `gr' congruence system. As in Polyhedron assume // that `gr' contains at least one point. Grid& mgr = const_cast<Grid&>(gr); -#ifndef NDEBUG - bool contains_points = Grid::simplify(mgr.con_sys, mgr.dim_kinds); + bool empty = Grid::simplify(mgr.con_sys, mgr.dim_kinds); // Avoid possible compiler warning. - used(contains_points); - PPL_ASSERT(contains_points); -#else - Grid::simplify(mgr.con_sys, mgr.dim_kinds); -#endif + used(empty); + PPL_ASSERT(!empty); mgr.set_congruences_minimized(); num_proper_congruences = mgr.con_sys.num_proper_congruences();

1 0

[GIT] ppl/ppl(master): Fixed debugging code.
by Roberto Bagnara 24 Mar '12

24 Mar '12

Module: ppl/ppl Branch: master Commit: f5b1ab576f8cb529058f94b6a8943d808b063a3c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f5b1ab576f8c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 24 15:50:31 2012 +0100 Fixed debugging code. --- src/Grid_Certificate.cc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Grid_Certificate.cc b/src/Grid_Certificate.cc index 379af7b..f22d76e 100644 --- a/src/Grid_Certificate.cc +++ b/src/Grid_Certificate.cc @@ -55,11 +55,12 @@ PPL::Grid_Certificate::Grid_Certificate(const Grid& gr) // that `gr' contains at least one point. Grid& mgr = const_cast<Grid&>(gr); #ifndef NDEBUG - Grid::simplify(mgr.con_sys, mgr.dim_kinds); -#else bool contains_points = Grid::simplify(mgr.con_sys, mgr.dim_kinds); - used(contains_points); // Quiet compiler warning. + // Avoid possible compiler warning. + used(contains_points); PPL_ASSERT(contains_points); +#else + Grid::simplify(mgr.con_sys, mgr.dim_kinds); #endif mgr.set_congruences_minimized();

2 1