- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 07 Feb '11

07 Feb '11

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1066414f82e5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 19:32:31 2011 +0100 Grid: avoid using the non-const operator[] on systems (#4) URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=418640d30ab8… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 19:25:25 2011 +0100 Grid: avoid using the non-const operator[] on systems (#3) URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c3e8b6e0db42… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 19:20:50 2011 +0100 Grid: avoid using the non-const operator[] on systems (#2) URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bd8638c1fb7b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 19:20:07 2011 +0100 Grid: avoid using the non-const operator[] on systems (#1) URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bf351f46f4e6… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 19:16:22 2011 +0100 Grid: change the signature of multiply_grid() and adapt client code. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3dfb671412e0… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 18:44:37 2011 +0100 Grid: change the signature of reduce_reduced() and adapt client code. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4dbc9c4cf0c0… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 18:44:10 2011 +0100 Congruence_System: add a typedef for internal_row_type and the release_rows()/take_ownership_of_rows() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d8a9ea952bd2… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 18:18:44 2011 +0100 Grid: change the signature of reduce_parameter_with_line() and adapt client code. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0c719d8a9d19… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 18:04:15 2011 +0100 Grid_Generator_System: avoid using the non-const operator[] (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4c5072085f17… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 18:04:05 2011 +0100 Grid_Generator_System: avoid using the non-const operator[] (#1). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4702196856c6… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 17:56:38 2011 +0100 Generator_System: avoid using the non-const operator[] (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9b25fe1b6e25… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 17:45:53 2011 +0100 Generator_System: avoid using the non-const operator[]. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2a1940be4822… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 17:28:37 2011 +0100 Constraint_System: avoid using the non-const operator[]. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fd6416dbff3e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 17:13:27 2011 +0100 Linear_System: call swap_rows() when needed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e7b642dfd915… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 17:12:46 2011 +0100 Linear_System: avoid using Linear_System::iterator. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1e5bd81f9594… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 17:09:37 2011 +0100 Linear_System: call set_sorted(true) in sort_pending_and_remove_duplicates(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=30ba5b51e129… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 17:04:01 2011 +0100 Linear_System: avoid using the non-const operator[]. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ecc7c6c700e0… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 16:52:15 2011 +0100 Linear_System: add a typedef for internal_row_type. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6c524018e96f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 16:45:15 2011 +0100 Linear_System: take_ownership_of_rows() now considers all rows as non-pending. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=45b17393d6b4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 16:44:33 2011 +0100 Linear_System: add some assertions. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d2b2891d501… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 16:43:20 2011 +0100 Linear_System: rewrite the ascii_load() method to honour invariants. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6eca90bd32bb… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Feb 7 13:03:13 2011 +0100 Matrix: don't assume thar Swapping_Vector's iterators are the same of std::vector. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f05b18d4b704… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 21:32:51 2011 +0100 Linear_System: make private methods and fields protected.

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 06 Feb '11

06 Feb '11

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4526acc4ca7e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 16:27:00 2011 +0100 Grid: add an assertion. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=63db6fb26a9e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 16:26:48 2011 +0100 Grid: rewrite part of the conversion() method, to keep the Linear_System subobject valid at each step. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8b669b048123… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 16:24:36 2011 +0100 Linear_System: disable part of the OK() method, to avoid triggering assertions for valid Grid_Generator_System objects. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8c3389e8e435… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 16:23:44 2011 +0100 Linear_System: add the release_rows() and take_ownerhip_of_rows() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=93d75097e365… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 15:24:55 2011 +0100 Grid: reverse the order of a loop, in conversion(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=133566986c2f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 14:49:59 2011 +0100 Grid: prefer const references to non-const ones. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=543ff21acc89… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 13:39:30 2011 +0100 Constraint_System: use swap_rows() when needed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7282f55a6f1e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 13:39:08 2011 +0100 Constraint_System: rewrite the ascii_load() method, to keep the Constraint_System object valid at each step. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3dba0e04570f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 13:32:36 2011 +0100 Grid_Generator_System: use swap_rows() when needed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=912f07d75fd9… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 13:31:45 2011 +0100 Grid_Generator_System: rewrite the ascii_load() method, to keep the Grid_Generator_System object valid at each step. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=44c6c7dbd660… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 13:26:56 2011 +0100 Linear_System: fix resize_no_copy(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=17a00c08c053… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 13:26:29 2011 +0100 Linear_System: add a set_topology() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=94596fd9b988… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 13:10:55 2011 +0100 Grid_Generator: add an assertion. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7db546492b8e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 13:10:38 2011 +0100 Grid_Generator: call set_necessarily_closed() in ascii_load(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3fa4beba1d44… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 13:10:01 2011 +0100 Grid_Generator: add a default constructor. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4896719f9f2f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 12:28:22 2011 +0100 Generator_System: use swap_rows() when needed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=114d03a2b357… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 12:26:44 2011 +0100 Generator_System: rewrite the ascii_load() method, to keep the Generator_System object valid at each step. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=dc6960a115fb… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 12:24:35 2011 +0100 Generator_System: add a convert_into_non_necessarily_closed() helper method and use it when needed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=81c5c773250f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sun Feb 6 11:38:06 2011 +0100 Generator: add a default constructor. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=37a855344a12… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 19:01:48 2011 +0100 Swapping_Vector: avoid copying elements in the erase() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=507a73933eeb… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 18:57:11 2011 +0100 Polyhedron: use a separate vector for recyclable rows, in conversion(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1a30b23b1085… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 18:56:19 2011 +0100 Linear_System: fix the remove_trailing_rows() and release_row() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aa7ced24b2cb… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 18:30:48 2011 +0100 Linear_System: add an increase_space_dimension() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bcaac6457a57… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 18:21:51 2011 +0100 Linear_System: add a release_row() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0bed321b3873… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 18:07:58 2011 +0100 Swapping_Vector: add a pop_back() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=88d0e766ee51… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 17:49:07 2011 +0100 Polyhedron: call Linear_System::swap_rows() when needed. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6537eaa678db… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 17:42:20 2011 +0100 Linear_System: add a swap_rows() method.

1 0

ocaml interface issues
by piotrm 05 Feb '11

05 Feb '11

Hellos, "Out_of_memory" exceptions are thrown using the ocaml interface when doing very very simple tasks, like below. I have yet to find an example on the use of linear_partition using the ocaml interface so I hope I'm not embarrassing myself by using it incorrectly. Also, the ppl_Polyhedron_OK returns false right before get_minimized_constraints (or most other polyhedron functions) result in the exception. The same task is performed just fine using the C++ interface. Any info regarding this issue would be greatly appreciated. open Printf open Gmp open Ppl_ocaml let v1 = Variable 0;; let p1 = ppl_new_C_Polyhedron_from_space_dimension 1 Universe;; ppl_Polyhedron_add_constraint p1 (Less_Or_Equal (v1, (Coefficient (Z.of_int 2))));; ppl_Polyhedron_add_constraint p1 (Greater_Or_Equal (v1, (Coefficient (Z.of_int 1))));; let p2 = ppl_new_C_Polyhedron_from_space_dimension 1 Universe;; ppl_Polyhedron_add_constraint p2 (Less_Or_Equal (v1, (Coefficient (Z.of_int 3))));; ppl_Polyhedron_add_constraint p1 (Greater_Or_Equal (v1, (Coefficient (Z.of_int 2))));; let (pinter, parts_of_p2) = ppl_Polyhedron_linear_partition p1 p2 in let it = ppl_Pointset_Powerset_NNC_Polyhedron_begin_iterator parts_of_p2 in let itend = ppl_Pointset_Powerset_NNC_Polyhedron_end_iterator parts_of_p2 in while (not (ppl_Pointset_Powerset_NNC_Polyhedron_iterator_equals_iterator it itend)) do let p = ppl_Pointset_Powerset_NNC_Polyhedron_get_disjunct it in printf "ok = %s\n" (string_of_bool (ppl_Polyhedron_OK p)); flush stdout; ignore (ppl_Polyhedron_get_minimized_constraints p); (* Out_of_memory exception here *); ppl_Pointset_Powerset_NNC_Polyhedron_increment_iterator it done ;;

2 2

[GIT] ppl/ppl(master): Fixed function ppl_Pointset_Powerset_*_get_disjunct in OCaml interface.
by Enea Zaffanella 05 Feb '11

05 Feb '11

Module: ppl/ppl Branch: master Commit: c23ded5ce0023a753fdd5da2dbbd99d1a084566c URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c23ded5ce002… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Feb 5 21:01:13 2011 +0100 Fixed function ppl_Pointset_Powerset_*_get_disjunct in OCaml interface. --- .../OCaml/ppl_interface_generator_ocaml_cc_code.m4 | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 index fe0f213..4a829e7 100644 --- a/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 +++ b/interfaces/OCaml/ppl_interface_generator_ocaml_cc_code.m4 @@ -984,9 +984,10 @@ ppl_@CLASS@_get_disjunct(value caml_it) try { CAMLparam1(caml_it); CAMLlocal1(caml_return_value); @CPP_CLASS@::iterator& cpp_it = *p_@CLASS@_iterator_val(caml_it); - @DISJUNCT_TOPOLOGY@@A_DISJUNCT@ disjunct = cpp_it->pointset(); + const @DISJUNCT_TOPOLOGY@@A_DISJUNCT@& disjunct = cpp_it->pointset(); caml_return_value = unregistered_value_p_@DISJUNCT@(disjunct); - actual_p_@DISJUNCT@_val(caml_return_value) = mark(&disjunct); + actual_p_@DISJUNCT@_val(caml_return_value) + = const_cast<@DISJUNCT_TOPOLOGY@@A_DISJUNCT@*>(mark(&disjunct)); CAMLreturn(caml_return_value); } CATCH_ALL

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 05 Feb '11

05 Feb '11

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0821dbbf4a6e… Merge: bdba1dbf2ccebf5249fd8237017ef391bbea2dc3 bf1edca5e0ddb03674a35218dccce6bc421469e2 Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 16:11:43 2011 +0100 Merge branch 'master' into sparse_matrices Conflicts: src/Polyhedron_public.cc URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bf1edca5e0dd… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 16:09:47 2011 +0100 Polyhedron: fix an invalid reference bug in generalized_affine_image(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bdba1dbf2cce… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 15:40:52 2011 +0100 Linear_System: replace the add_*rows() methods with insert*() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9f657adb16f8… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 15:30:10 2011 +0100 Constraint_System, Generator_System: inherit from Linear_System<Linear_Row> with the `public' specifier. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3dbfc033b2d5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 15:04:24 2011 +0100 Linear_System: make the add_*row() methods private. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9de6d262ea8e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 14:24:42 2011 +0100 Grid_Generator_System: use the Linear_System::insert*() methods instead of the add*_row() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4c8702a0b81b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 14:24:33 2011 +0100 Generator_System: use the Linear_System::insert*() methods instead of the add*_row() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=69ec030d6bb9… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 14:24:10 2011 +0100 Polyhedron: use the Linear_System::insert*() methods instead of the add*_row() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bd43e29e5172… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 14:23:15 2011 +0100 Linear_System: add the insert_recycled() and insert_pending_recycled() methods. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3a2f2ba94b44… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 12:50:06 2011 +0100 Linear_System: rename the add_rows_and_columns() method into add_universe_rows_and_columns(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=af0a3c5ba4af… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 12:38:24 2011 +0100 Linear_System: add more topology checks. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fde3fe3dc885… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 12:27:44 2011 +0100 Linear_System: keep the pending rows when constructing temporary copies of Linear_System objects. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=23f9f15ee57a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 12:23:58 2011 +0100 Linear_System: clarify a comment. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=beb797f5f4cf… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 12:20:19 2011 +0100 Polyhedron: simplify add_recycled_generators(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=00bf4200d35a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 12:17:12 2011 +0100 Linear_Row, Linear_Row::Flags: add a set_topology() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9b288e69cea5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 12:04:25 2011 +0100 Linear_System: avoid useless copies in insert() and insert_pending(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6f8d776bd22e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 11:59:22 2011 +0100 Add a TODO comment. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=aaeeb959482e… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 11:53:19 2011 +0100 Linear_System: add the add_recycled_rows() and add_recycled_pending_rows() methods and use them in Polyhedron. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f469b98d8ec4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 11:37:20 2011 +0100 Linear_System: don't modify sortedness in add_recycled_pending_row(), and simplify some code. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=436f439dbb68… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 10:32:52 2011 +0100 Linear_System: add an add_recycled_pending_row() method and change the semantics of add_recycled_row(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=21cac20abf5b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 10:24:21 2011 +0100 Swapping_Vector: avoid copying when reallocating the vector in push_back(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3609c23d8933… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 10:19:40 2011 +0100 Linear_System is now implemented with a Swapping_Vector instead of a Matrix. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=2da57c074881… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 10:06:44 2011 +0100 Linear_System: add a TODO comment. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=38c4908badef… Merge: f4214b110c1f55271543717cb18cc8a2e5ace65f a01fecf4cde756aaefe88b8f309f9bdf3e07b670 Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 09:59:27 2011 +0100 Merge branch 'master' into sparse_matrices URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a01fecf4cde7… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 09:58:54 2011 +0100 Grid: avoid using an invalid reference in the constructor from a Box.

1 0

[GIT] ppl/ppl(master): Polyhedron: fix an invalid reference bug in generalized_affine_image().
by Marco Poletti 05 Feb '11

05 Feb '11

Module: ppl/ppl Branch: master Commit: bf1edca5e0ddb03674a35218dccce6bc421469e2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bf1edca5e0dd… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 16:09:47 2011 +0100 Polyhedron: fix an invalid reference bug in generalized_affine_image(). --- src/Polyhedron_public.cc | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Polyhedron_public.cc b/src/Polyhedron_public.cc index 6a5105e..0e2f010 100644 --- a/src/Polyhedron_public.cc +++ b/src/Polyhedron_public.cc @@ -2927,15 +2927,14 @@ generalized_affine_image(const Variable var, const dimension_type eps_index = space_dim + 1; for (dimension_type i = gen_sys.num_rows(); i-- > 0; ) if (gen_sys[i].is_point()) { - Generator& g = gen_sys[i]; - // Add a `var'-displaced copy of `g' to the generator system. - gen_sys.add_row(g); + // Add a `var'-displaced copy of `gen_sys[i]' to the generator system. + gen_sys.add_row(gen_sys[i]); if (relsym == GREATER_THAN) ++gen_sys[gen_sys.num_rows()-1][var_space_dim]; else --gen_sys[gen_sys.num_rows()-1][var_space_dim]; - // Transform `g' into a closure point. - g[eps_index] = 0; + // Transform `gen_sys[i]' into a closure point. + gen_sys[i][eps_index] = 0; } clear_constraints_up_to_date(); clear_generators_minimized();

1 0

[GIT] ppl/ppl(sparse_matrices): New commits
by Roberto Bagnara 05 Feb '11

05 Feb '11

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f4214b110c1f… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 01:07:04 2011 +0100 Linear_System: avoid deriving from Matrix<Row>. Add a Matrix<Row> field instead. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6435c868aa29… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 23:43:08 2011 +0100 Linear_Row: add a max_num_columns() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7d3944182866… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 23:37:22 2011 +0100 Grid_Generator: remove the coefficient_swap() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a508abbf141b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 23:35:07 2011 +0100 Grid_Generator_System: avoid calling Matrix::add_zero_rows_and_columns() in add_universe_rows_and_columns(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=829d1abd7360… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 23:34:45 2011 +0100 Grid_Generator_System: avoid calling Matrix::add_zero_rows_and_columns() in recycling_insert(Generator_System&). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=537741e8a24a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 23:33:38 2011 +0100 Grid_Generator_System: avoid calling Matrix::add_zero_rows_and_columns() in recycling_insert(Grid_Generator_System&). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1e8f240d7f93… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 22:29:09 2011 +0100 Grid_Generator_System: don't assume that Linear_System is implemented with a Matrix. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=834a4f9b5729… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 22:16:35 2011 +0100 Linear_System: add a remove_trailing_columns_without_normalizing() method. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b27defb9611b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 21:54:03 2011 +0100 Linear_System: remove too-strict assertion. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8aff5edbfd0b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 19:21:28 2011 +0100 Polyhedron: don't call Generator_System::add_zero_rows() in add_recycled_generators(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3fc334872240… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 19:20:22 2011 +0100 Polyhedron: don't assume that Generator_System is implemented with a Matrix, in remove_space_dimensions(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=73504e4e7c6d… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 16:28:46 2011 +0100 Add a Swapping_Vector class and use it to implement Matrix. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ea341e0754ea… Merge: d66a8fc9149b3fc34d08a9ff42f513db70cb962e 0643bb18e84c01bf0906b99dbef0005e55f664b4 Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 15:30:51 2011 +0100 Merge branch 'master' into sparse_matrices Conflicts: src/Dense_Matrix.cc src/Dense_Matrix.defs.hh src/Dense_Matrix.inlines.hh src/Dense_Matrix.types.hh src/Dense_Row.cc src/Dense_Row.inlines.hh src/Sparse_Matrix.defs.hh src/Sparse_Matrix.inlines.hh src/Sparse_Matrix.types.hh tests/Polyhedron/densematrix1.cc tests/Sparse_Matrix/Makefile.am URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d66a8fc9149b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 13:09:25 2011 +0100 Grid_Generator: some changes, possibly fixing the code. Patch by Enea Zaffanella. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4ee4336688f2… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 10:43:12 2011 +0100 Grid_Generator: fix normalization bug in parameter(). Now the whole testsuite passes. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=38e3c1aee231… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Fri Feb 4 10:16:59 2011 +0100 Remove the (unused) Sparse_Matrix.types.hh file. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0643bb18e84c… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 3 18:48:49 2011 +0100 Corrected a bug in cut generation. We were using %= instead of the helper function mod_assign(), which is meant to compute the *positive* modulus. For clarity, the helper function has been renamed as pos_mod_assign(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f14d56cb93cb… Author: Fabio Bossi <bossi(a)cs.unipr.it> Date: Wed Feb 2 16:48:49 2011 +0100 Do not use the deprecated function mpz_div_2exp. Use mpz_tdiv_q_2exp instead. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c02e988b645f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 29 19:45:52 2011 +0100 AC_PROG_OCAML only sets OCAMLOPT if OCAMLC is different from "no". URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b4d174ba5cb6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Sat Jan 29 10:54:01 2011 +0100 Copyright notices updated in expexted result files. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=fb4f7f910d95… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Mon Jan 24 20:43:36 2011 +0100 Copyright notices updated. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0fd2de73dd62… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Sat Jan 8 17:23:18 2011 +0100 Replaced a call to PPL_ASSERT by PPL_ASSERT_HEAVY. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=1c16cf1e891f… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Fri Jan 7 18:39:22 2011 +0100 Cyclic dependency avoided. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8d3d269f7907… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Jan 6 11:44:48 2011 +0100 Fixed documentation copy-and-paste error. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=27d130ce3196… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jan 6 10:42:46 2011 +0100 Replaced several occurrences of assert() by PPL_ASSERT(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=7a0f1627560d… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jan 6 09:31:27 2011 +0100 Added missing parameter documentation. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=87b7c0d322e1… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Jan 6 08:57:57 2011 +0100 Do not build documentation for interfaces that are not enabled. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6ba95253a8b9… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Wed Jan 5 17:02:18 2011 +0100 Added missing `use_module' directive. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b86dc7a898cd… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Thu Dec 30 14:44:10 2010 +0100 Dense_Row: simplify the exception safety implementation by using an implementation subobject. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a24129e95d80… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 17:05:58 2010 +0100 Dense_Row: improve exception safety in constructors. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ff7564a57ae5… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Mon Dec 27 09:20:53 2010 +0100 Dense_Row: remove useless debugging code from the OK() method.

1 0

[GIT] ppl/ppl(master): Grid: avoid using an invalid reference in the constructor from a Box.
by Marco Poletti 05 Feb '11

05 Feb '11

Module: ppl/ppl Branch: master Commit: a01fecf4cde756aaefe88b8f309f9bdf3e07b670 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a01fecf4cde7… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Sat Feb 5 09:58:54 2011 +0100 Grid: avoid using an invalid reference in the constructor from a Box. --- src/Grid.templates.hh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/Grid.templates.hh b/src/Grid.templates.hh index d202f83..51b01a3 100644 --- a/src/Grid.templates.hh +++ b/src/Grid.templates.hh @@ -63,8 +63,10 @@ Grid::Grid(const Box<Interval>& box, PPL_DIRTY_TEMP_COEFFICIENT(u_n); PPL_DIRTY_TEMP_COEFFICIENT(u_d); gen_sys.insert(grid_point(0*Variable(space_dim-1))); - Grid_Generator& point = gen_sys[0]; for (dimension_type k = space_dim; k-- > 0; ) { + // This is declared here because it may be invalidated by the call to + // gen_sys.insert() at the end of the loop. + Grid_Generator& point = gen_sys[0]; bool closed = false; // TODO: Consider producing the system(s) in minimized form. if (box.get_lower_bound(k, closed, l_n, l_d)) {

1 0

[GIT] ppl/ppl(pip): Fixed a bug in the simplification of the solution tree.
by Enea Zaffanella 04 Feb '11

04 Feb '11

Module: ppl/ppl Branch: pip Commit: caaa126b56ccb07884217b33b6cc8c1f79e7f6ca URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=caaa126b56cc… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 4 17:22:07 2011 +0100 Fixed a bug in the simplification of the solution tree. We were too eager in merging a single true child with its parent: if the true child happened to be a decision node with both childs, the merging was causing the violation of a PIP_Decision_Node invariant. --- src/PIP_Tree.cc | 55 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 46 insertions(+), 9 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index e167ea3..1a21047 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -2880,19 +2880,56 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, } } else if (f_node == 0) { - // t_node feasible, f_node unfeasible: - // restore cs and aps into t_node. - t_node->constraints_.swap(cs); - t_node->artificial_parameters.swap(aps); - // Add t_test to t_nodes's constraints. - t_node->add_constraint(t_test, all_params); + // t_node feasible, f_node unfeasible. #ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, "=== EXIT: THEN BRANCH FEASIBLE\n"); #endif - // It is now safe to release previously wrapped t_node pointer - // and return it to caller. - return wrapped_node.release(); + // NOTE: in principle, we could merge t_node into its parent. + // However, if t_node is a decision node having both childs, + // then we would obtain a node violating the PIP_Decision_Node + // invariant saying that t_node should have a single constraint: + // it will have, at least, the two splitting constraints. + PIP_Decision_Node* dn = dynamic_cast<PIP_Decision_Node*>(t_node); + if (dn != 0 && dn->false_child != 0) { + // Do NOT merge: create a new decision node. + PIP_Tree_Node* parent + = new PIP_Decision_Node(t_node->get_owner(), 0, t_node); + // Previously wrapped 't_node' is now safe: release it + // and protect new 'parent' node from exception safety issues. + wrapped_node.release(); + wrapped_node.reset(parent); + /* FIXME: delete this; */ + // Restore into parent `cs' and `aps'. + parent->constraints_.swap(cs); + parent->artificial_parameters.swap(aps); + // Add t_test to parent's constraints. + parent->add_constraint(t_test, all_params); + // It is now safe to release previously wrapped parent pointer + // and return it to caller. + return wrapped_node.release(); + } + else { + /* FIXME: delete this; */ + // Merge t_node with its parent: + // a) append into `cs' the constraints of t_node; + for (Constraint_System::const_iterator + i = t_node->constraints_.begin(), + i_end = t_node->constraints_.end(); i != i_end; ++i) + cs.insert(*i); + // b) append into `aps' the parameters of t_node; + aps.insert(aps.end(), + t_node->artificial_parameters.begin(), + t_node->artificial_parameters.end()); + // c) swap the updated `cs' and `aps' into t_node. + cs.swap(t_node->constraints_); + aps.swap(t_node->artificial_parameters); + // d) add t_test to t_nodes's constraints. + t_node->add_constraint(t_test, all_params); + // It is now safe to release previously wrapped t_node pointer + // and return it to caller. + return wrapped_node.release(); + } } // Here both t_node and f_node are feasible:

1 0

[GIT] ppl/ppl(pip): Further improvement to debug output.
by Enea Zaffanella 04 Feb '11

04 Feb '11

Module: ppl/ppl Branch: pip Commit: 20f99dbe73d5c6b988561d7cffaa4d294f2bdb6a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=20f99dbe73d5… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Fri Feb 4 15:42:15 2011 +0100 Further improvement to debug output. Preprocessor flag NOISY_PIP_TREE_STRUCTURE only activate those debug print taht is useful to hightlight the solution tree construction process. --- src/PIP_Tree.cc | 61 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 7665862..e167ea3 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -29,6 +29,7 @@ site: http://www.cs.unipr.it/ppl/ . */ #include <memory> #include <map> +// #define NOISY_PIP_TREE_STRUCTURE // #define NOISY_PIP // #define VERY_NOISY_PIP @@ -1281,7 +1282,7 @@ PIP_Decision_Node::solve(const PIP_Problem& pip, const Matrix& context, const Variables_Set& params, dimension_type space_dim, const unsigned indent_level) { -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, "=== SOLVING DECISION NODE\n"); #else used(indent_level); @@ -1295,9 +1296,9 @@ PIP_Decision_Node::solve(const PIP_Problem& pip, merge_assign(context_true, constraints_, all_params); bool has_false_child = (false_child != 0); bool has_true_child = (true_child != 0); -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "=== DECISION: SOLVING then CHILD\n"); + "=== DECISION: SOLVING THEN CHILD\n"); #endif true_child = true_child->solve(pip, check_feasible_context, context_true, all_params, space_dim, @@ -1310,9 +1311,9 @@ PIP_Decision_Node::solve(const PIP_Problem& pip, Matrix& context_false = context_true; Row& last = context_false[context_false.num_rows() - 1]; complement_assign(last, last, 1); -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "=== DECISION: SOLVING else CHILD\n"); + "=== DECISION: SOLVING ELSE CHILD\n"); #endif false_child = false_child->solve(pip, check_feasible_context, context_false, all_params, space_dim, @@ -1321,7 +1322,7 @@ PIP_Decision_Node::solve(const PIP_Problem& pip, if (true_child == 0 && false_child == 0) { // No childs: the whole subtree is unfeasible. -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, "=== DECISION: BOTH BRANCHES NOW UNFEASIBLE: _|_\n"); #endif @@ -1334,9 +1335,9 @@ PIP_Decision_Node::solve(const PIP_Problem& pip, // False child has become unfeasible: merge this node's artificials with // the true child, while removing the local parameter constraints, which // are no longer discriminative. -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "=== DECISION: BRANCH else NOW UNFEASIBLE\n"); + "=== DECISION: ELSE BRANCH NOW UNFEASIBLE\n"); indent_and_print(std::cerr, indent_level, "==> merge then branch with parent.\n"); #endif @@ -1349,9 +1350,9 @@ PIP_Decision_Node::solve(const PIP_Problem& pip, else if (has_true_child && true_child == 0) { // True child has become unfeasible: merge this node's artificials // with the false child. -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "=== DECISION: BRANCH then NOW UNFEASIBLE\n"); + "=== DECISION: THEN BRANCH NOW UNFEASIBLE\n"); indent_and_print(std::cerr, indent_level, "==> merge else branch with parent.\n"); #endif @@ -1379,7 +1380,7 @@ PIP_Decision_Node::solve(const PIP_Problem& pip, } // If the constraints set has become empty, only keep the true child. if (constraints_.empty()) { -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, "=== DECISION: NO BRANCHING CONSTRAINTS LEFT\n"); indent_and_print(std::cerr, indent_level, @@ -2338,7 +2339,7 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, const Matrix& ctx, const Variables_Set& params, dimension_type space_dim, const unsigned indent_level) { -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, "=== SOLVING NODE\n"); #else used(indent_level); @@ -2502,10 +2503,10 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, if (!find_lexico_minimum_column(tableau.s, mapping, basis, tableau.s[i], 0, j)) { // No positive s_ij was found: problem is unfeasible. -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, "No positive pivot: Solution = _|_\n"); -#endif // #ifdef NOISY_PIP +#endif // #ifdef NOISY_PIP_TREE_STRUCTURE delete this; return 0; } @@ -2821,8 +2822,8 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, // Add parametric constraint to context. context.add_row(t_test); // Recusively solve true node wrt updated context. -#ifdef NOISY_PIP - indent_and_print(std::cerr, indent_level, "=== SOLVING then CHILD\n"); +#ifdef NOISY_PIP_TREE_STRUCTURE + indent_and_print(std::cerr, indent_level, "=== SOLVING THEN CHILD\n"); #endif t_node = t_node->solve(pip, check_feasible_context, context, all_params, space_dim, @@ -2846,8 +2847,8 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, complement_assign(f_test, t_test, 1); // Recusively solve false node wrt updated context. -#ifdef NOISY_PIP - indent_and_print(std::cerr, indent_level, "=== SOLVING else CHILD\n"); +#ifdef NOISY_PIP_TREE_STRUCTURE + indent_and_print(std::cerr, indent_level, "=== SOLVING ELSE CHILD\n"); #endif f_node = f_node->solve(pip, check_feasible_context, context, all_params, space_dim, @@ -2857,9 +2858,9 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, if (t_node == 0) { if (f_node == 0) { // Both t_node and f_node unfeasible. -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "=== BOTH BRANCHES UNFEASIBLE: _|_\n"); + "=== EXIT: BOTH BRANCHES UNFEASIBLE: _|_\n"); #endif return 0; } @@ -2871,9 +2872,9 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, f_node->artificial_parameters.swap(aps); // Add f_test to constraints. f_node->add_constraint(f_test, all_params); -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "=== THEN BRANCH UNFEASIBLE: SWAP BRANCHES\n"); + "=== EXIT: THEN BRANCH UNFEASIBLE: SWAP BRANCHES\n"); #endif return f_node; } @@ -2885,9 +2886,9 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, t_node->artificial_parameters.swap(aps); // Add t_test to t_nodes's constraints. t_node->add_constraint(t_test, all_params); -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "=== THEN BRANCH FEASIBLE\n"); + "=== EXIT: THEN BRANCH FEASIBLE\n"); #endif // It is now safe to release previously wrapped t_node pointer // and return it to caller. @@ -2896,9 +2897,9 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, // Here both t_node and f_node are feasible: // create a new decision node. -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "=== BOTH BRANCHES FEASIBLE: NEW DECISION NODE\n"); + "=== EXIT: BOTH BRANCHES FEASIBLE: NEW DECISION NODE\n"); #endif PIP_Tree_Node* parent = new PIP_Decision_Node(f_node->get_owner(), f_node, t_node); @@ -2911,9 +2912,9 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, parent->add_constraint(t_test, all_params); if (!cs.empty()) { -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "=== NODE HAD BOTH BRANCHES AND TAUTOLOGIES:\n"); + "=== NODE HAS BOTH BRANCHES AND TAUTOLOGIES:\n"); indent_and_print(std::cerr, indent_level, "=== CREATE NEW PARENT FOR TAUTOLOGIES\n"); #endif @@ -2960,9 +2961,9 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, } } // The goto was not taken, the solution is integer. -#ifdef NOISY_PIP +#ifdef NOISY_PIP_TREE_STRUCTURE indent_and_print(std::cerr, indent_level, - "Solution found for current node.\n"); + "EXIT: solution found.\n"); #endif // #ifdef NOISY_PIP return this;

1 0