March 2010 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(termination): Debugging output switched off.
by Roberto Bagnara 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: termination Commit: 276bf49a11da0443cc5b284cf880858a8911b48a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=276bf49a11da… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 8 21:52:26 2010 +0400 Debugging output switched off. --- src/termination.templates.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/termination.templates.hh b/src/termination.templates.hh index 10e1b95..84b56c3 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -28,7 +28,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include "BD_Shape.defs.hh" #include "Octagonal_Shape.defs.hh" -#define PRINT_DEBUG_INFO 1 +#define PRINT_DEBUG_INFO 0 #if PRINT_DEBUG_INFO #include <iostream>

1 0

[GIT] ppl/ppl(termination): Fixed the implementation of the *_all_affine_ranking_functions_* predicates .
by Roberto Bagnara 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: termination Commit: a4bcdb95d9ed920e72f5b11b0d68bd0b7085cec4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a4bcdb95d9ed… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 8 21:37:08 2010 +0400 Fixed the implementation of the *_all_affine_ranking_functions_* predicates. --- .../ppl_interface_generator_prolog_cc_code.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index 8792308..76abb24 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -1272,8 +1272,8 @@ m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', "ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@/2"; try { @CPP_CLASS@* pset = term_to_handle<@CPP_CLASS@ >(t_pset, where); - C_Polyhedron ph(); PPL_CHECK(pset); + C_Polyhedron* ph = new C_Polyhedron(); Parma_Polyhedra_Library ::all_affine_ranking_functions_@TERMINATION_ID@(*pset, *ph); Prolog_term_ref tmp = Prolog_new_term_ref();

1 0

[GIT] ppl/ppl(termination): Fixed one_affine_ranking_function_MS(): it was not projecting the generator onto the mu variables.
by Roberto Bagnara 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: termination Commit: 38df1b8d05c74ba8a948f2482e78b38c78a9c0ee URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=38df1b8d05c7… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 8 20:22:46 2010 +0400 Fixed one_affine_ranking_function_MS(): it was not projecting the generator onto the mu variables. --- src/termination.templates.hh | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/termination.templates.hh b/src/termination.templates.hh index 93a4097..10e1b95 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -263,7 +263,14 @@ one_affine_ranking_function_MS(const PSET& pset, Generator& mu) { MIP_Problem mip = MIP_Problem(cs_mip.space_dimension(), cs_mip); if (mip.is_satisfiable()) { - mu = mip.feasible_point(); + Generator fp = mip.feasible_point(); + assert(fp.is_point()); + Linear_Expression le; + for (dimension_type i = n+1; i-- > 0; ) { + Variable vi(i); + le += vi*fp.coefficient(vi); + } + mu = point(le, fp.divisor()); return true; } else @@ -279,28 +286,28 @@ all_affine_ranking_functions_MS(const PSET& pset, C_Polyhedron& mu_space) { dimension_type m; prepare_input_MS_PR(pset, cs, n, m, "all_affine_ranking_functions_MS"); - Constraint_System cs1; - Constraint_System cs2; - fill_constraint_systems_MS(cs, n, m, cs1, cs2); + Constraint_System cs_out1; + Constraint_System cs_out2; + fill_constraint_systems_MS(cs, n, m, cs_out1, cs_out2); #if PRINT_DEBUG_INFO Variable::output_function_type* p_default_output_function = Variable::get_output_function(); Variable::set_output_function(output_function_MS); - std::cout << "*** cs1 ***" << std::endl; + std::cout << "*** cs_out1 ***" << std::endl; output_function_MS_which = 1; using namespace IO_Operators; - std::cout << cs1 << std::endl; + std::cout << cs_out1 << std::endl; - std::cout << "*** cs2 ***" << std::endl; + std::cout << "*** cs_out2 ***" << std::endl; output_function_MS_which = 2; using namespace IO_Operators; - std::cout << cs2 << std::endl; + std::cout << cs_out2 << std::endl; #endif - C_Polyhedron ph1(cs1); - C_Polyhedron ph2(cs2); + C_Polyhedron ph1(cs_out1); + C_Polyhedron ph2(cs_out2); ph1.remove_higher_space_dimensions(n); ph1.add_space_dimensions_and_embed(1); ph2.remove_higher_space_dimensions(n+1); @@ -359,8 +366,9 @@ one_affine_ranking_function_PR(const PSET& pset, Generator& mu) { MIP_Problem mip = MIP_Problem(cs_mip.space_dimension(), cs_mip); if (mip.is_satisfiable()) { - Generator u3 = mip.feasible_point(); - // FIXME: must multiply u3 by E'_C and assign the result to mu. + Generator fp = mip.feasible_point(); + // FIXME: must project fp to obtain 3, then multiply by E'_C + // and assign the result to mu. //return true; return false; }

1 0

[GIT] ppl/ppl(termination): Code for Polyhedron_all_affine_ranking_functions_PR and similar
by Patricia Hill 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: termination Commit: ea4a32cfd39ad59de60ca105540feef96207cd09 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ea4a32cfd39a… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 8 16:22:46 2010 +0000 Code for Polyhedron_all_affine_ranking_functions_PR and similar revised - but is buggy. m4 version needs fixing. --- .../ppl_interface_generator_prolog_cc_code.m4 | 34 ++++++++++++------- .../ppl_interface_generator_prolog_hh_code.m4 | 8 ++-- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 index 0fd0510..8792308 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_cc_code.m4 @@ -1231,12 +1231,12 @@ m4_define(`ppl_@CLASS@_bounded_@AFFIMAGE@_code', m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type ppl_@CLASS@_termination_test_@TERMINATION_ID@ - (Prolog_term_ref t_ph) { + (Prolog_term_ref t_pset) { static const char* where = "ppl_@CLASS@_termination_test_@TERMINATION_ID@/1"; try { - @CPP_CLASS@* ph = term_to_handle<@CPP_CLASS@ >(t_ph, where); + @CPP_CLASS@* pset = term_to_handle<@CPP_CLASS@ >(t_pset, where); PPL_CHECK(ph); - if (Parma_Polyhedra_Library::termination_test_@TERMINATION_ID@(*ph)) + if (Parma_Polyhedra_Library::termination_test_@TERMINATION_ID@(*pset)) return PROLOG_SUCCESS; } CATCH_ALL; @@ -1247,14 +1247,14 @@ m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_code', m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@ - (Prolog_term_ref t_x, + (Prolog_term_ref t_pset, Prolog_term_ref t_g) { static const char* where = "ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@/2"; try { - @CPP_CLASS@* x = term_to_handle<@CPP_CLASS@ >(t_x, where); + @CPP_CLASS@* pset = term_to_handle<@CPP_CLASS@ >(t_pset, where); Generator gg(point()); - PPL_CHECK(x); - if (Parma_Polyhedra_Library::one_affine_ranking_function_@TERMINATION_ID@(*x, gg) + PPL_CHECK(pset); + if (Parma_Polyhedra_Library::one_affine_ranking_function_@TERMINATION_ID@(*pset, gg) && Prolog_unify(t_g, generator_term(gg))) return PROLOG_SUCCESS; } @@ -1266,16 +1266,24 @@ m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@ - (Prolog_term_ref t_x, + (Prolog_term_ref t_pset, Prolog_term_ref t_ph) { static const char* where = "ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@/2"; try { - @CPP_CLASS@* x = term_to_handle<@CPP_CLASS@ >(t_x, where); - C_Polyhedron* ph = term_to_handle<C_Polyhedron >(t_ph, where); - PPL_CHECK(x); - Parma_Polyhedra_Library::all_affine_ranking_functions_@TERMINATION_ID@(*x, - *ph); + @CPP_CLASS@* pset = term_to_handle<@CPP_CLASS@ >(t_pset, where); + C_Polyhedron ph(); + PPL_CHECK(pset); + Parma_Polyhedra_Library + ::all_affine_ranking_functions_@TERMINATION_ID@(*pset, *ph); + Prolog_term_ref tmp = Prolog_new_term_ref(); + Prolog_put_address(tmp, ph); + if (Prolog_unify(t_ph, tmp)) { + PPL_REGISTER(ph); + return PROLOG_SUCCESS; + } + else + delete ph; return PROLOG_SUCCESS; } CATCH_ALL; diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 index 1c38748..16f3d03 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 @@ -513,20 +513,20 @@ m4_define(`ppl_@CLASS@_@MEMBYTES@_code', m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type - ppl_@CLASS@_termination_test_@TERMINATION_ID@(Prolog_term_ref t_x); + ppl_@CLASS@_termination_test_@TERMINATION_ID@(Prolog_term_ref t_pset); ') m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type - ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@(Prolog_term_ref t_x, + ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@(Prolog_term_ref t_pset, Prolog_term_ref t_g); ') m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type - ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@(Prolog_term_ref t_x, - Prolog_term_ref t_g); + ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@(Prolog_term_ref t_pset, + Prolog_term_ref t_ph); ')

1 0

[GIT] ppl/ppl(termination): Support newer versions of SWI-Prolog.
by Roberto Bagnara 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: termination Commit: b81ffc77370c6734881e1b600a5d7c9688c9ca3e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b81ffc77370c… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 8 18:39:23 2010 +0400 Support newer versions of SWI-Prolog. --- interfaces/Prolog/SWI/Makefile.am | 12 ++++++------ m4/ac_check_swi_prolog.m4 | 23 +++++++++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 9c48447..98dffed 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -206,9 +206,9 @@ pl_clpq2_SOURCES = pl_clpq.cc if HOST_OS_CYGWIN -# Under Cygwin, plld gets the link options wrong: -lpl (PLLIB) -# comes before -lppl_swiprolog, with the result that all the -# symbols of the SWI-Prolog foreign interface are undefined. +# Under Cygwin, $(SWI_PROLOG_LD) gets the link options wrong: +# -lpl (PLLIB) comes before -lppl_swiprolog, with the result that all +# the symbols of the SWI-Prolog foreign interface are undefined. # Repeating the link options works around this problem. EXTRA_LINK_OPTIONS = $(SWI_PROLOG_LD_OPTIONS) @@ -229,14 +229,14 @@ LIBPPL_SWIPROLOG_LINK_OPTIONS = -L.libs -lppl_swiprolog endif !ENABLE_STATIC ppl_pl$(EXEEXT): libppl_swiprolog.la ppl_pl.o - plld -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ + $(SWI_PROLOG_LD) -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ -ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " "/"` \ -o $@ $(LIBPPL_SWIPROLOG_LINK_OPTIONS) ppl_pl.o \ -L$(top_builddir)/src/.libs \ -lppl $(WATCHDOG_LINK_OPTIONS) @extra_libraries@ $(EXTRA_LINK_OPTIONS) pl_clpq$(EXEEXT): libppl_swiprolog.la pl_clpq.o pl_clpq.pl ../tests/clpq.pl - plld -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ + $(SWI_PROLOG_LD) -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ -ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " "/"` \ -o $@ $(LIBPPL_SWIPROLOG_LINK_OPTIONS) pl_clpq.o \ $(srcdir)/pl_clpq.pl $(srcdir)/../tests/clpq.pl \ @@ -245,7 +245,7 @@ pl_clpq$(EXEEXT): libppl_swiprolog.la pl_clpq.o pl_clpq.pl ../tests/clpq.pl pl_clpq2$(EXEEXT): libppl_swiprolog.la pl_clpq.o pl_clpq.pl ../tests/clpq2.pl - plld -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ + $(SWI_PROLOG_LD) -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ -ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " "/"` \ -o $@ $(LIBPPL_SWIPROLOG_LINK_OPTIONS) pl_clpq.o \ $(srcdir)/pl_clpq.pl $(srcdir)/../tests/clpq2.pl \ diff --git a/m4/ac_check_swi_prolog.m4 b/m4/ac_check_swi_prolog.m4 index b4680e3..daed0a7 100644 --- a/m4/ac_check_swi_prolog.m4 +++ b/m4/ac_check_swi_prolog.m4 @@ -22,14 +22,17 @@ dnl site: http://www.cs.unipr.it/ppl/ . AC_DEFUN([AC_CHECK_SWI_PROLOG], [ -dnl By default, SWI-Prolog is installed as `pl', though some administrators -dnl call it `swipl' or `swi-prolog'. In particular, on Mac OS X `pl' is -dnl the name of another program. On Windows, the console version of -dnl SWI-Prolog is called `plcon'. -AC_PATH_PROG(swi_prolog, swi-prolog) +dnl By default, old versions of SWI-Prolog were installed as `pl', +dnl though some administrators called it `swipl' or `swi-prolog'. +dnl In particular, on Mac OS X `pl' is the name of another program. +dnl On Windows, the console version of SWI-Prolog was called `plcon'. +dnl Since SWI-Prolog 5.9.9, by default and on all systems, the +dnl interpreter is called `swipl' and `plld' is called `swipl-ld' + +AC_PATH_PROG(swi_prolog, swipl) if test -z $swi_prolog then - AC_PATH_PROG(swi_prolog, swipl) + AC_PATH_PROG(swi_prolog, swi-prolog) if test -z $swi_prolog then AC_PATH_PROG(swi_prolog, pl) @@ -49,6 +52,12 @@ then dnl Additional version checks could be inserted here, if necessary. + AC_PATH_PROG(swi_prolog_ld, swipl-ld) + if test -z $swi_prolog_ld + then + AC_PATH_PROG(swi_prolog_ld, plld) + fi + # 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" @@ -79,7 +88,9 @@ main() { AC_LANG_POP(C++) CPPFLAGS="$ac_save_CPPFLAGS" SWI_PROLOG="$swi_prolog" + SWI_PROLOG_LD="$swi_prolog_ld" AC_SUBST(SWI_PROLOG) + AC_SUBST(SWI_PROLOG_LD) AC_SUBST(SWI_PROLOG_INCLUDE_OPTIONS) AC_SUBST(SWI_PROLOG_LD_OPTIONS) fi

1 0

[GIT] ppl/ppl(master): Support newer versions of SWI-Prolog.
by Roberto Bagnara 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: master Commit: 0a6c325c3b9615411ba40c44743268f33303589a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0a6c325c3b96… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 8 18:39:23 2010 +0400 Support newer versions of SWI-Prolog. --- interfaces/Prolog/SWI/Makefile.am | 12 ++++++------ m4/ac_check_swi_prolog.m4 | 23 +++++++++++++++++------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/interfaces/Prolog/SWI/Makefile.am b/interfaces/Prolog/SWI/Makefile.am index 9c48447..98dffed 100644 --- a/interfaces/Prolog/SWI/Makefile.am +++ b/interfaces/Prolog/SWI/Makefile.am @@ -206,9 +206,9 @@ pl_clpq2_SOURCES = pl_clpq.cc if HOST_OS_CYGWIN -# Under Cygwin, plld gets the link options wrong: -lpl (PLLIB) -# comes before -lppl_swiprolog, with the result that all the -# symbols of the SWI-Prolog foreign interface are undefined. +# Under Cygwin, $(SWI_PROLOG_LD) gets the link options wrong: +# -lpl (PLLIB) comes before -lppl_swiprolog, with the result that all +# the symbols of the SWI-Prolog foreign interface are undefined. # Repeating the link options works around this problem. EXTRA_LINK_OPTIONS = $(SWI_PROLOG_LD_OPTIONS) @@ -229,14 +229,14 @@ LIBPPL_SWIPROLOG_LINK_OPTIONS = -L.libs -lppl_swiprolog endif !ENABLE_STATIC ppl_pl$(EXEEXT): libppl_swiprolog.la ppl_pl.o - plld -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ + $(SWI_PROLOG_LD) -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ -ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " "/"` \ -o $@ $(LIBPPL_SWIPROLOG_LINK_OPTIONS) ppl_pl.o \ -L$(top_builddir)/src/.libs \ -lppl $(WATCHDOG_LINK_OPTIONS) @extra_libraries@ $(EXTRA_LINK_OPTIONS) pl_clpq$(EXEEXT): libppl_swiprolog.la pl_clpq.o pl_clpq.pl ../tests/clpq.pl - plld -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ + $(SWI_PROLOG_LD) -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ -ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " "/"` \ -o $@ $(LIBPPL_SWIPROLOG_LINK_OPTIONS) pl_clpq.o \ $(srcdir)/pl_clpq.pl $(srcdir)/../tests/clpq.pl \ @@ -245,7 +245,7 @@ pl_clpq$(EXEEXT): libppl_swiprolog.la pl_clpq.o pl_clpq.pl ../tests/clpq.pl pl_clpq2$(EXEEXT): libppl_swiprolog.la pl_clpq.o pl_clpq.pl ../tests/clpq2.pl - plld -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ + $(SWI_PROLOG_LD) -pl $(SWI_PROLOG) -cc $(CC) -c++ $(CXX) -ld $(CXX) \ -ld-options`echo '' $(AM_CXXFLAGS) $(CXXFLAGS) | tr " " "/"` \ -o $@ $(LIBPPL_SWIPROLOG_LINK_OPTIONS) pl_clpq.o \ $(srcdir)/pl_clpq.pl $(srcdir)/../tests/clpq2.pl \ diff --git a/m4/ac_check_swi_prolog.m4 b/m4/ac_check_swi_prolog.m4 index b4680e3..daed0a7 100644 --- a/m4/ac_check_swi_prolog.m4 +++ b/m4/ac_check_swi_prolog.m4 @@ -22,14 +22,17 @@ dnl site: http://www.cs.unipr.it/ppl/ . AC_DEFUN([AC_CHECK_SWI_PROLOG], [ -dnl By default, SWI-Prolog is installed as `pl', though some administrators -dnl call it `swipl' or `swi-prolog'. In particular, on Mac OS X `pl' is -dnl the name of another program. On Windows, the console version of -dnl SWI-Prolog is called `plcon'. -AC_PATH_PROG(swi_prolog, swi-prolog) +dnl By default, old versions of SWI-Prolog were installed as `pl', +dnl though some administrators called it `swipl' or `swi-prolog'. +dnl In particular, on Mac OS X `pl' is the name of another program. +dnl On Windows, the console version of SWI-Prolog was called `plcon'. +dnl Since SWI-Prolog 5.9.9, by default and on all systems, the +dnl interpreter is called `swipl' and `plld' is called `swipl-ld' + +AC_PATH_PROG(swi_prolog, swipl) if test -z $swi_prolog then - AC_PATH_PROG(swi_prolog, swipl) + AC_PATH_PROG(swi_prolog, swi-prolog) if test -z $swi_prolog then AC_PATH_PROG(swi_prolog, pl) @@ -49,6 +52,12 @@ then dnl Additional version checks could be inserted here, if necessary. + AC_PATH_PROG(swi_prolog_ld, swipl-ld) + if test -z $swi_prolog_ld + then + AC_PATH_PROG(swi_prolog_ld, plld) + fi + # 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" @@ -79,7 +88,9 @@ main() { AC_LANG_POP(C++) CPPFLAGS="$ac_save_CPPFLAGS" SWI_PROLOG="$swi_prolog" + SWI_PROLOG_LD="$swi_prolog_ld" AC_SUBST(SWI_PROLOG) + AC_SUBST(SWI_PROLOG_LD) AC_SUBST(SWI_PROLOG_INCLUDE_OPTIONS) AC_SUBST(SWI_PROLOG_LD_OPTIONS) fi

1 0

[GIT] ppl/ppl(termination): Fixed some copy-and-paste mistakes.
by Roberto Bagnara 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: termination Commit: c066af6c05058ad105d35948e43b758ef4fd1cfd URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c066af6c0505… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Mar 8 16:57:31 2010 +0400 Fixed some copy-and-paste mistakes. --- src/termination.cc | 2 +- src/termination.templates.hh | 40 ++++++++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/termination.cc b/src/termination.cc index a643997..3479d24 100644 --- a/src/termination.cc +++ b/src/termination.cc @@ -179,7 +179,7 @@ fill_constraint_systems_MS(const Constraint_System& cs, - \f$ \mu_1, \ldots, \mu_n \f$ go onto space dimensions \f$ 0, \ldots, n-1 \f$; - \f$ \mu_0\f$ goes onto space dimension \f$ n \f$; - - \f$ y_1, \ldots, y_m \f$ go onto space dimensions + - \f$ y_1, \ldots, y_m \f$ go onto space dimensions \f$ n+1, \ldots, n+m \f$; - \f$ z_1, ..., z_m, z_{m+1}, z_{m+2} \f$ go onto space dimensions \f$ n+m+1, ..., n+2*m+2 \f$. diff --git a/src/termination.templates.hh b/src/termination.templates.hh index d7b775e..93a4097 100644 --- a/src/termination.templates.hh +++ b/src/termination.templates.hh @@ -232,6 +232,7 @@ termination_test_MS(const PSET& pset) { #endif MIP_Problem mip = MIP_Problem(cs_mip.space_dimension(), cs_mip); + return mip.is_satisfiable(); } @@ -260,6 +261,7 @@ one_affine_ranking_function_MS(const PSET& pset, Generator& mu) { #endif MIP_Problem mip = MIP_Problem(cs_mip.space_dimension(), cs_mip); + if (mip.is_satisfiable()) { mu = mip.feasible_point(); return true; @@ -337,26 +339,33 @@ termination_test_PR(const PSET& pset) { Constraint_System cs_mip; fill_constraint_systems_PR(cs, n, m, cs_mip); -#if PRINT_DEBUG_INFO - Variable::output_function_type* p_default_output_function - = Variable::get_output_function(); - Variable::set_output_function(output_function_MS); - - std::cout << "*** cs_mip ***" << std::endl; - output_function_MS_which = 3; - using namespace IO_Operators; - std::cout << cs_mip << std::endl; - Variable::set_output_function(p_default_output_function); -#endif - MIP_Problem mip = MIP_Problem(cs_mip.space_dimension(), cs_mip); + return mip.is_satisfiable(); } template <typename PSET> bool one_affine_ranking_function_PR(const PSET& pset, Generator& mu) { - return false; + using namespace Implementation::Termination; + Constraint_System cs; + dimension_type n; + dimension_type m; + prepare_input_MS_PR(pset, cs, n, m, "one_affine_ranking_function_PR"); + + Constraint_System cs_mip; + fill_constraint_systems_PR(cs, n, m, cs_mip); + + MIP_Problem mip = MIP_Problem(cs_mip.space_dimension(), cs_mip); + + if (mip.is_satisfiable()) { + Generator u3 = mip.feasible_point(); + // FIXME: must multiply u3 by E'_C and assign the result to mu. + //return true; + return false; + } + else + return false; } template <typename PSET> @@ -366,7 +375,10 @@ all_affine_ranking_functions_PR(const PSET& pset, C_Polyhedron& mu_space) { Constraint_System cs; dimension_type n; dimension_type m; - prepare_input_MS_PR(pset, cs, n, m, "all_affine_ranking_functions_MS"); + prepare_input_MS_PR(pset, cs, n, m, "all_affine_ranking_functions_PR"); + + Constraint_System cs_out; + fill_constraint_systems_PR(cs, n, m, cs_out); mu_space = C_Polyhedron(n+1, EMPTY); }

1 0

[GIT] ppl/ppl(termination): Added the rest of the termination functions to the C interface.
by Patricia Hill 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: termination Commit: 3f1381c41b71fbff2c60e924402fc4cca8eeaacb URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3f1381c41b71… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 8 13:34:53 2010 +0000 Added the rest of the termination functions to the C interface. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 35 ++++++++++++++++++-- interfaces/C/ppl_interface_generator_c_h_code.m4 | 25 +++++++++++++- ...l_interface_generator_c_procedure_generators.m4 | 4 ++- 3 files changed, 58 insertions(+), 6 deletions(-) diff --git a/interfaces/C/ppl_interface_generator_c_cc_code.m4 b/interfaces/C/ppl_interface_generator_c_cc_code.m4 index 22ddd23..c6fbd79 100644 --- a/interfaces/C/ppl_interface_generator_c_cc_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_cc_code.m4 @@ -1156,13 +1156,42 @@ CATCH_ALL ') -m4_define(`ppl_@CLASS@_termination_test_MS_code', +m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_code', `dnl int -ppl_@CLASS@_termination_test_MS +ppl_@CLASS@_termination_test_@TERMINATION_ID@ (ppl_const_@CLASS@_t x) try { const @CPP_CLASS@& xx = *to_const(x); - return termination_test_MS(xx); + return termination_test_@TERMINATION_ID@(xx); +} +CATCH_ALL + +') + +m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', +`int +ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@ +(ppl_const_@CLASS@_t x, + ppl_Generator_t point) try { + const @CPP_CLASS@& xx = *to_const(x); + Generator& ppoint = *to_nonconst(point); + bool ok = one_affine_ranking_function_@TERMINATION_ID@(xx, ppoint); + return ok ? 1 : 0; +} +CATCH_ALL + +') + +m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', +`int +ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@ +(ppl_const_@CLASS@_t x, + ppl_Polyhedron_t ph) try { + const @CPP_CLASS@& xx = *to_const(x); + all_affine_ranking_functions_@TERMINATION_ID@(xx, + *static_cast<C_Polyhedron*> + (to_nonconst(ph))); + return 0; } CATCH_ALL diff --git a/interfaces/C/ppl_interface_generator_c_h_code.m4 b/interfaces/C/ppl_interface_generator_c_h_code.m4 index 39f717e..2a1ecdd 100644 --- a/interfaces/C/ppl_interface_generator_c_h_code.m4 +++ b/interfaces/C/ppl_interface_generator_c_h_code.m4 @@ -34,15 +34,36 @@ dnl There is no code at present for these procedures in the C interface. dnl Remove the macro if its definition is added. dnl -m4_define(`ppl_@CLASS@_termination_test_MS_code', +m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_code', `dnl /*! \relates ppl_@CLASS@_tag */ int -ppl_@CLASS@_termination_test_MS +ppl_@CLASS@_termination_test_@TERMINATION_ID@ PPL_PROTO((ppl_const_@CLASS@_t x)); ') +m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', +`dnl +/*! \relates ppl_@CLASS@_tag */ +int +ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@ +PPL_PROTO((ppl_const_@CLASS@_t x, + ppl_Generator_t point)); + +') + +m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', +`dnl +/*! \relates ppl_@CLASS@_tag */ +int +ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@ +PPL_PROTO((ppl_const_@CLASS@_t x, + ppl_Polyhedron_t ph)); + +') + + m4_define(`ppl_@CLASS@_linear_@PARTITION@_code', `dnl /*! \relates ppl_@CLASS@_tag */ diff --git a/interfaces/C/ppl_interface_generator_c_procedure_generators.m4 b/interfaces/C/ppl_interface_generator_c_procedure_generators.m4 index 7f590d7..fba9565 100644 --- a/interfaces/C/ppl_interface_generator_c_procedure_generators.m4 +++ b/interfaces/C/ppl_interface_generator_c_procedure_generators.m4 @@ -44,6 +44,8 @@ ppl_new_@TOPOLOGY@@CLASS@_recycle_@BUILD_REPRESENT@s +simple, ppl_assign_@TOPOLOGY@@CLASS@_from_@TOPOLOGY@@CLASS@ +simple, ppl_@CLASS@_add_recycled_@CLASS_REPRESENT@s +simple, ppl_@CLASS@_wrap_assign +simple, -ppl_@CLASS@_termination_test_MS +simple, +ppl_@CLASS@_termination_test_@TERMINATION_ID@ +simple, +ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@ +simple, +ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@ +simple, ) ')

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Problem, PIP_Tree: port from Matrix to Dense_Matrix and Sparse_Matrix. Optimizations to exploit the sparse representation have not been added yet .
by Marco Poletti 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: f5a4c9ef52fb38147a1340ec7429db9280f18de9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f5a4c9ef52fb… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Mar 8 14:15:47 2010 +0100 PIP_Problem, PIP_Tree: port from Matrix to Dense_Matrix and Sparse_Matrix. Optimizations to exploit the sparse representation have not been added yet. --- src/PIP_Problem.cc | 4 +- src/PIP_Problem.defs.hh | 36 ++++++++- src/PIP_Tree.cc | 198 ++++++++++++++++++++++++----------------------- src/PIP_Tree.defs.hh | 57 +++++++++++--- 4 files changed, 184 insertions(+), 111 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=f5a4c9ef…

1 0

[GIT] ppl/ppl(termination): Fixed some bugs in the Prolog interface termination code.
by Patricia Hill 08 Mar '10

08 Mar '10

Module: ppl/ppl Branch: termination Commit: f8bcb32b2739e509d24cdd6daf74e085a388165b URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f8bcb32b2739… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Mon Mar 8 12:46:14 2010 +0000 Fixed some bugs in the Prolog interface termination code. --- .../ppl_interface_generator_prolog_hh_code.m4 | 12 ++++++------ ...erface_generator_prolog_procedure_generators.m4 | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 index bc50e6b..1c38748 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_hh_code.m4 @@ -511,22 +511,22 @@ m4_define(`ppl_@CLASS@_@MEMBYTES@_code', ') -m4_define(`ppl_@CLASS@_termination_test_MS_code', +m4_define(`ppl_@CLASS@_termination_test_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type - ppl_@CLASS@_termination_test_MS(Prolog_term_ref t_x); + ppl_@CLASS@_termination_test_@TERMINATION_ID@(Prolog_term_ref t_x); ') -m4_define(`ppl_@CLASS@_one_affine_ranking_function_MS_code', +m4_define(`ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type - ppl_@CLASS@_one_affine_ranking_function_MS(Prolog_term_ref t_x, + ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@(Prolog_term_ref t_x, Prolog_term_ref t_g); ') -m4_define(`ppl_@CLASS@_all_affine_ranking_functions_MS_code', +m4_define(`ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@_code', `extern "C" Prolog_foreign_return_type - ppl_@CLASS@_all_affine_ranking_functions_MS(Prolog_term_ref t_x, + ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@(Prolog_term_ref t_x, Prolog_term_ref t_g); ') diff --git a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 index 08798d0..5ee84aa 100644 --- a/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 +++ b/interfaces/Prolog/ppl_interface_generator_prolog_procedure_generators.m4 @@ -87,8 +87,8 @@ ppl_MIP_Problem_ascii_dump/1`'dnl m4_define(`m4_procedure_list', `m4_echo_unquoted(`m4_common_procedure_list', -ppl_@CLASS@_termination_test_MS/1 +simple, -ppl_@CLASS@_one_affine_ranking_function_MS/2 +simple, -ppl_@CLASS@_all_affine_ranking_functions_MS/2 +simple, +ppl_@CLASS@_termination_test_@TERMINATION_ID@/1 +simple, +ppl_@CLASS@_one_affine_ranking_function_@TERMINATION_ID@/2 +simple, +ppl_@CLASS@_all_affine_ranking_functions_@TERMINATION_ID@/2 +simple, ) ')

1 0