March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added missing code for logic_error exception.
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: master Commit: 8ceb0b7e208be8a99d61372f883c1853ce390952 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8ceb0b7e208b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 21:49:18 2010 +0000 Added missing code for logic_error exception. --- interfaces/Prolog/ppl_prolog_common.defs.hh | 3 + tests/Grid/frequency1.cc | 64 +++++++++++++++++++++++++++ tests/Octagonal_Shape/frequency1.cc | 31 +++++++++++++ 3 files changed, 98 insertions(+), 0 deletions(-) diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index bb3e245..ce3fb55 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -413,6 +413,9 @@ void handle_exception(const std::length_error& e); void +handle_exception(const std::logic_error& e); + +void handle_exception(const std::bad_alloc&); void diff --git a/tests/Grid/frequency1.cc b/tests/Grid/frequency1.cc index d4727e4..1ee313e 100644 --- a/tests/Grid/frequency1.cc +++ b/tests/Grid/frequency1.cc @@ -267,6 +267,67 @@ test11() { return ok && (gr == known_gr); } +bool +test12() { + Variable A(0); + Variable B(1); + + Grid gr(2); + gr.add_constraint(A == 0); + gr.add_congruence(B %= 0); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (gr.frequency(Linear_Expression(A), num, den, valn, vald) + && num == 0 && den == 1 && valn == 0 && vald == 1); + print_congruences(gr, "*** gr ***"); + + return ok; +} + +bool +test13() { + Variable A(0); + Variable B(1); + + Grid gr(2); + gr.add_constraint(A == 0); + gr.add_constraint(B == 0); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (gr.frequency(Linear_Expression(A), num, den, valn, vald) + && num == 0 && den == 1 && valn == 0 && vald == 1); + print_congruences(gr, "*** gr ***"); + + return ok; +} + +bool +test14() { + Variable A(0); + Variable B(1); + + Grid gr(2); + gr.add_congruence((A %= 0) / 1); + gr.add_congruence((2*A - B %= 0) / 2); + print_congruences(gr, "*** gr ***"); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (gr.frequency(Linear_Expression(B), num, den, valn, vald) + && num == 2 && den == 1 && valn == 0 && vald == 1); + print_congruences(gr, "*** gr ***"); + nout << num << den; + return ok; +} + } // namespace BEGIN_MAIN @@ -281,4 +342,7 @@ BEGIN_MAIN DO_TEST(test09); DO_TEST(test10); DO_TEST(test11); + DO_TEST(test12); + DO_TEST(test13); + DO_TEST(test14); END_MAIN diff --git a/tests/Octagonal_Shape/frequency1.cc b/tests/Octagonal_Shape/frequency1.cc index 8184a0c..652a5e0 100644 --- a/tests/Octagonal_Shape/frequency1.cc +++ b/tests/Octagonal_Shape/frequency1.cc @@ -291,6 +291,36 @@ test12() { return ok; } +bool +test13() { + Variable A(0); + Variable B(1); + Variable C(2); + + TOctagonal_Shape os(3); + os.add_constraint(4*A - 4*B == 1); + o.add_constraint(3*C == 1); + o.add_constraint(B <= 2); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool discrete = os.frequency(Linear_Expression(A - B), + num, den, valn, vald); + // If the shape is based on an integral coefficient type, then + // approximations will induce non discreteness of the linear expression. + bool ok + = std::numeric_limits<TOctagonal_Shape::coefficient_type_base>::is_integer + ? (!discrete && num == 0 && den == 0 && valn == 0 && vald == 0) + : (discrete && num == 0 && den == 1 && valn == 1 && vald == 4); + print_constraints(os, "*** os ***"); + nout << "num " << num << ", den " << den << endl; + nout << "valn " << valn << ", vald " << vald << endl; + + return ok; +} + } // namespace BEGIN_MAIN @@ -306,4 +336,5 @@ BEGIN_MAIN DO_TEST(test10); DO_TEST(test11); DO_TEST(test12); + DO_TEST(test13); END_MAIN

1 0

[GIT] ppl/ppl(termination): Simplified OCaml code for all_zero() and all_homogeneous_terms_are_zero()
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: termination Commit: 636c546843046a5cfa6d27a1aa4a8171d7e537ab URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=636c54684304… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 21:44:54 2010 +0000 Simplified OCaml code for all_zero() and all_homogeneous_terms_are_zero() --- interfaces/OCaml/ppl_ocaml_common.cc | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index e574656..8592046 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1206,8 +1206,7 @@ extern "C" CAMLprim value ppl_Linear_Expression_is_zero(value ocaml_le) try { CAMLparam1(ocaml_le); - Linear_Expression ppl_le = build_ppl_Linear_Expression(ocaml_le); - CAMLreturn(ppl_le.is_zero() + CAMLreturn(build_ppl_Linear_Expression(ocaml_le).is_zero() ? Val_true : Val_false); } CATCH_ALL @@ -1216,8 +1215,8 @@ extern "C" CAMLprim value ppl_Linear_Expression_all_homogeneous_terms_are_zero(value ocaml_le) try { CAMLparam1(ocaml_le); - Linear_Expression ppl_le = build_ppl_Linear_Expression(ocaml_le); - CAMLreturn(ppl_le.all_homogeneous_terms_are_zero() + CAMLreturn(build_ppl_Linear_Expression(ocaml_le). + all_homogeneous_terms_are_zero() ? Val_true : Val_false); } CATCH_ALL

1 0

[GIT] ppl/ppl(termination): Added OCaml interface for Linear_Expression:: is_zero() and
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: termination Commit: 866c0a278c0373dfc2ac3809ca894f366251a0a0 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=866c0a278c03… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 21:27:54 2010 +0000 Added OCaml interface for Linear_Expression::is_zero() and all_homogeneous_terms_are_zero(). --- interfaces/OCaml/ppl_ocaml_common.cc | 20 ++++++++++++++++++++ interfaces/OCaml/ppl_ocaml_globals.ml | 7 +++++++ interfaces/OCaml/ppl_ocaml_globals.mli | 6 ++++++ 3 files changed, 33 insertions(+), 0 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc index 62b67d5..e574656 100644 --- a/interfaces/OCaml/ppl_ocaml_common.cc +++ b/interfaces/OCaml/ppl_ocaml_common.cc @@ -1204,6 +1204,26 @@ CATCH_ALL extern "C" CAMLprim value +ppl_Linear_Expression_is_zero(value ocaml_le) try { + CAMLparam1(ocaml_le); + Linear_Expression ppl_le = build_ppl_Linear_Expression(ocaml_le); + CAMLreturn(ppl_le.is_zero() + ? Val_true : Val_false); +} +CATCH_ALL + +extern "C" +CAMLprim value +ppl_Linear_Expression_all_homogeneous_terms_are_zero(value ocaml_le) try { + CAMLparam1(ocaml_le); + Linear_Expression ppl_le = build_ppl_Linear_Expression(ocaml_le); + CAMLreturn(ppl_le.all_homogeneous_terms_are_zero() + ? Val_true : Val_false); +} +CATCH_ALL + +extern "C" +CAMLprim value ppl_set_rounding_for_PPL(value unit) try { CAMLparam1(unit); set_rounding_for_PPL(); diff --git a/interfaces/OCaml/ppl_ocaml_globals.ml b/interfaces/OCaml/ppl_ocaml_globals.ml index c8995eb..cd263d5 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.ml +++ b/interfaces/OCaml/ppl_ocaml_globals.ml @@ -152,6 +152,13 @@ unit -> Z.t = "ppl_Coefficient_max" external ppl_Coefficient_min: unit -> Z.t = "ppl_Coefficient_min" +external ppl_Linear_Expression_is_zero: +linear_expression -> bool = "ppl_Linear_Expression_is_zero" + +external ppl_Linear_Expression_all_homogeneous_terms_are_zero: +linear_expression -> bool + = "ppl_Linear_Expression_all_homogeneous_terms_are_zero" + external ppl_set_rounding_for_PPL: unit -> unit = "ppl_set_rounding_for_PPL" diff --git a/interfaces/OCaml/ppl_ocaml_globals.mli b/interfaces/OCaml/ppl_ocaml_globals.mli index a95ac64..f806f0d 100644 --- a/interfaces/OCaml/ppl_ocaml_globals.mli +++ b/interfaces/OCaml/ppl_ocaml_globals.mli @@ -137,6 +137,12 @@ val ppl_Coefficient_max: val ppl_Coefficient_min: unit -> Z.t +val ppl_Linear_Expression_is_zero: + linear_expression -> bool + +val ppl_Linear_Expression_all_homogeneous_terms_are_zero: + linear_expression -> bool + val ppl_set_rounding_for_PPL: unit -> unit

1 0

[GIT] ppl/ppl(master): Added std:: logic_error to the list of exceptions caught.
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: master Commit: 0cf98127510beb73d5d9f8a5fbb72c8c1b740853 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0cf98127510b… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Thu Mar 18 15:08:15 2010 +0000 Added std::logic_error to the list of exceptions caught. --- interfaces/OCaml/ppl_ocaml_common.defs.hh | 4 ++++ interfaces/Prolog/ppl_prolog_common.defs.hh | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/interfaces/OCaml/ppl_ocaml_common.defs.hh b/interfaces/OCaml/ppl_ocaml_common.defs.hh index fde6a8e..db969a8 100644 --- a/interfaces/OCaml/ppl_ocaml_common.defs.hh +++ b/interfaces/OCaml/ppl_ocaml_common.defs.hh @@ -209,6 +209,10 @@ catch(std::exception& e) { \ caml_raise_with_string(*caml_named_value("PPL_unknown_standard_exception"), \ (const_cast<char*>(e.what()))); \ } \ +catch(std::logic_error& e) { \ + caml_raise_with_string(*caml_named_value("PPL_logic_error"), \ + (const_cast<char*>(e.what()))); \ +} \ catch(timeout_exception&) { \ reset_timeout(); \ caml_raise_constant(*caml_named_value("PPL_timeout_exception")); \ diff --git a/interfaces/Prolog/ppl_prolog_common.defs.hh b/interfaces/Prolog/ppl_prolog_common.defs.hh index 33af32d..bb3e245 100644 --- a/interfaces/Prolog/ppl_prolog_common.defs.hh +++ b/interfaces/Prolog/ppl_prolog_common.defs.hh @@ -513,6 +513,9 @@ handle_exception(const deterministic_timeout_exception&); catch (const std::exception& e) { \ handle_exception(e); \ } \ + catch (const std::logic_error& e) { \ + handle_exception(e); \ + } \ catch (...) { \ handle_exception(); \ } \

1 0

[GIT] ppl/ppl(termination): Added Java interface for Linear_Expression:: is_zero() and
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: termination Commit: e1fbc0fec962a1285ec4205fc611387f1a8e5c45 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e1fbc0fec962… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 16:51:42 2010 +0000 Added Java interface for Linear_Expression::is_zero() and Linear_Expression::all_homogeneous_terms_are_zero(). --- interfaces/Java/jni/ppl_java_globals.cc | 16 ++++++++++++++++ .../parma_polyhedra_library/Linear_Expression.java | 8 ++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/jni/ppl_java_globals.cc b/interfaces/Java/jni/ppl_java_globals.cc index c6c80ac..b4de11f 100644 --- a/interfaces/Java/jni/ppl_java_globals.cc +++ b/interfaces/Java/jni/ppl_java_globals.cc @@ -450,6 +450,22 @@ Java_parma_1polyhedra_1library_Linear_1Expression_1Variable_initIDs cached_FMIDs.Linear_Expression_Variable_var_id_ID = mID; } +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_Linear_1Expression_is_1zero +(JNIEnv* env, jobject j_this) try { + Linear_Expression* this_ptr = &build_cxx_linear_expression(env, j_this); + return this_ptr->is_zero(); +} +CATCH_ALL + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_Linear_1Expression_all_1homogeneous_1terms_1are_1zero +(JNIEnv* env, jobject j_this) try { + Linear_Expression* this_ptr = &build_cxx_linear_expression(env, j_this); + return this_ptr->all_homogeneous_terms_are_zero(); +} +CATCH_ALL + JNIEXPORT void JNICALL Java_parma_1polyhedra_1library_MIP_1Problem_1Status_initIDs (JNIEnv* env, jclass j_mip_status_class) { diff --git a/interfaces/Java/parma_polyhedra_library/Linear_Expression.java b/interfaces/Java/parma_polyhedra_library/Linear_Expression.java index ba95a42..24f3ea9 100644 --- a/interfaces/Java/parma_polyhedra_library/Linear_Expression.java +++ b/interfaces/Java/parma_polyhedra_library/Linear_Expression.java @@ -63,6 +63,14 @@ public abstract class Linear_Expression implements Cloneable { //! Returns a string representation of \p this. public native String toString(); + //! Returns <CODE>true</CODE> if and only if \p *this is \f$0\f$. + public native boolean is_zero(); + + /*! \brief Returns <CODE>true</CODE> if and only if all the homogeneous + terms of \p *this are \f$0\f$. + */ + public native boolean all_homogeneous_terms_are_zero(); + private static native void initIDs(); static { initIDs();

1 0

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

20 Mar '10

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=982473d3d50f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Mar 20 16:22:36 2010 +0100 MIP_Problem: fix border case handling in linear_combine(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bc5a89bc5e15… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Mar 20 15:54:51 2010 +0100 MIP_Problem: little optimizations to linear_combine(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0d400a33ef77… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Mar 20 15:51:52 2010 +0100 MIP_Problem: use get() instead of operator[], in linear_combine(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bf3446d68d9e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Mar 20 15:46:29 2010 +0100 MIP_Problem: add comment in linear_combine(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=cf138ef5412e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Mar 20 15:36:06 2010 +0100 MIP_Problem: don't check an always false condition in linear_combine(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fe97f2c6b8ed… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Mar 20 15:26:36 2010 +0100 MIP_Problem: little optimizations in linear_combine(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=93dd7d9bcf33… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Mar 20 15:13:12 2010 +0100 MIP_Problem: use only one temporary instead of a vector of temporaries, in steepest_edge_exact_entering_index(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=97d2b4c165ec… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Mar 20 15:05:20 2010 +0100 MIP_Problem: don't uselessly call sqrt() in steepest_edge_float_entering_index().

1 0

[GIT] ppl/ppl(termination): Added some of the Java interface code needed for the termination
by Patricia Hill 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: termination Commit: e5dc0a6af950c7dfe2ada7bcca91d6a67d15b367 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e5dc0a6af950… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Sat Mar 20 14:27:17 2010 +0000 Added some of the Java interface code needed for the termination methods. --- ...ppl_interface_generator_java_classes_cc_code.m4 | 18 ++++++++++++++++++ ...pl_interface_generator_java_classes_cc_files.m4 | 14 ++++++++++++++ .../Java/parma_polyhedra_library/Makefile.am | 7 ++++--- .../Parma_Polyhedra_Library.java | 4 ++++ .../ppl_interface_generator_java_classes_java.m4 | 19 ++++++++++++++++++- ...l_interface_generator_java_classes_java_code.m4 | 7 +++---- 6 files changed, 61 insertions(+), 8 deletions(-) diff --git a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 index b6aed73..dcc850b 100644 --- a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 +++ b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_code.m4 @@ -1285,3 +1285,21 @@ Java_parma_1polyhedra_1library_@1CLASS@_approximate_1@PARTITION@ } ') + +m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', +`dnl +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ + +JNIEXPORT jboolean JNICALL +Java_parma_1polyhedra_1library_termination_1test_1MS_1@TOPOLOGY@1@CLASS@ +(JNIEnv* env, jclass, jobject j_p) { + try { + @TOPOLOGY@@CLASS@* p_ptr + = reinterpret_cast<@TOPOLOGY@@CLASS@*>(get_ptr(env, j_p)); + return termination_test_MS(*p_ptr); + } + CATCH_ALL; + return 0; +} +') diff --git a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_files.m4 b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_files.m4 index eb35c89..6ec6688 100644 --- a/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_files.m4 +++ b/interfaces/Java/jni/ppl_interface_generator_java_classes_cc_files.m4 @@ -41,6 +41,20 @@ dnl ----------------------------------------------------------------- dnl Ensure any schematic procedure macro that is not defined dnl in the code file outputs a warning message. m4_define(`m4_default_code', `m4_dumpdef($1`'_code)') +m4_divert +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.cc << ___END_OF_FILE___ +/* Java Termination interface code. +m4_include(`ppl_interface_generator_copyright')`'dnl +*/ + +`#'include "ppl_java_common.defs.hh" +`#'include "parma_polyhedra_library_Termination.h" +`#'include "parma_polyhedra_library_C_Polyhedron.h" +`#'include "parma_polyhedra_library_NNC_Polyhedron.h" +using namespace Parma_Polyhedra_Library; +using namespace Parma_Polyhedra_Library::Interfaces::Java; + dnl m4_pre_extra_class_code(Class, CPP_Class, Class_Kind) dnl Prefix extra code for each class. m4_define(`m4_pre_extra_class_code', `dnl diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index a120f0c..20f8389 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -159,7 +159,8 @@ $(srcdir)/Variables_Set.java # NOTE: do _NOT_ add Fake_Class_for_Doxygen.java to this list. all_java_sources = \ $(fixed_java_sources) \ -$(required_instantiations_java_sources) +$(required_instantiations_java_sources) \ +Termination.java # NOTE: Fake_Class_for_Doxygen.java should be added here. EXTRA_DIST = \ @@ -188,8 +189,8 @@ java_classes.stamp: $(all_java_sources) java_cxx_headers.stamp: java_classes.stamp $(JAVAH) -classpath .. \ - $(fixed_java_cxx_headers) \ - $(required_instantiations_java_cxx_headers) + $(fixed_java_cxx_headers) \ + $(required_instantiations_java_cxx_headers) echo timestamp >$@ source_generation.stamp: $(interface_generator_dependencies) diff --git a/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java b/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java index e1738da..9c99cc1 100644 --- a/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java +++ b/interfaces/Java/parma_polyhedra_library/Parma_Polyhedra_Library.java @@ -190,6 +190,10 @@ public class Parma_Polyhedra_Library { information. */ public static native String banner(); +/* + public static native boolean + ppl_Termination_MS(C_Polyhedron p); +*/ //@} // Version Checking diff --git a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java.m4 b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java.m4 index 618f69c..5588db0 100644 --- a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java.m4 +++ b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java.m4 @@ -33,6 +33,18 @@ dnl Ensure any schematic procedure macro that is not defined dnl in the code file outputs a warning message. m4_define(`m4_default_code', `m4_dumpdef($1`'_code)') +m4_divert +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ +/* PPL Java interface: Termination definition. +m4_include(`ppl_interface_generator_copyright')`'dnl +*/ + +package parma_polyhedra_library; +public class Termination {`'dnl + +m4_divert(-1) + dnl m4_pre_extra_class_code(Class, CPP_Class, Class_Kind) dnl Prefix extra code for each class. m4_define(`m4_pre_extra_class_code', `dnl @@ -150,5 +162,10 @@ m4_divert`'dnl m4_all_code`'dnl ___END_OF_FILE___ m4_divert(-1) - +m4_divert +___END_OF_FILE___ +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ +} +___END_OF_FILE___ +m4_divert(-1) dnl End of file generation. diff --git a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 index 9bce7b2..295ed7f 100644 --- a/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 +++ b/interfaces/Java/parma_polyhedra_library/ppl_interface_generator_java_classes_java_code.m4 @@ -655,8 +655,7 @@ ___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ m4_define(`ppl_termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@_code', `dnl ___END_OF_FILE___ -___BEGIN_OF_FILE___ @CLASS@.java << ___END_OF_FILE___ - public native boolean - termination_test_@TERMINATION_ID@_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ arg); - +___BEGIN_OF_FILE___ Termination.java << ___END_OF_FILE___ + public static native boolean + ppl_termination_test_MS_@TOPOLOGY@@CLASS@(@TOPOLOGY@@CLASS@ p); ')

1 0

[GIT] ppl/ppl(master): Added a test generating a solution node with two context constraints.
by François Galea 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: master Commit: ca9a894625c3c0251d4b429ffbfe1c5c07846321 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ca9a894625c3… Author: François Galea <francois.galea(a)uvsq.fr> Date: Sat Mar 20 11:41:44 2010 +0100 Added a test generating a solution node with two context constraints. --- tests/PIP_Problem/pipproblem1.cc | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index 438663e..fc35a16 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -755,6 +755,31 @@ test25() { return ok; } +bool +test26() { + // Problem generating a solution node with two context constraints. + Variable x(0); + Variable y(1); + Variable p(2); + Variable q(3); + Variables_Set params(p, q); + + Constraint_System cs; + cs.insert(x + p <= 2); + cs.insert(y + q <= 1); + + PIP_Problem pip(cs.space_dimension(), cs.begin(), cs.end(), params); + + bool ok = (pip.solve() == OPTIMIZED_PIP_PROBLEM); + if (ok) { + const PIP_Tree solution = pip.solution(); + ok &= solution->OK(); + pip.print_solution(nout); + } + + return ok; +} + } // namespace BEGIN_MAIN @@ -783,4 +808,5 @@ BEGIN_MAIN DO_TEST_F8(test23); DO_TEST(test24); DO_TEST(test25); + DO_TEST(test26); END_MAIN

1 0

[GIT] ppl/ppl(master): Added two paragraphs about uses of the big parameter in the documentation.
by François Galea 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: master Commit: 65156364caa2da7235862998930736ca27c83236 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=65156364caa2… Author: François Galea <francois.galea(a)uvsq.fr> Date: Tue Mar 9 20:28:29 2010 +0100 Added two paragraphs about uses of the big parameter in the documentation. --- src/PIP_Problem.defs.hh | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/src/PIP_Problem.defs.hh b/src/PIP_Problem.defs.hh index 0f29afb..4def1e5 100644 --- a/src/PIP_Problem.defs.hh +++ b/src/PIP_Problem.defs.hh @@ -316,7 +316,40 @@ operator<<(std::ostream& s, const PIP_Problem& p); will be defined in terms of all the parameters (problem parameters and artificial parameters defined along the path). - FIXME: different uses of the big parameter. + \par Solving maximization problems + You can solve a lexicographic maximization problem by reformulating its + constraints using variable substitution. Proceed the following steps: + - Create a big parameter (see PIP_Problem::set_big_parameter_dimension), + which we will call \f$M\f$. + - Reformulate each of the maximization problem constraints by + substituting each \f$x_i\f$ variable with an expression of the form + \f$M-x'_i\f$, where the \f$x'_i\f$ variables are to be minimized. + - Solve the lexicographic minimum for the \f$x'\f$ variable vector. + - In the solution expressions, substitute each \f$x'_i\f$ variable back + to \f$M-x_i\f$. + + You can choose to maximize only a subset of the variables while minimizing + the other variables. In that case, just apply the variable substitution + method on the variables you want to be maximized. The variable + optimization priority will still be in lexicographic order. + + \par Allowing variables to be arbitrarily signed + You can deal with arbitrarily signed variables by reformulating the + constraints using variable substitution. Proceed the following steps: + - Create a big parameter (see PIP_Problem::set_big_parameter_dimension), + which we will call \f$M\f$. + - Reformulate each of the maximization problem constraints by + substituting each \f$x_i\f$ variable with an expression of the form + \f$M+x'_i\f$, where the \f$x'_i\f$ variables are positive. + - Solve the lexicographic minimum for the \f$x'\f$ variable vector. + - In the solution expressions, substitute each \f$x'_i\f$ variable back + to \f$x_i-M\f$. + + You can choose to define only a subset of the variables to be + sign-unrestricted. In that case, just apply the variable substitution + method on the variables you want to be sign-unrestricted. + + FIXME: Solving problems with arbitrarily signed parameters */ class Parma_Polyhedra_Library::PIP_Problem { public:

2 4

[GIT] ppl/ppl(termination): Version number bumped.
by Roberto Bagnara 20 Mar '10

20 Mar '10

Module: ppl/ppl Branch: termination Commit: d9f74236c2727ad4f4753baa73ddd6ff6b1546f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d9f74236c272… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Mar 20 08:33:13 2010 +0400 Version number bumped. --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 6909a88..dcab740 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Process this file with Autoconf to produce a configure script. # Every other copy of the package version number gets its value from here. -AC_INIT([the Parma Polyhedra Library], [0.11pre15], [ppl-devel(a)cs.unipr.it], [ppl]) +AC_INIT([the Parma Polyhedra Library], [0.11pre16], [ppl-devel(a)cs.unipr.it], [ppl]) # Minimum Autoconf version required. AC_PREREQ(2.61)

1 0