- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(master): Added a draft implementation for Grid:: drop_some_non_integer_points().
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: 94e1497598ab744385a8447a0df714dc9156ade5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=94e1497598ab… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 14:27:29 2010 +0000 Added a draft implementation for Grid::drop_some_non_integer_points(). --- src/Grid_public.cc | 55 ++++++ tests/Grid/Makefile.am | 1 + tests/Grid/dropnonintegerpoints1.cc | 322 +++++++++++++++++++++++++++++++++++ 3 files changed, 378 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=94e14975…

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: use std::vector instead of std ::set in find_lexico_minimum_column().
by Marco Poletti 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 54ade0980f342b457c2fb9daa9a9a2764d8d95db URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=54ade0980f34… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 24 14:45:17 2010 +0100 PIP_Tree.cc: use std::vector instead of std::set in find_lexico_minimum_column(). --- src/PIP_Tree.cc | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index ed775ea..c838a45 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -346,7 +346,7 @@ column_lower(const PIP_Tree_Node::matrix_type& tableau, index(es). */ void -find_lexico_minimum_column_in_set(std::set<dimension_type>& candidates, +find_lexico_minimum_column_in_set(std::vector<dimension_type>& candidates, const PIP_Tree_Node::matrix_type& tableau, const std::vector<dimension_type>& mapping, const std::vector<bool>& basis, @@ -355,12 +355,14 @@ find_lexico_minimum_column_in_set(std::set<dimension_type>& candidates, const dimension_type num_vars = mapping.size(); PPL_ASSERT(!candidates.empty()); + // This is used as a set, it is always sorted. + std::vector<dimension_type> new_candidates; for (dimension_type var_index = 0; var_index < num_vars; ++var_index) { - std::set<dimension_type> new_candidates; - std::set<dimension_type>::const_iterator i = candidates.begin(); - std::set<dimension_type>::const_iterator i_end = candidates.end(); + new_candidates.clear(); + std::vector<dimension_type>::const_iterator i = candidates.begin(); + std::vector<dimension_type>::const_iterator i_end = candidates.end(); PPL_ASSERT(!candidates.empty()); - new_candidates.insert(*i); + new_candidates.push_back(*i); dimension_type min_column = *i; ++i; if (i == i_end) @@ -391,10 +393,10 @@ find_lexico_minimum_column_in_set(std::set<dimension_type>& candidates, new_candidates.clear(); min_column = *i; sij_b = &sij_a; - new_candidates.insert(min_column); + new_candidates.push_back(min_column); } else // Optimizing for: lhs == 0 && rhs == 0; - new_candidates.insert(*i); + new_candidates.push_back(*i); } } } else { @@ -440,7 +442,7 @@ find_lexico_minimum_column_in_set(std::set<dimension_type>& candidates, min_column = *i; row_jb = row_ja; sij_b = &sij_a; - new_candidates.insert(min_column); + new_candidates.push_back(min_column); } } else { // lhs is actually the left-hand side with toggled sign. @@ -448,14 +450,14 @@ find_lexico_minimum_column_in_set(std::set<dimension_type>& candidates, lhs = *sij_b * *row_ja; rhs = sij_a * *row_jb; if (lhs == rhs) - new_candidates.insert(*i); + new_candidates.push_back(*i); else if (lhs < rhs) { new_candidates.clear(); min_column = *i; row_jb = row_ja; sij_b = &sij_a; - new_candidates.insert(min_column); + new_candidates.push_back(min_column); } } } @@ -477,11 +479,12 @@ find_lexico_minimum_column(const PIP_Tree_Node::matrix_type& tableau, const dimension_type start_j, dimension_type& j_out) { const dimension_type num_cols = tableau.num_columns(); - std::set<dimension_type> candidates; + // This is used as a set, it is always sorted. + std::vector<dimension_type> candidates; for (dimension_type j = start_j; j < num_cols; ++j) { const Coefficient& c = pivot_row[j]; if (c > 0) - candidates.insert(j); + candidates.push_back(j); } if (candidates.empty()) { j_out = num_cols;

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Tree.cc: use std::vector instead of std ::set in compatibility_check_find_pivot().
by Marco Poletti 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 39b6702613942db58c897b824d36c7feb2f340a5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=39b670261394… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 24 14:39:36 2010 +0100 PIP_Tree.cc: use std::vector instead of std::set in compatibility_check_find_pivot(). --- src/PIP_Tree.cc | 29 ++++++++++++++++------------- 1 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 012a46a..ed775ea 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -540,7 +540,7 @@ struct compatibility_check_find_pivot_map_data { }; void -compatibility_check_find_pivot_in_set(std::set<std::pair<dimension_type, +compatibility_check_find_pivot_in_set(std::vector<std::pair<dimension_type, compatibility_check_find_pivot_map_data > >& candidates, const PIP_Tree_Node::matrix_type& s, @@ -548,12 +548,13 @@ compatibility_check_find_pivot_in_set(std::set<std::pair<dimension_type, mapping, const std::vector<bool>& basis) { typedef compatibility_check_find_pivot_map_data map_data; - typedef std::set<std::pair<dimension_type, map_data> > candidates_t; + typedef std::vector<std::pair<dimension_type, map_data> > candidates_t; + // This is used as a set, it is always sorted. + candidates_t new_candidates; const dimension_type num_vars = mapping.size(); for (dimension_type var_index = 0; var_index < num_vars; ++var_index) { const dimension_type row_index = mapping[var_index]; const bool in_base = basis[var_index]; - candidates_t new_candidates; candidates_t::const_iterator i = candidates.begin(); candidates_t::const_iterator i_end = candidates.end(); PPL_ASSERT(i != i_end); @@ -561,7 +562,8 @@ compatibility_check_find_pivot_in_set(std::set<std::pair<dimension_type, dimension_type pj = i->first; const Coefficient* cost = i->second.cost; const Coefficient* value = i->second.value; - new_candidates.insert(*i); + new_candidates.clear(); + new_candidates.push_back(*i); if (in_base) { for (++i; i != i_end; ++i) { bool found_better_pivot = false; @@ -583,19 +585,19 @@ compatibility_check_find_pivot_in_set(std::set<std::pair<dimension_type, if (row_index == pj) { // Optimizing for: lhs == lhs_coeff && rhs == 0; if (lhs_coeff_sgn == 0) - new_candidates.insert(*i); + new_candidates.push_back(*i); else found_better_pivot = lhs_coeff_sgn > 0; } else { if (row_index == challenger_j) { // Optimizing for: lhs == 0 && rhs == rhs_coeff; if (rhs_coeff_sgn == 0) - new_candidates.insert(*i); + new_candidates.push_back(*i); else found_better_pivot = 0 > rhs_coeff_sgn; } else // Optimizing for: lhs == 0 && rhs == 0; - new_candidates.insert(*i); + new_candidates.push_back(*i); } if (found_better_pivot) { pi = challenger_i; @@ -603,7 +605,7 @@ compatibility_check_find_pivot_in_set(std::set<std::pair<dimension_type, cost = challenger_cost; value = challenger_value; new_candidates.clear(); - new_candidates.insert(*i); + new_candidates.push_back(*i); } } } else { @@ -660,7 +662,7 @@ compatibility_check_find_pivot_in_set(std::set<std::pair<dimension_type, value = challenger_value; row_value = row_challenger_value; new_candidates.clear(); - new_candidates.insert(*i); + new_candidates.push_back(*i); } } else { @@ -675,7 +677,7 @@ compatibility_check_find_pivot_in_set(std::set<std::pair<dimension_type, rhs *= *row_challenger_value; if (lhs == rhs) - new_candidates.insert(*i); + new_candidates.push_back(*i); else { if (lhs > rhs) { pi = challenger_i; @@ -684,7 +686,7 @@ compatibility_check_find_pivot_in_set(std::set<std::pair<dimension_type, value = challenger_value; row_value = row_challenger_value; new_candidates.clear(); - new_candidates.insert(*i); + new_candidates.push_back(*i); } } } @@ -705,7 +707,8 @@ compatibility_check_find_pivot(const PIP_Tree_Node::matrix_type& s, // maximizing pivot column. const dimension_type num_rows = s.num_rows(); typedef compatibility_check_find_pivot_map_data map_data; - typedef std::set<std::pair<dimension_type, map_data> > candidates_t; + // This is used as a set, it is always sorted. + typedef std::vector<std::pair<dimension_type, map_data> > candidates_t; typedef std::map<dimension_type,map_data> candidates_map_t; candidates_map_t candidates_map; for (dimension_type i = 0; i < num_rows; ++i) { @@ -774,7 +777,7 @@ compatibility_check_find_pivot(const PIP_Tree_Node::matrix_type& s, candidates_map_t::iterator i = candidates_map.begin(); candidates_map_t::iterator i_end = candidates_map.end(); for ( ; i != i_end; ++i) - candidates.insert(*i); + candidates.push_back(*i); if (!candidates.empty()) { compatibility_check_find_pivot_in_set(candidates, s, mapping, basis); PPL_ASSERT(!candidates.empty());

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Solution_Node::Tableau: remove useless calls to get() in is_better_pivot().
by Marco Poletti 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: 1e08d6d4fe52090c88785d04d46f6e12e627289e URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1e08d6d4fe52… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 24 14:30:35 2010 +0100 PIP_Solution_Node::Tableau: remove useless calls to get() in is_better_pivot(). --- src/PIP_Tree.cc | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 3370301..012a46a 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1529,15 +1529,17 @@ PIP_Solution_Node::Tableau for ( ; j != j_end; ++j) coeff_1[(*j).first] = (*j).second * s_0_0; } + matrix_row_const_iterator j0 = t_0.end(); + matrix_row_const_iterator j0_end = t_0.end(); + matrix_row_const_iterator j1 = t_1.end(); + matrix_row_const_iterator j1_end = t_1.end(); for (dimension_type i = 0; i < num_rows; ++i) { matrix_row_const_reference_type s_i = s[i]; const Coefficient* s_i_col_0; const Coefficient* s_i_col_1; s_i.get2(col_0, col_1, s_i_col_0, s_i_col_1); - matrix_row_const_iterator j0 = t_0.begin(); - matrix_row_const_iterator j0_end = t_0.end(); - matrix_row_const_iterator j1 = t_1.begin(); - matrix_row_const_iterator j1_end = t_1.end(); + j0 = t_0.begin(); + j1 = t_1.begin(); while (j0 != j0_end && j1 != j1_end) { if ((*j0).first == (*j1).first) { product_0 = (*j0).second * s_1_1 * *s_i_col_0; @@ -1587,7 +1589,7 @@ PIP_Solution_Node::Tableau end_loop: return (j_mismatch != num_params) && column_lower(s, mapping, basis, s_0, col_0, s_1, col_1, - t_0.get(j_mismatch), t_1.get(j_mismatch)); + (*j0).second, (*j1).second); } void

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Solution_Node: optimize generate_cut() method for sparse matrices.
by Marco Poletti 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: df30069d54bac2910ae48614bb4c664a7034924f URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=df30069d54ba… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 24 14:20:07 2010 +0100 PIP_Solution_Node: optimize generate_cut() method for sparse matrices. --- src/PIP_Tree.cc | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 7fea489..3370301 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -3321,8 +3321,15 @@ PIP_Solution_Node::generate_cut(const dimension_type index, matrix_row_const_reference_type row_s = tableau.s[index]; matrix_row_const_reference_type row_t = tableau.t[index]; { - for (dimension_type j = 0; j < num_vars; ++j) { - mod_assign(cut_s[j], row_s[j], den); + matrix_row_const_iterator j = row_s.begin(); + matrix_row_const_iterator j_end = row_s.end(); + if (j != j_end) { + matrix_row_iterator itr = cut_s.find_create((*j).first); + mod_assign((*itr).second, (*j).second, den); + for (++j; j != j_end; ++j) { + itr = cut_s.find_create((*j).first, itr); + mod_assign((*itr).second, (*j).second, den); + } } } {

1 0

[GIT] ppl/ppl(sparse_matrices): PIP_Solution_Node: modify generate_cut() to be efficient even with backends that have slow insertions.
by Marco Poletti 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: sparse_matrices Commit: f5cfe2cc744d52668839b3e0d67dc37fc90448fc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f5cfe2cc744d… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Mar 24 14:12:34 2010 +0100 PIP_Solution_Node: modify generate_cut() to be efficient even with backends that have slow insertions. --- src/PIP_Tree.cc | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index b35d093..7fea489 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -3238,6 +3238,28 @@ PIP_Solution_Node::generate_cut(const dimension_type index, matrix_const_row_const_iterator j_end = row_t.end(); matrix_row_iterator itr1 = ctx1.end(); matrix_row_iterator itr2 = ctx2.end(); + if (j != j_end && (*j).first == 0) { + mod_assign(mod, (*j).second, den); + if (mod != 0) { + itr1 = ctx1.find_create(0, den); + (*itr1).second -= mod; + itr2 = ctx2.find_create(0, (*itr1).second); + neg_assign((*itr2).second); + // ctx2[0] += den-1; + (*itr2).second += den; + --(*itr2).second; + } else { + // ctx2[0] += den-1; + itr2 = ctx2.find_create(0,den); + --(*itr2).second; + } + ++j; + } else { + // ctx2[0] += den-1; + Coefficient& ctx2_0 = ctx2[0]; + ctx2_0 += den; + --ctx2_0; + } for ( ; j != j_end; ++j) { mod_assign(mod, (*j).second, den); if (mod != 0) { @@ -3272,10 +3294,6 @@ PIP_Solution_Node::generate_cut(const dimension_type index, ctx2.find_create(num_params ,den); } } - // ctx2[0] += den-1; - Coefficient& ctx2_0 = ctx2[0]; - ctx2_0 += den; - --ctx2_0; #ifdef NOISY_PIP { using namespace IO_Operators;

1 0

[GIT] ppl/ppl(master): Added the generated Termination files to make clean.
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: 70025f8ab031445a6f590ab92dbc7e43fc8b24af URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=70025f8ab031… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 12:23:10 2010 +0000 Added the generated Termination files to make clean. --- .../Java/parma_polyhedra_library/Makefile.am | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/interfaces/Java/parma_polyhedra_library/Makefile.am b/interfaces/Java/parma_polyhedra_library/Makefile.am index 73c0afa..2f59201 100644 --- a/interfaces/Java/parma_polyhedra_library/Makefile.am +++ b/interfaces/Java/parma_polyhedra_library/Makefile.am @@ -217,6 +217,7 @@ $(fixed_java_cxx_headers_sources) \ java_classes.stamp \ java_cxx_headers.stamp \ source_generation.stamp \ +Termination.java \ Bounded_Integer_Type_Overflow.class \ Bounded_Integer_Type_Representation.class \ Bounded_Integer_Type_Width.class \ @@ -259,6 +260,7 @@ Poly_Con_Relation.class \ Poly_Gen_Relation.class \ PPL_Object.class \ Relation_Symbol.class \ +Termination.class \ Timeout_Exception.class \ Variable.class \ Variables_Set.class

1 0

[GIT] ppl/ppl(master): In frequency(), deal properly with the case when a box is empty.
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: 0bbcc5ab4f06cb3ebc8b1043e2e25c89c67e09ad URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0bbcc5ab4f06… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 12:12:44 2010 +0000 In frequency(), deal properly with the case when a box is empty. Added tests for this case. Re-enable frequency test in the Prolog interface. --- ...face_generator_prolog_generated_test_pl_code.m4 | 2 +- src/Box.templates.hh | 2 +- tests/BD_Shape/frequency1.cc | 20 ++++++++++++++++++++ tests/Box/frequency1.cc | 20 ++++++++++++++++++++ tests/Octagonal_Shape/frequency1.cc | 20 ++++++++++++++++++++ 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 index 56eb533..4ed6891 100644 --- a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 +++ b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 @@ -905,7 +905,7 @@ ppl_@CLASS@_@MAXMIN@_with_point_6_test :- ). ') -m4_define(`ppl_@CLASS@_frequency_codeXXX', +m4_define(`ppl_@CLASS@_frequency_code', ` ppl_@CLASS@_frequency_6_test :- ( diff --git a/src/Box.templates.hh b/src/Box.templates.hh index 5b08ea1..674fd44 100644 --- a/src/Box.templates.hh +++ b/src/Box.templates.hh @@ -1383,7 +1383,7 @@ Box<ITV>::frequency(const Linear_Expression& expr, } // For an empty Box, we simply return false. - if (marked_empty()) + if (is_empty()) return false; // The Box has at least 1 dimension and is not empty. diff --git a/tests/BD_Shape/frequency1.cc b/tests/BD_Shape/frequency1.cc index 7c420b6..f74e6fb 100644 --- a/tests/BD_Shape/frequency1.cc +++ b/tests/BD_Shape/frequency1.cc @@ -243,6 +243,25 @@ test09() { return ok; } +// Non-relational test of an empty bd_shape in 1-dimension. +bool +test10() { + Variable A(0); + + TBD_Shape bds(1); + bds.add_constraint(A <= 0); + bds.add_constraint(A >= 1); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (!bds.frequency(Linear_Expression(A), num, den, valn, vald)); + print_constraints(bds, "*** bds ***"); + + return ok; +} + } // namespace BEGIN_MAIN @@ -255,4 +274,5 @@ BEGIN_MAIN DO_TEST(test07); DO_TEST(test08); DO_TEST(test09); + DO_TEST(test10); END_MAIN diff --git a/tests/Box/frequency1.cc b/tests/Box/frequency1.cc index b64be53..d6c53b1 100644 --- a/tests/Box/frequency1.cc +++ b/tests/Box/frequency1.cc @@ -196,6 +196,25 @@ test08() { return ok; } +// Non-relational test of an empty box in 1-dimension. +bool +test09() { + Variable A(0); + + TBox box(1); + box.add_constraint(A <= 0); + box.add_constraint(A >= 1); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (!box.frequency(Linear_Expression(A), num, den, valn, vald)); + print_constraints(box, "*** box ***"); + + return ok; +} + } // namespace BEGIN_MAIN @@ -207,4 +226,5 @@ BEGIN_MAIN DO_TEST(test06); DO_TEST(test07); DO_TEST(test08); + DO_TEST(test09); END_MAIN diff --git a/tests/Octagonal_Shape/frequency1.cc b/tests/Octagonal_Shape/frequency1.cc index ad840a6..571dd5b 100644 --- a/tests/Octagonal_Shape/frequency1.cc +++ b/tests/Octagonal_Shape/frequency1.cc @@ -321,6 +321,25 @@ test13() { return ok; } +// Test of an empty octagonal_shape in 1-dimension. +bool +test14() { + Variable A(0); + + TOctagonal_Shape os(1); + os.add_constraint(A <= 0); + os.add_constraint(A >= 1); + + Coefficient num; + Coefficient den; + Coefficient valn; + Coefficient vald; + bool ok = (!os.frequency(Linear_Expression(A), num, den, valn, vald)); + print_constraints(os, "*** os ***"); + + return ok; +} + } // namespace BEGIN_MAIN @@ -337,4 +356,5 @@ BEGIN_MAIN DO_TEST(test11); DO_TEST(test12); DO_TEST(test13); + DO_TEST(test14); END_MAIN

1 0

[GIT] ppl/ppl(master): Test disabled while problem is investigated.
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: edde5f27947380c13009e53fa293e34557f6e4f1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=edde5f279473… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 11:37:30 2010 +0000 Test disabled while problem is investigated. --- ...face_generator_prolog_generated_test_pl_code.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 index 4ed6891..56eb533 100644 --- a/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 +++ b/interfaces/Prolog/tests/ppl_interface_generator_prolog_generated_test_pl_code.m4 @@ -905,7 +905,7 @@ ppl_@CLASS@_@MAXMIN@_with_point_6_test :- ). ') -m4_define(`ppl_@CLASS@_frequency_code', +m4_define(`ppl_@CLASS@_frequency_codeXXX', ` ppl_@CLASS@_frequency_6_test :- (

1 0

[GIT] ppl/ppl(master): Added interface code for drop_some_non-integer_points() methods.
by Patricia Hill 24 Mar '10

24 Mar '10

Module: ppl/ppl Branch: master Commit: 5fb0618bd9c81e9a5a3e587a5c6d9bd561c3c027 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5fb0618bd9c8… Author: Patricia Hill <p.m.hill(a)leeds.ac.uk> Date: Wed Mar 24 11:00:21 2010 +0000 Added interface code for drop_some_non-integer_points() methods. Note that these are only enabled for BD_Shapes, Octagonal_Shapes and Boxes. --- interfaces/C/ppl_interface_generator_c_cc_code.m4 | 51 +++++++++++++++++ interfaces/C/ppl_interface_generator_c_h_code.m4 | 22 +++++++ ...ppl_interface_generator_java_classes_cc_code.m4 | 59 +++++++++++++++++++ ...l_interface_generator_java_classes_java_code.m4 | 18 ++++++ .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 40 +++++++++++++ .../OCaml/ppl_interface_generator_ocaml_ml_code.m4 | 16 +++++ .../ppl_interface_generator_ocaml_mli_code.m4 | 14 +++++ .../ppl_interface_generator_prolog_cc_code.m4 | 60 ++++++++++++++++++++ .../ppl_interface_generator_prolog_hh_code.m4 | 14 +++++ ...erface_generator_common_procedure_generators.m4 | 2 + 10 files changed, 296 insertions(+), 0 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=5fb0618b…

1 0