- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Completed a draft implementation of PIP_Problem OCaml interface.
by Patricia Hill 05 Apr '10

05 Apr '10

Module: ppl/ppl Branch: master Commit: 2858adf2a80c7f30f9c22747a04f4f4d2ef63f74 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2858adf2a80c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Apr 5 12:29:22 2010 +0100 Completed a draft implementation of PIP_Problem OCaml interface. A few tests added. --- interfaces/OCaml/ppl_ocaml_common.cc | 194 +++++++++++++++++++++++++++++++- interfaces/OCaml/ppl_ocaml_globals.ml | 74 ++++++++++-- interfaces/OCaml/ppl_ocaml_globals.mli | 38 ++++++ interfaces/OCaml/tests/test1.ml | 45 ++++++++ 4 files changed, 334 insertions(+), 17 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=2858adf2…

1 0

[GIT] ppl/ppl(master): A start on the PIP_Problem interface for OCaml.
by Patricia Hill 02 Apr '10

02 Apr '10

Module: ppl/ppl Branch: master Commit: 7d9e83d01ee9471b0ad8a3bba90fd3b93af4c903 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d9e83d01ee9… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Apr 2 21:01:39 2010 +0100 A start on the PIP_Problem interface for OCaml. --- interfaces/OCaml/ppl_ocaml_common.cc | 367 ++++++++++++++++++++++++++++++++ interfaces/OCaml/ppl_ocaml_globals.ml | 99 +++++++++- interfaces/OCaml/ppl_ocaml_globals.mli | 78 +++++++ 3 files changed, 542 insertions(+), 2 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=7d9e83d0…

1 0

[GIT] ppl/ppl(master): Completed a draft of the PIP_Problem interface for Prolog.
by Patricia Hill 02 Apr '10

02 Apr '10

Module: ppl/ppl Branch: master Commit: 548cc4801140808a1ecb80d2858a13ec1122e84f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=548cc4801140… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Apr 2 13:00:39 2010 +0100 Completed a draft of the PIP_Problem interface for Prolog. Added tests. --- ...erface_generator_prolog_procedure_generators.m4 | 33 ++- interfaces/Prolog/ppl_prolog_common.cc | 370 ++++++++++++++++++-- interfaces/Prolog/ppl_prolog_common.defs.hh | 69 +++- interfaces/Prolog/tests/pl_check.pl | 247 +++++++++++++- 4 files changed, 684 insertions(+), 35 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=548cc480…

1 0

[GIT] ppl/ppl(master): Type fixed.
by Patricia Hill 02 Apr '10

02 Apr '10

Module: ppl/ppl Branch: master Commit: daa93a691f89a54975ae2d457ff43ee25df9eaa9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=daa93a691f89… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Apr 2 13:00:27 2010 +0100 Type fixed. --- .../Artificial_Parameter_Sequence.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Java/parma_polyhedra_library/Artificial_Parameter_Sequence.java b/interfaces/Java/parma_polyhedra_library/Artificial_Parameter_Sequence.java index 9fac898..c8dd38f 100644 --- a/interfaces/Java/parma_polyhedra_library/Artificial_Parameter_Sequence.java +++ b/interfaces/Java/parma_polyhedra_library/Artificial_Parameter_Sequence.java @@ -28,7 +28,7 @@ import java.io.IOException; //! A sequence of artificial parameters. /*! \ingroup PPL_Java_interface An object of the class Artificial_Parameter_Sequence is a - sequence of atrtificial parameters. + sequence of artificial parameters. */ public class Artificial_Parameter_Sequence extends java.util.Vector<Artificial_Parameter> {

1 0

[GIT] ppl/ppl(master): Restored previously removed method PIP_Problem_constraints().
by Patricia Hill 02 Apr '10

02 Apr '10

Module: ppl/ppl Branch: master Commit: a8098a8c8f00141390bde6197d7f96aa750afd70 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a8098a8c8f00… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Fri Apr 2 12:58:56 2010 +0100 Restored previously removed method PIP_Problem_constraints(). --- interfaces/Java/jni/ppl_java_globals.cc | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index 3fa8e41..457ea45 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -1834,6 +1834,31 @@ Java_parma_1polyhedra_1library_PIP_1Problem_constraint_1at_1index return null; } +JNIEXPORT jobject JNICALL +Java_parma_1polyhedra_1library_PIP_1Problem_constraints +(JNIEnv* env, jobject j_this_pip_problem) { + try { + jobject j_cs = env->NewObject(cached_classes.Constraint_System, + cached_FMIDs.Constraint_System_init_ID); + CHECK_RESULT_RETURN(env, j_cs, 0); + + PIP_Problem* pip + = reinterpret_cast<PIP_Problem*>(get_ptr(env, j_this_pip_problem)); + for (PIP_Problem::const_iterator cs_it = pip->constraints_begin(), + cs_end = pip->constraints_end(); cs_it != cs_end; ++cs_it) { + jobject j_constraint = build_java_constraint(env, *cs_it); + env->CallBooleanMethod(j_cs, + cached_FMIDs.Constraint_System_add_ID, + j_constraint); + CHECK_EXCEPTION_RETURN(env, 0); + } + return j_cs; + } + CATCH_ALL; + jobject null = 0; + return null; +} + JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_PIP_1Problem_set_1pip_1problem_1control_1parameter (JNIEnv* env, jobject j_this_pip_problem, jobject j_cpv) {

1 0

[GIT] ppl/ppl(master): Tests added.
by Patricia Hill 01 Apr '10

01 Apr '10

Module: ppl/ppl Branch: master Commit: 1b2dac6f55ee22faced4501a6ec216eeb29ff408 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1b2dac6f55ee… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 1 17:25:42 2010 +0100 Tests added. Some tests marked as expected to fail indicating bug(s) in the code. --- tests/BD_Shape/Makefile.am | 3 + tests/BD_Shape/dropsomenonintegerpoints1.cc | 343 +++++++++++++++++++ tests/Octagonal_Shape/Makefile.am | 3 + tests/Octagonal_Shape/dropsomenonintegerpoints1.cc | 345 ++++++++++++++++++++ 4 files changed, 694 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=1b2dac6f…

1 0

[GIT] ppl/ppl(master): Varios bug fixes and small improvements.
by Patricia Hill 01 Apr '10

01 Apr '10

Module: ppl/ppl Branch: master Commit: c068dabdd90cec7104c1d0ca5f3ddcbcc29a21a8 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c068dabdd90c… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 1 14:48:14 2010 +0100 Varios bug fixes and small improvements. A clone of test02 in pipproblem1.cc added to the Java tests. FIXME added to jni/ppl_java_common.cc --- interfaces/Java/jni/ppl_java_common.cc | 16 ++ interfaces/Java/jni/ppl_java_common.defs.hh | 9 +- interfaces/Java/jni/ppl_java_common.inlines.hh | 8 + interfaces/Java/jni/ppl_java_globals.cc | 93 ++++++--- .../Artificial_Parameter_Sequence.java | 6 - .../parma_polyhedra_library/PIP_Decision_Node.java | 3 +- .../parma_polyhedra_library/PIP_Solution_Node.java | 2 +- .../parma_polyhedra_library/PIP_Tree_Node.java | 10 + interfaces/Java/tests/PIP_Problem_test1.java | 205 +++++++++++++++++--- 9 files changed, 288 insertions(+), 64 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=c068dabd…

1 0

[GIT] ppl/ppl(master): Added "quasi ranking functions" generation procedures to OCaml interface.
by Enea Zaffanella 01 Apr '10

01 Apr '10

Module: ppl/ppl Branch: master Commit: 0006315311935e1d87c70bfa788ed15e6488b38a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=000631531193… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 1 09:47:46 2010 +0200 Added "quasi ranking functions" generation procedures to OCaml interface. --- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 53 ++++++++++++++++++++ .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 16 ++++++ .../ppl_interface_generator_ocaml_mli_code.m4 | 14 +++++ ...terface_generator_ocaml_procedure_generators.m4 | 2 + 4 files changed, 85 insertions(+), 0 deletions(-) diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 index bb7984e..ad58ad4 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 @@ -1391,6 +1391,59 @@ CATCH_ALL ') +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', +`dnl +extern "C" +CAMLprim value + ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@ + (value pset) + try { + CAMLparam1(pset); + CAMLlocal1(caml_return_value); + const @TOPOLOGY@@CPP_CLASS@& ppset + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset))); + C_Polyhedron* ph_decreasing = new C_Polyhedron(); + C_Polyhedron* ph_bounded = new C_Polyhedron(); + all_affine_quasi_ranking_functions_MS(ppset, *ph_decreasing, *ph_bounded); + caml_return_value = caml_alloc(2, 0); + Store_field(caml_return_value, 0, + unregistered_value_p_Polyhedron(*ph_decreasing)); + Store_field(caml_return_value, 1, + unregistered_value_p_Polyhedron(*ph_bounded)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', +`dnl +extern "C" +CAMLprim value + ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2 + (value pset_before, value pset_after) + try { + CAMLparam2(pset_before, pset_after); + CAMLlocal1(caml_return_value); + const @TOPOLOGY@@CPP_CLASS@& ppset_before + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_before))); + const @TOPOLOGY@@CPP_CLASS@& ppset_after + = *(reinterpret_cast<@TOPOLOGY@@CPP_CLASS@*>(p_@CLASS@_val(pset_after))); + C_Polyhedron* ph_decreasing = new C_Polyhedron(); + C_Polyhedron* ph_bounded = new C_Polyhedron(); + all_affine_quasi_ranking_functions_MS_2(ppset_before, ppset_after, + *ph_decreasing, *ph_bounded); + caml_return_value = caml_alloc(2, 0); + Store_field(caml_return_value, 0, + unregistered_value_p_Polyhedron(*ph_decreasing)); + Store_field(caml_return_value, 1, + unregistered_value_p_Polyhedron(*ph_bounded)); + CAMLreturn(caml_return_value); +} +CATCH_ALL + +') + m4_define(`ppl_@CLASS@_wrap_assign_code', `dnl extern "C" diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 index 4268a25..160121b 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_ml_code.m4 @@ -619,6 +619,22 @@ external ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: ') +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', +`dnl +external ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@: + @!CLASS@ -> polyhedron * polyhedron + = "ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@" + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', +`dnl +external ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> polyhedron * polyhedron + = "ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2" + +') + m4_define(`ppl_@CLASS@_wrap_assign_code', `dnl external ppl_@CLASS@_wrap_assign: @!CLASS@ diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 index 86efeaa..df7eb0e 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_mli_code.m4 @@ -538,6 +538,20 @@ val ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2: ') +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_code', +`dnl +val ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@: + @!CLASS@ -> polyhedron * polyhedron + +') + +m4_define(`ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2_code', +`dnl +val ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2: + @!CLASS@ -> @!CLASS@ -> polyhedron * polyhedron + +') + val ppl_@CLASS@_wrap_assign: @!CLASS@ -> bounded_integer_type_width -> bounded_integer_type_representation diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 index 8b8ff38..19832d2 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_procedure_generators.m4 @@ -46,9 +46,11 @@ m4_define(`m4_procedure_list', ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ +simple, ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ +simple, ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@ +simple, +ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@ +simple, ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 +simple, ppl_one_affine_ranking_function_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 +simple, ppl_all_affine_ranking_functions_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_2 +simple, +ppl_all_affine_quasi_ranking_functions_MS_@TOPOLOGY@@CLASS@_2 +simple, ) ')

1 0

[GIT] ppl/ppl(master): Drafted drop_some_non_integer_points() for Interval and Box.
by Enea Zaffanella 31 Mar '10

31 Mar '10

Module: ppl/ppl Branch: master Commit: 916b06c687704282b44f34390905bc425bd64680 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=916b06c68770… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 31 22:17:48 2010 +0200 Drafted drop_some_non_integer_points() for Interval and Box. --- src/Box.templates.hh | 17 +++++++++++++++-- src/Interval.defs.hh | 19 +++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 524a4f5..930af84 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1674,7 +1674,13 @@ Box<ITV>::drop_some_non_integer_points(Complexity_Class) { && !ITV::info_type::store_open) return; - // FIXME(0.11): complete. + if (marked_empty()) + return; + + for (dimension_type k = seq.size(); k-- > 0; ) + seq[k].drop_some_non_integer_points(); + + PPL_ASSERT(OK()); } template <typename ITV> @@ -1691,7 +1697,14 @@ Box<ITV>::drop_some_non_integer_points(const Variables_Set& vars, && !ITV::info_type::store_open) return; - // FIXME(0.11): complete. + if (marked_empty()) + return; + + for (Variables_Set::const_iterator v_i = vars.begin(), + v_end = vars.end(); v_i != v_end; ++v_i) + seq[*v_i].drop_some_non_integer_points(); + + PPL_ASSERT(OK()); } template <typename ITV> diff --git a/src/Interval.defs.hh b/src/Interval.defs.hh index aed3be3..ac6ce24 100644 --- a/src/Interval.defs.hh +++ b/src/Interval.defs.hh @@ -535,6 +535,25 @@ public: return u >= l; } + void drop_some_non_integer_points() { + if (is_empty()) + return; + if (lower_is_open() && !lower_is_boundary_infinity()) { + add_assign_r(lower(), lower(), Boundary(1), ROUND_DOWN); + floor_assign_r(lower(), lower(), ROUND_DOWN); + info().set_boundary_property(LOWER, OPEN, false); + } + else + ceil_assign_r(lower(), lower(), ROUND_DOWN); + if (upper_is_open() && !upper_is_boundary_infinity()) { + sub_assign_r(upper(), upper(), Boundary(1), ROUND_UP); + ceil_assign_r(upper(), upper(), ROUND_UP); + info().set_boundary_property(UPPER, OPEN, false); + } + else + floor_assign_r(upper(), upper(), ROUND_UP); + } + template <typename From> typename Enable_If<Is_Singleton<From>::value || Is_Interval<From>::value, I_Result>::type wrap_assign(Bounded_Integer_Type_Width w,

1 0

[GIT] ppl/ppl(master): Drafted drop_some_non_integer_points() for weakly relational shapes.
by Enea Zaffanella 31 Mar '10

31 Mar '10

Module: ppl/ppl Branch: master Commit: 07abce21d65f995dc378d84c3c8ad65728f23fb7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=07abce21d65f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Wed Mar 31 21:23:41 2010 +0200 Drafted drop_some_non_integer_points() for weakly relational shapes. --- src/BD_Shape.defs.hh | 2 + src/BD_Shape.inlines.hh | 10 ++++++++ src/BD_Shape.templates.hh | 47 +++++++++++++++++++++++++++++++++---- src/Octagonal_Shape.defs.hh | 2 + src/Octagonal_Shape.inlines.hh | 13 ++++++++++ src/Octagonal_Shape.templates.hh | 44 +++++++++++++++++++++++++++++++---- 6 files changed, 108 insertions(+), 10 deletions(-) diff --git a/src/BD_Shape.defs.hh b/src/BD_Shape.defs.hh index 74cbc52..3f019eb 100644 --- a/src/BD_Shape.defs.hh +++ b/src/BD_Shape.defs.hh @@ -2244,6 +2244,8 @@ private: */ void compute_leaders(std::vector<dimension_type>& leaders) const; + void drop_some_non_integer_points_helper(N& elem); + friend std::ostream& Parma_Polyhedra_Library::IO_Operators ::operator<<<>(std::ostream& s, const BD_Shape<T>& c); diff --git a/src/BD_Shape.inlines.hh b/src/BD_Shape.inlines.hh index 62f4c85..275b0df 100644 --- a/src/BD_Shape.inlines.hh +++ b/src/BD_Shape.inlines.hh @@ -852,6 +852,16 @@ BD_Shape<T>::refine_fp_interval_abstract_store( } +template <typename T> +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_ASSERT(r == V_EQ); + reset_shortest_path_closed(); + } +} } // namespace Parma_Polyhedra_Library diff --git a/src/BD_Shape.templates.hh b/src/BD_Shape.templates.hh index e580ec8..02eec79 100644 --- a/src/BD_Shape.templates.hh +++ b/src/BD_Shape.templates.hh @@ -836,7 +836,7 @@ BD_Shape<T>::frequency(const Linear_Expression& expr, // Check the bounded differences with the other dimensions that // have non-zero coefficient in `le'. else { - assert(!constant_v); + PPL_ASSERT(!constant_v); for (dimension_type j = i; j-- > 1; ) { const Variable vj(j-1); if (le.coefficient(vj) == 0) @@ -6348,7 +6348,18 @@ BD_Shape<T>::drop_some_non_integer_points(Complexity_Class) { if (std::numeric_limits<T>::is_integer) return; - // FIXME(0.11): complete. + const dimension_type space_dim = space_dimension(); + shortest_path_closure_assign(); + if (space_dim == 0 || marked_empty()) + return; + + for (dimension_type i = space_dim + 1; i-- > 0; ) { + DB_Row<N>& dbm_i = dbm[i]; + for (dimension_type j = space_dim + 1; j-- > 0; ) + if (i != j) + drop_some_non_integer_points_helper(dbm_i[j]); + } + PPL_ASSERT(OK()); } template <typename T> @@ -6356,15 +6367,41 @@ void BD_Shape<T>::drop_some_non_integer_points(const Variables_Set& vars, Complexity_Class) { // Dimension-compatibility check. + const dimension_type space_dim = space_dimension(); const dimension_type min_space_dim = vars.space_dimension(); - if (space_dimension() < min_space_dim) + if (space_dim < min_space_dim) throw_dimension_incompatible("drop_some_non_integer_points(vs, cmpl)", min_space_dim); - if (std::numeric_limits<T>::is_integer) + if (std::numeric_limits<T>::is_integer || min_space_dim == 0) return; - // FIXME(0.11): complete. + shortest_path_closure_assign(); + if (marked_empty()) + return; + + const Variables_Set::const_iterator v_begin = vars.begin(); + const Variables_Set::const_iterator v_end = vars.end(); + PPL_ASSERT(v_begin != v_end); + // Unary constraints on a variable occurring in `vars'. + DB_Row<N>& dbm_0 = dbm[0]; + for (Variables_Set::const_iterator v_i = v_begin; v_i != v_end; ++v_i) { + const dimension_type i = *v_i + 1; + drop_some_non_integer_points_helper(dbm_0[i]); + drop_some_non_integer_points_helper(dbm[i][0]); + } + + // Binary constraints where both variables occur in `vars'. + for (Variables_Set::const_iterator v_i = v_begin; v_i != v_end; ++v_i) { + const dimension_type i = *v_i + 1; + DB_Row<N>& dbm_i = dbm[i]; + for (Variables_Set::const_iterator v_j = v_begin; v_j != v_end; ++v_j) { + const dimension_type j = *v_j + 1; + if (i != j) + drop_some_non_integer_points_helper(dbm_i[j]); + } + } + PPL_ASSERT(OK()); } /*! \relates Parma_Polyhedra_Library::BD_Shape */ diff --git a/src/Octagonal_Shape.defs.hh b/src/Octagonal_Shape.defs.hh index 4f28fe1..9fe32c1 100644 --- a/src/Octagonal_Shape.defs.hh +++ b/src/Octagonal_Shape.defs.hh @@ -2231,6 +2231,8 @@ private: Coefficient& ext_n, Coefficient& ext_d, bool& included, Generator& g) const; + void drop_some_non_integer_points_helper(N& elem); + friend std::ostream& Parma_Polyhedra_Library::IO_Operators ::operator<<<>(std::ostream& s, const Octagonal_Shape<T>& c); diff --git a/src/Octagonal_Shape.inlines.hh b/src/Octagonal_Shape.inlines.hh index b496fdf..c79c7b8 100644 --- a/src/Octagonal_Shape.inlines.hh +++ b/src/Octagonal_Shape.inlines.hh @@ -864,6 +864,19 @@ Octagonal_Shape<T>::hash_code() const { return space_dimension() & 0x7fffffff; } +template <typename T> +inline void +Octagonal_Shape<T>::drop_some_non_integer_points_helper(N& elem) { + if (!is_integer(elem)) { +#ifndef NDEBUG + Result r = +#endif + floor_assign_r(elem, elem, ROUND_DOWN); + PPL_ASSERT(r == V_EQ); + reset_strongly_closed(); + } +} + } // namespace Parma_Polyhedra_Library namespace std { diff --git a/src/Octagonal_Shape.templates.hh b/src/Octagonal_Shape.templates.hh index 94dab08..fb123c4 100644 --- a/src/Octagonal_Shape.templates.hh +++ b/src/Octagonal_Shape.templates.hh @@ -7559,12 +7559,20 @@ Octagonal_Shape<T> template <typename T> void -Octagonal_Shape<T> -::drop_some_non_integer_points(Complexity_Class) { +Octagonal_Shape<T>::drop_some_non_integer_points(Complexity_Class) { if (std::numeric_limits<T>::is_integer) return; - // FIXME(0.11): complete. + const dimension_type space_dim = space_dimension(); + strong_closure_assign(); + if (space_dim == 0 || marked_empty()) + return; + + for (typename OR_Matrix<N>::element_iterator i = matrix.element_begin(), + i_end = matrix.element_end(); i != i_end; ++i) + drop_some_non_integer_points_helper(*i); + + PPL_ASSERT(OK()); } template <typename T> @@ -7578,10 +7586,36 @@ Octagonal_Shape<T> throw_dimension_incompatible("drop_some_non_integer_points(vs, cmpl)", min_space_dim); - if (std::numeric_limits<T>::is_integer) + if (std::numeric_limits<T>::is_integer || min_space_dim == 0) + return; + + strong_closure_assign(); + if (marked_empty()) return; - // FIXME(0.11): complete. + const Variables_Set::const_iterator v_begin = vars.begin(); + const Variables_Set::const_iterator v_end = vars.end(); + PPL_ASSERT(v_begin != v_end); + typedef typename OR_Matrix<N>::row_reference_type Row_Reference; + for (Variables_Set::const_iterator v_i = v_begin; v_i != v_end; ++v_i) { + const dimension_type i = *v_i; + Row_Reference m_i = matrix[i]; + const dimension_type ci = i + 1; + Row_Reference m_ci = matrix[ci]; + // Unary constaints. + drop_some_non_integer_points_helper(m_i[ci]); + drop_some_non_integer_points_helper(m_ci[i]); + // Binary constraint (note: only consider j < i). + for (Variables_Set::const_iterator v_j = v_begin; v_j != v_i; ++v_j) { + const dimension_type j = *v_j; + const dimension_type cj = j + 1; + drop_some_non_integer_points_helper(m_i[j]); + drop_some_non_integer_points_helper(m_i[cj]); + drop_some_non_integer_points_helper(m_ci[j]); + drop_some_non_integer_points_helper(m_ci[cj]); + } + } + PPL_ASSERT(OK()); } /*! \relates Parma_Polyhedra_Library::Octagonal_Shape */

1 0