April 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added ppl_PIP_Problem_has_big_parameter_dimension
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: be24cc575d751884fdf867291842645b3c8096ae URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=be24cc575d75… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 16:20:40 2010 +0100 Added ppl_PIP_Problem_has_big_parameter_dimension that returns true if and only if the pip problem has a big parameter set. --- interfaces/OCaml/OCaml_interface.dox | 5 +++++ interfaces/OCaml/ppl_ocaml_common.cc | 12 +++++++++++- interfaces/OCaml/ppl_ocaml_globals.ml | 5 ++++- interfaces/OCaml/ppl_ocaml_globals.mli | 5 ++++- interfaces/OCaml/tests/test1.ml | 9 +++++++++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/interfaces/OCaml/OCaml_interface.dox b/interfaces/OCaml/OCaml_interface.dox index 7d9fb8b..affac00 100644 --- a/interfaces/OCaml/OCaml_interface.dox +++ b/interfaces/OCaml/OCaml_interface.dox @@ -531,6 +531,11 @@ defining parametric integer programming problems. Exception is thrown if no big parameter dimension has been set. <H2><CODE> + ppl_PIP_Problem_has_big_parameter_dimension handle +</CODE></H2> + Returns true if and only if the dimension for the big parameter has been set. + +<H2><CODE> ppl_PIP_Problem_is_satisfiable handle </CODE></H2> Returns true if the PIP Problem referenced by diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index 305c569..a852f53 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1371,7 +1371,7 @@ CATCH_ALL extern "C" CAMLprim value ppl_PIP_Problem_set_big_parameter_dimension(value caml_pip, - value caml_dim) try { + value caml_dim) try { CAMLparam2(caml_pip, caml_dim); dimension_type ppl_dim = value_to_ppl_dimension(caml_dim); PIP_Problem& ppl_pip = *p_PIP_Problem_val(caml_pip); @@ -1396,6 +1396,16 @@ CATCH_ALL extern "C" CAMLprim value +ppl_PIP_Problem_has_big_parameter_dimension(value caml_pip) try { + CAMLparam1(caml_pip); + PIP_Problem& ppl_pip = *p_PIP_Problem_val(caml_pip); + dimension_type d = ppl_pip.get_big_parameter_dimension(); + CAMLreturn(Val_bool(d != not_a_dimension())); +} +CATCH_ALL + +extern "C" +CAMLprim value ppl_PIP_Problem_is_satisfiable(value caml_pip) try { CAMLparam1(caml_pip); PIP_Problem& ppl_pip = *p_PIP_Problem_val(caml_pip); diff --git a/interfaces/OCaml/ppl_ocaml_globals.ml b/interfaces/OCaml/ppl_ocaml_globals.ml index 3d1e7a4..408febf 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.ml +++ b/interfaces/OCaml/ppl_ocaml_globals.ml @@ -362,8 +362,11 @@ external ppl_PIP_Problem_optimizing_solution: external ppl_PIP_Problem_get_big_parameter_dimension: pip_problem -> int = "ppl_PIP_Problem_get_big_parameter_dimension" +external ppl_PIP_Problem_has_big_parameter_dimension: + pip_problem -> bool = "ppl_PIP_Problem_has_big_parameter_dimension" + external ppl_PIP_Problem_set_big_parameter_dimension: - pip_problem -> int = "ppl_PIP_Problem_set_big_parameter_dimension" + pip_problem -> int -> unit = "ppl_PIP_Problem_set_big_parameter_dimension" external ppl_PIP_Problem_OK: pip_problem -> bool diff --git a/interfaces/OCaml/ppl_ocaml_globals.mli b/interfaces/OCaml/ppl_ocaml_globals.mli index 8ffb016..79cff49 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.mli +++ b/interfaces/OCaml/ppl_ocaml_globals.mli @@ -317,7 +317,10 @@ val ppl_PIP_Problem_get_big_parameter_dimension: pip_problem -> int val ppl_PIP_Problem_set_big_parameter_dimension: - pip_problem -> int + pip_problem -> int -> unit + +val ppl_PIP_Problem_has_big_parameter_dimension: + pip_problem -> bool val ppl_PIP_Problem_OK: pip_problem -> bool diff --git a/interfaces/OCaml/tests/test1.ml b/interfaces/OCaml/tests/test1.ml index 66d6b8a..a3d84aa 100644 --- a/interfaces/OCaml/tests/test1.ml +++ b/interfaces/OCaml/tests/test1.ml @@ -533,6 +533,15 @@ let out = if (i == Cutting_Strategy_First) else "PIP Problem Control Parameter test failed" in (print_string_if_noisy out);; print_string_if_noisy "\n";; +let b0 = ppl_PIP_Problem_has_big_parameter_dimension pip2;; +ppl_PIP_Problem_set_big_parameter_dimension pip2 7;; +let big_par = ppl_PIP_Problem_get_big_parameter_dimension pip2;; +let b1 = ppl_PIP_Problem_has_big_parameter_dimension pip2;; +let out = if (not b0 & b1 & (big_par = 7)) + then "ppl_PIP_Problem big parameter dimension tests succeeded" + else "ppl_PIP_Problem big parameter dimension tests failed" + in (print_string_if_noisy out);; +print_string_if_noisy "\n";; let out = if (ppl_PIP_Problem_is_satisfiable pip2) then "ppl_PIP_Problem_is_satisfiable test succeeded" else "ppl_PIP_Problem_is_satisfiable test failed"

1 0

[GIT] ppl/ppl(master): Added documentation for Prolog PPL_Problem
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 01224d157033e7b199958721f86bec4327bcf831 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=01224d157033… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 16:20:17 2010 +0100 Added documentation for Prolog PPL_Problem --- interfaces/Prolog/Prolog_interface.dox | 257 +++++++++++++++++++++++++++++++- 1 files changed, 254 insertions(+), 3 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=01224d15…

1 0

[GIT] ppl/ppl(master): Dealt with one of the items.
by Enea Zaffanella 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 2ffb054be82d536cdd158ca85ab39706871f9bb3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2ffb054be82d… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 8 16:47:29 2010 +0200 Dealt with one of the items. --- TODO | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/TODO b/TODO index 835ea2c..7917956 100644 --- a/TODO +++ b/TODO @@ -4,7 +4,6 @@ Enhancements for PPL 0.11 - Make all the *affine*image() methods uniform as far as the specification is concerned. -- Look carefully at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115 - Lack of perl can cause more problems than explained in the warning message given by our configuration procedure. See, e.g., http://www.cs.unipr.it/pipermail/ppl-devel/2009-November/015758.html

1 0

[GIT] ppl/ppl(master): Better documentation for the two Row_Impl::Impl:: operator delete(...).
by Enea Zaffanella 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 039e6ba85aa460c8b0fc723ee6ed344dad2db8bb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=039e6ba85aa4… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Apr 8 15:57:50 2010 +0200 Better documentation for the two Row_Impl::Impl::operator delete(...). --- src/Row.defs.hh | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/Row.defs.hh b/src/Row.defs.hh index 0f1ef26..f1b147c 100644 --- a/src/Row.defs.hh +++ b/src/Row.defs.hh @@ -390,19 +390,34 @@ public: //! \name Custom allocator and deallocator //@{ - /*! \brief - Allocates a chunk of memory able to contain \p capacity Coefficient objects - beyond the specified \p fixed_size and returns a pointer to the new - allocated memory. + //! Placement allocation function. + /*! + Allocates a chunk of memory able to contain \p capacity Coefficient + objects beyond the specified \p fixed_size and returns a pointer to + the newly allocated memory. */ static void* operator new(size_t fixed_size, dimension_type capacity); - //! Uses the standard delete operator to free the memory \p p points to. + //! Usual (non-placement) deallocation function. + /*! + Uses the standard delete operator to free the memory \p p points to. + + \note + The definition of this custom deallocation function is required + since otherwise the placement deallocation function + <code> + static void operator delete(void* p, dimension_type capacity); + </code> + would be wrongly interpreted as a usual (non-placement) deallocation + function (see C++98 3.7.3.2p2). This happens because \c dimension_type + is just an alias for \c std::size_t. + See also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115 + */ static void operator delete(void* p); - /*! \brief - Placement version: - uses the standard operator delete to free the memory \p p points to. + //! Placement deallocation function. + /*! + Uses the standard operator delete to free the memory \p p points to. */ static void operator delete(void* p, dimension_type capacity); //@} // Custom allocator and deallocator

1 0

[GIT] ppl/ppl(master): Added documentation in the OCaml interface for the PIP_Problem.
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 9a789a7575fa1cc482ecb1bc404d9a37a4d1ddd3 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9a789a7575fa… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 13:55:37 2010 +0100 Added documentation in the OCaml interface for the PIP_Problem. --- interfaces/OCaml/OCaml_interface.dox | 214 ++++++++++++++++++++++++++++++++++ 1 files changed, 214 insertions(+), 0 deletions(-) diff --git a/interfaces/OCaml/OCaml_interface.dox b/interfaces/OCaml/OCaml_interface.dox index 2bc0ac9..7d9fb8b 100644 --- a/interfaces/OCaml/OCaml_interface.dox +++ b/interfaces/OCaml/OCaml_interface.dox @@ -430,6 +430,220 @@ defining mixed integer (linear) programming problems. <BR> +\anchor OCaml_pip_functions +<H1> PIP Functions </H1> +Here we describe some functions available for PPL objects +defining parametric integer programming problems. + +<H2><CODE> + ppl_new_PIP_Problem_from_space_dimension dimension +</CODE></H2> + Return a handle to a PIP Problem \f$\mathrm{PIP}\f$ with the + feasible region the vector space of dimension <CODE>dimension</CODE>, + empty constraint_system and empty set of parametric variables. + +<H2><CODE> + ppl_new_PIP_Problem dimension constraint_system vars_list +</CODE></H2> + Return a handle to a PIP Problem \f$\mathrm{PIP}\f$ having space + dimension <CODE>dimension</CODE>, a feasible region represented by + <CODE>constraint_system</CODE> and parametric variables represented + by <CODE>vars_list</CODE>. + +<H2><CODE> + ppl_PIP_Problem_get_control_parameter handle param_name +</CODE></H2> + Returns the value of the control parameter named <CODE>param_name</CODE>. + +<H2><CODE> + ppl_PIP_Problem_set_control_parameter handle param_value +</CODE></H2> + Sets control parameter value <CODE>param_value</CODE>. + +<H2><CODE> + ppl_PIP_Problem_swap handle_1 handle_2 +</CODE></H2> + Swaps the PIP Problem referenced by <CODE>handle_1</CODE> + with the one referenced by <CODE>handle_2</CODE>. + +<H2><CODE> + ppl_PIP_Problem_space_dimension handle +</CODE></H2> + Returns the dimension of the vector space in which the + PIP Problem referenced by <CODE>handle</CODE> is embedded. + +<H2><CODE> + ppl_PIP_Problem_parameter_space_dimensions handle +</CODE></H2> + Returns a list of variables representing + representing the parameter space dimensions of the PIP Problem + referenced by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Problem_constraints handle +</CODE></H2> + Returns a list of the constraints in the constraints system + representing the feasible region for the PIP Problem + referenced by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Problem_clear handle +</CODE></H2> + Resets the PIP problem referenced by <CODE>handle</CODE> + to be the trivial problem with space dimension \f$0\f$. + +<H2><CODE> ppl_PIP_Problem_add_space_dimensions_and_embed + handle dimension_0 dimension_1 + </CODE></H2> + Embeds the PIP problem referenced by <CODE>handle</CODE> + in a space that is enlarged by <CODE>dimension_0</CODE> + non-parameter dimensions and <CODE>dimension_1</CODE> parameter dimensions, + +<H2><CODE> + ppl_PIP_Problem_add_to_parameter_space_dimensions handle vars_list +</CODE></H2> + Sets the space dimensions whose indexes are in \p vars_list + to be parameter space dimensions. + +<H2><CODE> + ppl_PIP_Problem_add_constraint handle constraint +</CODE></H2> + Updates the PIP Problem referenced by <CODE>handle</CODE> + so that the feasible region is represented by the original constraint + system together with the constraint <CODE>constraint</CODE>. + +<H2><CODE> + ppl_PIP_Problem_add_constraints handle constraint_system +</CODE></H2> + Updates the PIP Problem referenced by <CODE>handle</CODE> + so that the feasible region is represented by the original constraint + system together with all the constraints in <CODE>constraint_system</CODE>. + +<H2><CODE> + ppl_PIP_Problem_set_big_parameter_dimension handle dimension +</CODE></H2> + Sets the dimension for the big parameter to \p dimension. + +<H2><CODE> + ppl_PIP_Problem_get_big_parameter_dimension handle +</CODE></H2> + Returns the dimension for the big parameter. + Exception is thrown if no big parameter dimension has been set. + +<H2><CODE> + ppl_PIP_Problem_is_satisfiable handle +</CODE></H2> + Returns true if the PIP Problem referenced by + <CODE>handle</CODE> is satisfiable and false otherwise. + +<H2><CODE> + ppl_PIP_Problem_solve handle +</CODE></H2> + Solves the PIP problem referenced by + <CODE>handle</CODE> and returns + a status flag indicating the outcome of the optimization attempt: + \p Optimized_Pip_Problem if the optimization attempt succeeds; + \p Unfeasible_Pip_Problem otherwise. + +<H2><CODE> + ppl_PIP_Problem_solution handle +</CODE></H2> + Solves the PIP problem referenced by <CODE>handle</CODE> and + returns a handle to a PIP_Tree representing a feasible solution, + if it exists and bottom otherwise. + +<H2><CODE> + ppl_PIP_Problem_optimizing_solution handle +</CODE></H2> + Solves the PIP problem referenced by <CODE>handle</CODE> and + returns a handle to a PIP_Tree representing an optimizing_solution, + if it exists and bottom otherwise. + +<H2><CODE> + ppl_PIP_Problem_OK handle +</CODE></H2> + Returns true if the PIP Problem referenced by + <CODE>handle</CODE> is well formed, i.e., if it + satisfies all its implementation invariants and false, + otherwise. Useful for debugging purposes. + +<H2><CODE> + ppl_PIP_Problem_ascii_dump handle +</CODE></H2> + Returns a string containing an ASCII dump of the internal representation + of the PIP_Problem referenced by <CODE>handle</CODE>. Useful for + debugging purposes. + +<H2><CODE> + ppl_PIP_Tree_Node_swap handle_1 handle_2 +</CODE></H2> + Swaps the PIP tree node referenced by <CODE>handle_1</CODE> + with the one referenced by <CODE>handle_2</CODE>. + +<H2><CODE> + ppl_PIP_Tree_Node_OK handle +</CODE></H2> + Returns true if the PIP tree node referenced by + <CODE>handle</CODE> is well formed, i.e., if it + satisfies all its implementation invariants and false, + otherwise. Useful for debugging purposes. + +<H2><CODE> + ppl_PIP_Tree_Node_ascii_dump handle +</CODE></H2> + Returns a string containing an ASCII dump of the internal representation + of the Pip tree node referenced by <CODE>handle</CODE>. Useful for + debugging purposes. + +<H2><CODE> + ppl_PIP_Tree_Node_constraints handle +</CODE></H2> + Returns a list of the parameter constraints in the PIP tree node + referenced by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Tree_Node_artificials handle +</CODE></H2> + Returns a list of the artificial parameters in the PIP + tree node referenced by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Tree_Node_is_bottom handle +</CODE></H2> + Returns true if and only if <CODE>handle</CODE> represents bottom. + +<H2><CODE> + ppl_PIP_Tree_Node_is_decision handle +</CODE></H2> + Returns true if and only if <CODE>handle</CODE> represents a decision node. + +<H2><CODE> + ppl_PIP_Tree_Node_is_solution handle +</CODE></H2> + Returns true if and only if <CODE>handle</CODE> represents a solution node. + +<H2><CODE> + ppl_PIP_Tree_Node_parametric_values handle var +</CODE></H2> + Returns a linear expression representing the values of problem variable + \p var in the solution node represented by <CODE>handle</CODE>. + The returned linear expression may involve problem parameters + as well as artificial parameters. + +<H2><CODE> + ppl_PIP_Tree_Node_true_child handle var +</CODE></H2> + Returns a handle to the child on the true branch of the + PIP tree node represented by <CODE>handle</CODE>. + +<H2><CODE> + ppl_PIP_Tree_Node_false_child handle var +</CODE></H2> + Returns a handle to the child on the false branch of the + PIP tree node represented by <CODE>handle</CODE>. + +<BR> + \anchor main_OCaml_C_polyhedron_functions <H1> C_Polyhedron Functions </H1> Here we describe the main functions available for PPL objects

1 0

[GIT] ppl/ppl(master): ppl_PIP_Problem_get_big_parameter_dimension() now throws
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: b2698ee02273622a897d69f3044a2b7dda2410d7 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b2698ee02273… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 13:54:23 2010 +0100 ppl_PIP_Problem_get_big_parameter_dimension() now throws an exception if the big parameter has not been set. --- interfaces/OCaml/ppl_ocaml_common.cc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index 291298b..305c569 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1386,6 +1386,10 @@ ppl_PIP_Problem_get_big_parameter_dimension(value caml_pip) try { CAMLparam1(caml_pip); PIP_Problem& ppl_pip = *p_PIP_Problem_val(caml_pip); dimension_type d = ppl_pip.get_big_parameter_dimension(); + if (d == not_a_dimension()) + throw std::invalid_argument("ppl_PIP_Problem_get_big_parameter_dimension" + "(pip):\n" + "big parameter dimension has not been set."); CAMLreturn(ppl_dimension_to_value(d)); } CATCH_ALL

1 0

[GIT] ppl/ppl(master): Removed a completed item:
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: c27fa3bd5ea268d48ff9f5ca7d8bab4f92a5b553 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c27fa3bd5ea2… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 13:52:26 2010 +0100 Removed a completed item: - Handle std::logic_error (now thrown in case watchdogs are not available) in all the interfaces. --- TODO | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index ddebb7f..835ea2c 100644 --- a/TODO +++ b/TODO @@ -2,8 +2,6 @@ Enhancements for PPL 0.11 ========================= -- Handle std::logic_error (now thrown in case watchdogs are not - available) in all the interfaces. - Make all the *affine*image() methods uniform as far as the specification is concerned. - Look carefully at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115

1 0

[GIT] ppl/ppl(master): Simplify function names in PIP_Tree_Node, matching
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 924d4fbdd9192a6b03c9fbea4c4e5f0d71411f96 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=924d4fbdd919… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 12:29:57 2010 +0100 Simplify function names in PIP_Tree_Node, matching corresponding predicate names in Prolog interface. --- interfaces/OCaml/ppl_ocaml_common.cc | 6 +++--- interfaces/OCaml/ppl_ocaml_globals.ml | 12 ++++++------ interfaces/OCaml/ppl_ocaml_globals.mli | 6 +++--- interfaces/OCaml/tests/test1.ml | 10 +++++----- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index 9f3e8bf..291298b 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1626,7 +1626,7 @@ CATCH_ALL extern "C" CAMLprim value -ppl_PIP_Tree_Node_get_parametric_values(value caml_node, +ppl_PIP_Tree_Node_parametric_values(value caml_node, value caml_dim) try { CAMLparam2(caml_node, caml_dim); const PIP_Tree_Node* ppl_node = p_PIP_Tree_Node_val(caml_node); @@ -1647,7 +1647,7 @@ CATCH_ALL extern "C" CAMLprim value -ppl_PIP_Tree_Node_get_true_child(value caml_node) try { +ppl_PIP_Tree_Node_true_child(value caml_node) try { CAMLparam1(caml_node); const PIP_Tree_Node* ppl_node = p_PIP_Tree_Node_val(caml_node); const PIP_Tree_Node* child = ppl_PIP_Tree_Node_get_child(ppl_node, true); @@ -1657,7 +1657,7 @@ CATCH_ALL extern "C" CAMLprim value -ppl_PIP_Tree_Node_get_false_child(value caml_node) try { +ppl_PIP_Tree_Node_false_child(value caml_node) try { CAMLparam1(caml_node); const PIP_Tree_Node* ppl_node = p_PIP_Tree_Node_val(caml_node); const PIP_Tree_Node* child = ppl_PIP_Tree_Node_get_child(ppl_node, false); diff --git a/interfaces/OCaml/ppl_ocaml_globals.ml b/interfaces/OCaml/ppl_ocaml_globals.ml index 5ce4c8f..3d1e7a4 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.ml +++ b/interfaces/OCaml/ppl_ocaml_globals.ml @@ -414,18 +414,18 @@ external ppl_PIP_Tree_Node_is_solution: pip_tree_node -> bool = "ppl_PIP_Tree_Node_is_solution" -external ppl_PIP_Tree_Node_get_parametric_values: +external ppl_PIP_Tree_Node_parametric_values: pip_tree_node -> int -> linear_expression - = "ppl_PIP_Tree_Node_get_parametric_values" + = "ppl_PIP_Tree_Node_parametric_values" external ppl_PIP_Tree_Node_is_decision: pip_tree_node -> bool = "ppl_PIP_Tree_Node_is_decision" -external ppl_PIP_Tree_Node_get_true_child: +external ppl_PIP_Tree_Node_true_child: pip_tree_node -> pip_tree_node - = "ppl_PIP_Tree_Node_get_true_child" + = "ppl_PIP_Tree_Node_true_child" -external ppl_PIP_Tree_Node_get_false_child: +external ppl_PIP_Tree_Node_false_child: pip_tree_node -> pip_tree_node - = "ppl_PIP_Tree_Node_get_false_child" + = "ppl_PIP_Tree_Node_false_child" diff --git a/interfaces/OCaml/ppl_ocaml_globals.mli b/interfaces/OCaml/ppl_ocaml_globals.mli index e43b10c..8ffb016 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.mli +++ b/interfaces/OCaml/ppl_ocaml_globals.mli @@ -356,14 +356,14 @@ val ppl_PIP_Tree_Node_is_bottom: val ppl_PIP_Tree_Node_is_solution: pip_tree_node -> bool -val ppl_PIP_Tree_Node_get_parametric_values: +val ppl_PIP_Tree_Node_parametric_values: pip_tree_node -> int -> linear_expression val ppl_PIP_Tree_Node_is_decision: pip_tree_node -> bool -val ppl_PIP_Tree_Node_get_true_child: +val ppl_PIP_Tree_Node_true_child: pip_tree_node -> pip_tree_node -val ppl_PIP_Tree_Node_get_false_child: +val ppl_PIP_Tree_Node_false_child: pip_tree_node -> pip_tree_node diff --git a/interfaces/OCaml/tests/test1.ml b/interfaces/OCaml/tests/test1.ml index dcf8ac4..66d6b8a 100644 --- a/interfaces/OCaml/tests/test1.ml +++ b/interfaces/OCaml/tests/test1.ml @@ -597,21 +597,21 @@ let out = if (ppl_PIP_Tree_Node_artificials node = []) in (print_string_if_noisy out);; print_string_if_noisy "\n";; let _node_cs = ppl_PIP_Tree_Node_constraints node;; -let tchild = ppl_PIP_Tree_Node_get_true_child node;; -let _fchild = ppl_PIP_Tree_Node_get_false_child node;; +let tchild = ppl_PIP_Tree_Node_true_child node;; +let _fchild = ppl_PIP_Tree_Node_false_child node;; let out = if (ppl_PIP_Tree_Node_is_decision tchild) then "ppl_PIP_Tree_Node_is_decision tchild test succeeded" else "ppl_PIP_Tree_Node_is_decision tchild test failed" in (print_string_if_noisy out);; print_string_if_noisy "\n";; -let ttchild = ppl_PIP_Tree_Node_get_true_child tchild;; -let ftchild = ppl_PIP_Tree_Node_get_false_child tchild;; +let ttchild = ppl_PIP_Tree_Node_true_child tchild;; +let ftchild = ppl_PIP_Tree_Node_false_child tchild;; let out = if (ppl_PIP_Tree_Node_is_solution ttchild) then "ppl_PIP_Tree_Node_is_decision ttchild test succeeded" else "ppl_PIP_Tree_Node_is_decision ttchild test failed" in (print_string_if_noisy out);; print_string_if_noisy "\n";; -let _par_vals = ppl_PIP_Tree_Node_get_parametric_values ttchild 0;; +let _par_vals = ppl_PIP_Tree_Node_parametric_values ttchild 0;; let _ftchild_arts = ppl_PIP_Tree_Node_artificials ftchild;; (* Pointset_Powerset_Grid is not enabled by default, the following code is *)

1 0

[GIT] ppl/ppl(master): Simplified Prolog interface for PIP_Tree_Node.
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 97c151b721fbfa9963d9b873355b163181f0d07b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=97c151b721fb… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 12:06:01 2010 +0100 Simplified Prolog interface for PIP_Tree_Node. --- ...erface_generator_prolog_procedure_generators.m4 | 11 +++-- interfaces/Prolog/ppl_prolog_common.cc | 46 ++++++++++---------- interfaces/Prolog/ppl_prolog_common.defs.hh | 23 +++++----- interfaces/Prolog/tests/pl_check.pl | 34 +++++++------- 4 files changed, 58 insertions(+), 56 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 index 1d80e1c..cfd158b 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 @@ -107,13 +107,14 @@ ppl_PIP_Problem_optimizing_solution/2, ppl_PIP_Problem_OK/1, ppl_PIP_Problem_ascii_dump/1, ppl_PIP_Tree_Node_constraints/2, -ppl_PIP_Tree_Node_as_solution/2, -ppl_PIP_Tree_Node_as_decision/2, +ppl_PIP_Tree_Node_is_solution/1, +ppl_PIP_Tree_Node_is_decision/1, +ppl_PIP_Tree_Node_is_bottom/1, ppl_PIP_Tree_Node_artificials/2, ppl_PIP_Tree_Node_OK/1, -ppl_PIP_Solution_Node_get_parametric_values/3, -ppl_PIP_Decision_Node_get_true_child/2, -ppl_PIP_Decision_Node_get_false_child/2`'dnl +ppl_PIP_Tree_Node_parametric_values/3, +ppl_PIP_Tree_Node_true_child/2, +ppl_PIP_Tree_Node_false_child/2`'dnl ') m4_define(`m4_procedure_list', diff --git a/interfaces/Prolog/ppl_prolog_common.cc b/interfaces/Prolog/ppl_prolog_common.cc index fbb985d..cf55e9a 100644 --- a/interfaces/Prolog/ppl_prolog_common.cc +++ b/interfaces/Prolog/ppl_prolog_common.cc @@ -2996,43 +2996,43 @@ ppl_PIP_Tree_Node_constraints(Prolog_term_ref t_pip, } extern "C" Prolog_foreign_return_type -ppl_PIP_Tree_Node_as_solution(Prolog_term_ref t_pip, - Prolog_term_ref t_sol) { +ppl_PIP_Tree_Node_is_solution(Prolog_term_ref t_pip) { static const char* where = "ppl_PIP_Tree_Node_as_solution/2"; try { const PIP_Tree_Node* pip = term_to_handle<PIP_Tree_Node>(t_pip, where); PPL_CHECK(pip); - PIP_Solution_Node* sol = const_cast<PIP_Solution_Node*>(pip->as_solution()); - if (sol == 0) - return PROLOG_FAILURE; - Prolog_term_ref t_ppl_sol = Prolog_new_term_ref(); - Prolog_put_address(t_ppl_sol, sol); - if (Prolog_unify(t_sol, t_ppl_sol)) { - PPL_WEAK_REGISTER(sol); + if (pip != 0 && pip->as_solution() != 0) return PROLOG_SUCCESS; - } + return PROLOG_FAILURE; } CATCH_ALL; } extern "C" Prolog_foreign_return_type -ppl_PIP_Tree_Node_as_decision(Prolog_term_ref t_pip, - Prolog_term_ref t_dec) { +ppl_PIP_Tree_Node_is_decision(Prolog_term_ref t_pip) { static const char* where = "ppl_PIP_Tree_Node_as_decision/2"; try { const PIP_Tree_Node* pip = term_to_handle<PIP_Tree_Node>(t_pip, where); PPL_CHECK(pip); - PIP_Decision_Node* dec = const_cast<PIP_Decision_Node*>(pip->as_decision()); - if (dec == 0) - return PROLOG_FAILURE; - Prolog_term_ref t_ppl_dec = Prolog_new_term_ref(); - Prolog_put_address(t_ppl_dec, dec); - if (Prolog_unify(t_dec, t_ppl_dec)) { - PPL_WEAK_REGISTER(dec); + if (pip != 0 && pip->as_decision() != 0) return PROLOG_SUCCESS; - } + return PROLOG_FAILURE; + } + CATCH_ALL; +} + +extern "C" Prolog_foreign_return_type +ppl_PIP_Tree_Node_is_bottom(Prolog_term_ref t_pip) { + static const char* where = "ppl_PIP_Tree_Node_as_decision/2"; + try { + const PIP_Tree_Node* pip = term_to_handle<PIP_Tree_Node>(t_pip, where); + PPL_CHECK(pip); + + if (pip == 0) + return PROLOG_SUCCESS; + return PROLOG_FAILURE; } CATCH_ALL; } @@ -3060,7 +3060,7 @@ ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_tree_node, } extern "C" Prolog_foreign_return_type -ppl_PIP_Solution_Node_get_parametric_values(Prolog_term_ref t_pip, +ppl_PIP_Tree_Node_parametric_values(Prolog_term_ref t_pip, Prolog_term_ref t_var, Prolog_term_ref t_le) { static const char* where = "ppl_PIP_Solution_Node_get_parametric_values/3"; @@ -3076,7 +3076,7 @@ ppl_PIP_Solution_Node_get_parametric_values(Prolog_term_ref t_pip, } extern "C" Prolog_foreign_return_type -ppl_PIP_Decision_Node_get_true_child(Prolog_term_ref t_pip, +ppl_PIP_Tree_Node_true_child(Prolog_term_ref t_pip, Prolog_term_ref t_ptree) { static const char* where = "ppl_PIP_Decision_Node_get_true_child/2"; try { @@ -3096,7 +3096,7 @@ ppl_PIP_Decision_Node_get_true_child(Prolog_term_ref t_pip, } extern "C" Prolog_foreign_return_type -ppl_PIP_Decision_Node_get_false_child(Prolog_term_ref t_pip, +ppl_PIP_Tree_Node_false_child(Prolog_term_ref t_pip, Prolog_term_ref t_ptree) { static const char* where = "ppl_PIP_Decision_Node_get_false_child/2"; try { diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index 337b9fc..53a9b63 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -1046,12 +1046,13 @@ ppl_PIP_Tree_Node_constraints(Prolog_term_ref t_tree_node, Prolog_term_ref t_clist); extern "C" Prolog_foreign_return_type -ppl_PIP_Tree_Node_as_solution(Prolog_term_ref t_tree_node, - Prolog_term_ref t_sol_node); +ppl_PIP_Tree_Node_is_solution(Prolog_term_ref t_tree_node); extern "C" Prolog_foreign_return_type -ppl_PIP_Tree_Node_as_decision(Prolog_term_ref t_tree_node, - Prolog_term_ref t_dec_node); +ppl_PIP_Tree_Node_is_decision(Prolog_term_ref t_tree_node); + +extern "C" Prolog_foreign_return_type +ppl_PIP_Tree_Node_is_bottom(Prolog_term_ref t_tree_node); extern "C" Prolog_foreign_return_type ppl_PIP_Tree_Node_artificials(Prolog_term_ref t_tree_node, @@ -1061,17 +1062,17 @@ extern "C" Prolog_foreign_return_type ppl_PIP_Tree_Node_OK(Prolog_term_ref t_pip_tree); extern "C" Prolog_foreign_return_type -ppl_PIP_Solution_Node_get_parametric_values(Prolog_term_ref t_pip_sol, - Prolog_term_ref t_var, - Prolog_term_ref t_pvalue_list); +ppl_PIP_Tree_Node_parametric_values(Prolog_term_ref t_pip_sol, + Prolog_term_ref t_var, + Prolog_term_ref t_pvalue_list); extern "C" Prolog_foreign_return_type -ppl_PIP_Decision_Node_get_true_child(Prolog_term_ref t_pip_dec, - Prolog_term_ref t_pip_tree); +ppl_PIP_Tree_Node_true_child(Prolog_term_ref t_pip_dec, + Prolog_term_ref t_pip_tree); extern "C" Prolog_foreign_return_type -ppl_PIP_Decision_Node_get_false_child(Prolog_term_ref t_pip_dec, - Prolog_term_ref t_pip_tree); +ppl_PIP_Tree_Node_false_child(Prolog_term_ref t_pip_dec, + Prolog_term_ref t_pip_tree); using namespace Parma_Polyhedra_Library; using namespace Parma_Polyhedra_Library::Interfaces::Prolog; diff --git a/interfaces/Prolog/tests/pl_check.pl b/interfaces/Prolog/tests/pl_check.pl index e70d85a..83d3e48 100644 --- a/interfaces/Prolog/tests/pl_check.pl +++ b/interfaces/Prolog/tests/pl_check.pl @@ -2464,29 +2464,29 @@ pip_solution :- make_vars(4, [I, J, M, N]), clean_ppl_new_PIP_Problem( 4, [3*J >= -2*I + 8, J =< 4*I - 4, J =< M, I =< N], [M,N], PIP), - ppl_PIP_Problem_solution(PIP, Tree_Node), - ppl_PIP_Tree_Node_artificials(Tree_Node, Artificials), + ppl_PIP_Problem_solution(PIP, Node), + ppl_PIP_Tree_Node_artificials(Node, Artificials), Artificials = [], - \+ ppl_PIP_Tree_Node_as_solution(Tree_Node, _Sol), - ppl_PIP_Tree_Node_constraints(Tree_Node, _CS), - ppl_PIP_Tree_Node_as_decision(Tree_Node, Dec), - ppl_PIP_Tree_Node_constraints(Dec, _CS1), - ppl_PIP_Decision_Node_get_true_child(Dec, TChild), - ppl_PIP_Decision_Node_get_false_child(Dec, _FChild), - ppl_PIP_Tree_Node_as_decision(TChild, TChild_Dec), - ppl_PIP_Decision_Node_get_true_child(TChild_Dec, TTChild), - \+ ppl_PIP_Tree_Node_as_decision(TTChild, _TTChild_Dec), - ppl_PIP_Tree_Node_as_solution(TTChild, TTChild_Sol), - ppl_PIP_Solution_Node_get_parametric_values(TTChild_Sol, I, _TPV), - ppl_PIP_Decision_Node_get_false_child(TChild_Dec, FTChild), + \+ ppl_PIP_Tree_Node_is_solution(Node), + ppl_PIP_Tree_Node_constraints(Node, _CS), + ppl_PIP_Tree_Node_is_decision(Node), + ppl_PIP_Tree_Node_constraints(Node, _CS1), + ppl_PIP_Tree_Node_true_child(Node, TChild), + ppl_PIP_Tree_Node_false_child(Node, _FChild), + ppl_PIP_Tree_Node_is_decision(TChild), + ppl_PIP_Tree_Node_true_child(TChild, TTChild), + \+ ppl_PIP_Tree_Node_is_decision(TTChild), + ppl_PIP_Tree_Node_is_solution(TTChild), + ppl_PIP_Tree_Node_parametric_values(TTChild, I, _TPV), + ppl_PIP_Tree_Node_false_child(TChild, FTChild), ppl_PIP_Tree_Node_artificials(FTChild, FTChild_Artificials), FTChild_Artificials = [Art_LinExpr/Art_Den], compare_lin_expressions(Art_LinExpr, M), Art_Den = 2, - ppl_PIP_Tree_Node_as_solution(FTChild, FTChild_Sol), - ppl_PIP_Solution_Node_get_parametric_values(FTChild_Sol, I, _FPV), + ppl_PIP_Tree_Node_is_solution(FTChild), + ppl_PIP_Tree_Node_parametric_values(FTChild, I, _FPV), ppl_PIP_Problem_OK(PIP), - ppl_PIP_Tree_Node_OK(Tree_Node), + ppl_PIP_Tree_Node_OK(Node), !, ppl_delete_PIP_Problem(PIP).

1 0

[GIT] ppl/ppl(master): Removed artificial_parameter_sequence type.
by Patricia Hill 08 Apr '10

08 Apr '10

Module: ppl/ppl Branch: master Commit: 46aa53b6bc9849ad622c1f0fcb6dbc763059af41 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=46aa53b6bc98… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Apr 8 11:44:06 2010 +0100 Removed artificial_parameter_sequence type. Added to the PIP_Problem tests. --- interfaces/OCaml/ppl_ocaml_globals.ml | 4 +- interfaces/OCaml/ppl_ocaml_globals.mli | 4 +- interfaces/OCaml/tests/test1.ml | 172 +++++++++++++++++++++++--------- 3 files changed, 127 insertions(+), 53 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=46aa53b6…

1 0