November 2009 - PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(pip): Added a few tests for the PIP_Problem ascii_dump/ load methods.
by Enea Zaffanella 26 Nov '09

26 Nov '09

Module: ppl/ppl Branch: pip Commit: f83627a474666b6f7d31b4d54095b63c69e22862 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f83627a47466… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 26 14:42:12 2009 +0100 Added a few tests for the PIP_Problem ascii_dump/load methods. --- tests/PIP_Problem/Makefile.am | 6 +- tests/PIP_Problem/ascii_dump_load1.cc | 153 +++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 1 deletions(-) diff --git a/tests/PIP_Problem/Makefile.am b/tests/PIP_Problem/Makefile.am index a01d3af..5ec9c04 100644 --- a/tests/PIP_Problem/Makefile.am +++ b/tests/PIP_Problem/Makefile.am @@ -50,6 +50,7 @@ $(top_builddir)/src/libppl.la \ @extra_libraries@ TESTS = \ +ascii_dump_load1 \ exceptions1 \ pipproblem1 pipproblem2 @@ -61,6 +62,8 @@ BUGS = # Sources for the tests # +ascii_dump_load1_SOURCES = ascii_dump_load1.cc + exceptions1_SOURCES = exceptions1.cc pipproblem1_SOURCES = pipproblem1.cc @@ -73,7 +76,8 @@ $(BUGS) #EXTRA_DIST = -#MOSTLYCLEANFILES = +MOSTLYCLEANFILES = \ +ascii_dump_load1.dat $(top_builddir)/utils/libppl_utils.a: $(MAKE) $(AM_MAKEFLAGS) -C $(top_builddir)/utils libppl_utils.a diff --git a/tests/PIP_Problem/ascii_dump_load1.cc b/tests/PIP_Problem/ascii_dump_load1.cc new file mode 100644 index 0000000..18e8235 --- /dev/null +++ b/tests/PIP_Problem/ascii_dump_load1.cc @@ -0,0 +1,153 @@ +/* Test PIP_Problem::ascii_dump() and PIP_Problem::ascii_load(). + Copyright (C) 2001-2009 Roberto Bagnara <bagnara(a)cs.unipr.it> + +This file is part of the Parma Polyhedra Library (PPL). + +The PPL is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3 of the License, or (at your +option) any later version. + +The PPL is distributed in the hope that it will be useful, but WITHOUT +ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software Foundation, +Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. + +For the most up-to-date information see the Parma Polyhedra Library +site: http://www.cs.unipr.it/ppl/ . */ + +#include "ppl_test.hh" + +#include "files.hh" +#include <string> +#include <fstream> + +using std::string; +using std::fstream; +using std::ios_base; + +namespace { + +bool +test01() { + const char* my_file = "ascii_dump_load1.dat"; + + Variable A(0); + Constraint_System cs; + cs.insert(A >= 1); + + PIP_Problem pip1(3, cs.begin(), cs.end(), Variables_Set()); + pip1.clear(); + + fstream f; + open(f, my_file, ios_base::out); + pip1.ascii_dump(f); + close(f); + + open(f, my_file, ios_base::in); + PIP_Problem pip2; + pip2.ascii_load(f); + close(f); + + bool ok = pip1.space_dimension() == 0 + && pip2.space_dimension() == 0 + && pip1.constraints_begin() == pip1.constraints_end() + && pip2.constraints_begin() == pip2.constraints_end(); + + return ok; +} + +bool +test02() { + const char* my_file = "ascii_dump_load1.dat"; + + PIP_Problem pip1(3); + pip1.solve(); + + fstream f; + open(f, my_file, ios_base::out); + pip1.ascii_dump(f); + close(f); + + open(f, my_file, ios_base::in); + PIP_Problem pip2; + pip2.ascii_load(f); + close(f); + + bool ok = pip1.space_dimension() == 3 + && pip2.space_dimension() == 3 + && pip1.constraints_begin() == pip1.constraints_end() + && pip2.constraints_begin() == pip2.constraints_end(); + + return ok; +} + +bool +test03() { + const char* my_file = "ascii_dump_load1.dat"; + + Variable A(0); + Constraint_System cs; + cs.insert(A >= 1); + cs.insert(A <= 0); + + PIP_Problem pip1(1, cs.begin(), cs.end(), Variables_Set()); + pip1.set_control_parameter(PIP_Problem::CUTTING_STRATEGY_DEEPEST); + pip1.solve(); + + fstream f; + open(f, my_file, ios_base::out); + pip1.ascii_dump(f); + close(f); + + open(f, my_file, ios_base::in); + PIP_Problem pip2; + pip2.ascii_load(f); + close(f); + + bool ok = pip1.space_dimension() == pip2.space_dimension() + && 2 == std::distance(pip1.constraints_begin(), pip1.constraints_end()) + && 2 == std::distance(pip2.constraints_begin(), pip2.constraints_end()); + + return ok; +} + +bool +test04() { + const char* my_file = "ascii_dump_load1.dat"; + + Variable A(0); + Constraint_System cs; + cs.insert(A >= 5); + + PIP_Problem pip1(3, cs.begin(), cs.end(), Variables_Set()); + + fstream f; + open(f, my_file, ios_base::out); + pip1.ascii_dump(f); + close(f); + + open(f, my_file, ios_base::in); + PIP_Problem pip2; + pip2.ascii_load(f); + close(f); + + bool ok = pip1.space_dimension() == pip2.space_dimension() + && 1 == std::distance(pip1.constraints_begin(), pip1.constraints_end()) + && 1 == std::distance(pip2.constraints_begin(), pip2.constraints_end()); + + return ok; +} + +} // namespace + +BEGIN_MAIN + DO_TEST(test01); + DO_TEST(test02); + DO_TEST(test03); + DO_TEST(test04); +END_MAIN

1 0

[GIT] ppl/ppl(pip): Properly set status flags when solving a PIP_Problem having no constraints .
by Enea Zaffanella 26 Nov '09

26 Nov '09

Module: ppl/ppl Branch: pip Commit: 3bb1ea9da4415fee8b48c9fa32f7883777403a66 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3bb1ea9da441… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Nov 26 14:41:05 2009 +0100 Properly set status flags when solving a PIP_Problem having no constraints. Minor correction to ascii_dump method. --- src/PIP_Problem.cc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/PIP_Problem.cc b/src/PIP_Problem.cc index b7100e8..4857949 100644 --- a/src/PIP_Problem.cc +++ b/src/PIP_Problem.cc @@ -103,6 +103,7 @@ PPL::PIP_Problem::solve() const { x.current_solution = new PIP_Solution_Node(); if (input_cs.empty()) { // No constraints: solution = {0}. + x.status = OPTIMIZED; return OPTIMIZED_PIP_PROBLEM; } @@ -291,7 +292,7 @@ PPL::PIP_Problem::ascii_dump(std::ostream& s) const { s << "\nparameters"; parameters.ascii_dump(s); - s << "\ninitial_context"; + s << "\ninitial_context\n"; initial_context.ascii_dump(s); s << "\ncontrol_parameters\n";

1 0

[GIT] ppl/w3ppl(master): Fixed the links to the ArchLinux distribution.
by Roberto Bagnara 26 Nov '09

26 Nov '09

Module: ppl/w3ppl Branch: master Commit: a6a59ee9f6c42d746b557850abca376683e5a90d URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/w3ppl.git;a=commit;h=a6a59ee9f6… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 26 14:18:57 2009 +0100 Fixed the links to the ArchLinux distribution. --- htdocs/Download/Download.raw | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/htdocs/Download/Download.raw b/htdocs/Download/Download.raw index a9dda30..17d1351 100644 --- a/htdocs/Download/Download.raw +++ b/htdocs/Download/Download.raw @@ -72,7 +72,9 @@ Below is a list of the available PPL binary distributions. <TR VALIGN=TOP ALIGN=CENTER> <TD> - <A HREF="http://aur.archlinux.org/packages.php?ID=20579">ArchLinux</A> + <A HREF="http://www.archlinux.org/packages/core/x86_64/ppl/">ArchLinux x86_64</A> + <BR> + <A HREF="http://www.archlinux.org/packages/core/i686/ppl/">ArchLinux i686</A> </TD> <TD> <A HREF="http://packages.debian.org/source/sid/ppl">sid</A>

1 0

[GIT] ppl/ppl(master): One item added.
by Roberto Bagnara 26 Nov '09

26 Nov '09

Module: ppl/ppl Branch: master Commit: f07483112d73b17ace5aa7c7733b5b31fa6126e1 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f07483112d73… Author: Roberto Bagnara <bagnara(a)cs.unipr.it> Date: Thu Nov 26 11:17:39 2009 +0100 One item added. --- TODO | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/TODO b/TODO index f11abd9..e08798f 100644 --- a/TODO +++ b/TODO @@ -5,7 +5,9 @@ Enhancements for PPL 0.11 - Make all the *affine*image() methods uniform as far as the specification is concerned. - Look carefully at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42115 - +- Lack of perl can cause more problems than explained in the warning + message given by our configuration procedure. See, e.g., + http://www.cs.unipr.it/pipermail/ppl-devel/2009-November/015758.html Commits to consider should we release PPL 0.10.3 ================================================

1 0

PPL, Windows, Java interface
by Krzysztof Jakubczyk 26 Nov '09

26 Nov '09

Hi, is it possible to use PPL Java interface under windows? Has anyone tried it? regards, Krzysztof Jakubczyk

2 3

[GIT] ppl/ppl(pip): Changed the cut generation strategy in compatibility_check.
by François Galea 26 Nov '09

26 Nov '09

Module: ppl/ppl Branch: pip Commit: b831631899ddb867d22ec073d93dabaefe3cb487 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b831631899dd… Author: François Galea <francois.galea(a)uvsq.fr> Date: Thu Nov 26 08:37:43 2009 +0100 Changed the cut generation strategy in compatibility_check. Now several cuts may be generated in a single pass. --- src/PIP_Tree.cc | 32 ++++++++++++++++++++------------ 1 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index a181521..139df97 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1087,18 +1087,26 @@ PIP_Solution_Node::compatibility_check(const Matrix &ctx, const Row &cnst) { // Found an integer solution, thus the check is successful return true; } - // Generate a new cut - var_row.push_back(mapping.size()); - basis.push_back(false); - mapping.push_back(num_rows); - s.add_zero_rows(1, Row::Flags()); - const Row& row = s[i_]; - Row& cut = s[num_rows++]; - scaling.push_back(scaling[i_]); - const Coefficient& sc = scaling[i_]; - for (j=0; j<num_cols; ++j) - mod_assign(cut[j], row[j], sc); - cut[0] -= sc; + for (i = 0; i < num_vars; ++i) { + if (basis[i]) + // basic variable = 0 -> integer + continue; + i_ = mapping[i]; + const Coefficient& d = scaling[i_]; + if (s[i_][0] % d == 0) + continue; + // Constant term is not integer. Generate a new cut. + var_row.push_back(mapping.size()); + basis.push_back(false); + mapping.push_back(num_rows); + s.add_zero_rows(1, Row::Flags()); + const Row& row = s[i_]; + Row& cut = s[num_rows++]; + for (j = 0; j < num_cols; ++j) + mod_assign(cut[j], row[j], d); + cut[0] -= d; + scaling.push_back(d); + } continue; }

1 0

[GIT] ppl/ppl(pip): Changed the pivot row selection algorithm in compatibility_check.
by François Galea 26 Nov '09

26 Nov '09

Module: ppl/ppl Branch: pip Commit: f98b51bb576fdbc0ecf94028f124914bf27454f2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f98b51bb576f… Author: François Galea <francois.galea(a)uvsq.fr> Date: Thu Nov 26 08:36:17 2009 +0100 Changed the pivot row selection algorithm in compatibility_check. It now selects the row which maximizes the lexico-minimal pivot column. --- src/PIP_Tree.cc | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 70526cb..a181521 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1051,22 +1051,19 @@ PIP_Solution_Node::compatibility_check(const Matrix &ctx, const Row &cnst) { // Look for a negative RHS (=constant term, stored in matrix column 0) i = num_rows; j = 0; - for (i_=0; i_<num_rows; ++i_) { - const Row& rs = s[i_]; - if (rs[0] < 0) { - if (i == num_rows) - i = i_; - for (j_=1; j_<num_cols; ++j_) { - // Search for first least nonnegative pivot candidate - const Coefficient& c = rs[j_]; - if (c > 0 && (j == 0 || c < rs[j])) - j = j_; - } - if (j == 0) { - // No positive pivot candidate: empty problem - return false; - } - break; + + // Find Pivot row i and pivot column j, by maximizing the pivot column + for (i_ = 0; i_ < num_rows; ++i_) { + if (s[i_][0] >= 0) + continue; + if (!find_lexico_minimum_column(s, mapping, basis, s[i_], 1, j_)) { + // No positive pivot candidate: empty problem + return false; + } + if (j == 0 || column_lower(s, mapping, basis, + s[i], j, s[i_], j_, s[i][0], s[i_][0])) { + i = i_; + j = j_; } }

1 0

[GIT] ppl/ppl(pip): Minor cosmetic code fixes.
by François Galea 26 Nov '09

26 Nov '09

Module: ppl/ppl Branch: pip Commit: f6a5acdea679083a9f87c59da603c28cd4c13db4 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f6a5acdea679… Author: François Galea <francois.galea(a)uvsq.fr> Date: Thu Nov 26 08:34:55 2009 +0100 Minor cosmetic code fixes. --- src/PIP_Tree.cc | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 531fa33..70526cb 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -1032,12 +1032,12 @@ PIP_Solution_Node::compatibility_check(const Matrix &ctx, const Row &cnst) { std::vector<dimension_type> var_column; // Column 0 is the constant term, not a variable var_column.push_back(not_a_dimension()); - for (j=1; j<=num_vars; ++j) { + for (j = 1; j <= num_vars; ++j) { basis.push_back(true); mapping.push_back(j); var_column.push_back(j-1); } - for (i=0; i<num_rows; ++i) { + for (i = 0; i < num_rows; ++i) { basis.push_back(false); mapping.push_back(i); var_row.push_back(i+num_vars); @@ -1073,17 +1073,20 @@ PIP_Solution_Node::compatibility_check(const Matrix &ctx, const Row &cnst) { if (j == 0) { // No negative RHS: fractional optimum found. If it is integer, then // the test is successful. Otherwise, generate a new cut. + bool all_integer_vars = true; for (i=0; i<num_vars; ++i) { if (basis[i]) // basic variable = 0 -> integer continue; // nonbasic variable i_ = mapping[i]; - if (s[i_][0] % scaling[i_] != 0) - // constant term is not integer + if (s[i_][0] % scaling[i_] != 0) { + // Constant term is not integer. + all_integer_vars = false; break; + } } - if (i==num_vars) { + if (all_integer_vars) { // Found an integer solution, thus the check is successful return true; } @@ -1124,14 +1127,14 @@ PIP_Solution_Node::compatibility_check(const Matrix &ctx, const Row &cnst) { scaling[i] = 1; // Perform a pivot operation on the matrix - for (j_=0; j_<num_cols; ++j_) { + for (j_ = 0; j_ < num_cols; ++j_) { if (j_ == j) continue; const Coefficient& sij_ = p[j_]; if (sij_ == 0) // if element j of pivot row is zero, nothing to do for this column continue; - for (k=0; k<num_rows; ++k) { + for (k = 0; k < num_rows; ++k) { Row& row = s[k]; mult = row[j] * sij_; if (mult % sij != 0) {

1 0

[GIT] ppl/ppl(pip): Moved the lexico-minimum column search algorithm to a separate function.
by François Galea 26 Nov '09

26 Nov '09

Module: ppl/ppl Branch: pip Commit: 9086d965ff482af7c4abc904fbf306fee5524986 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9086d965ff48… Author: François Galea <francois.galea(a)uvsq.fr> Date: Thu Nov 26 08:29:58 2009 +0100 Moved the lexico-minimum column search algorithm to a separate function. --- src/PIP_Tree.cc | 116 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 80 insertions(+), 36 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index df37fe9..531fa33 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -112,6 +112,79 @@ update_context(Variables_Set &params, Matrix &context, } } +/* Compares two columns lexicographically in revised simplex tableau + - Returns true if (column ja)*(-cst_a)/pivot_a[ja] + << (column jb)*(-cst_b)/pivot_b[jb] + - Returns false otherwise +*/ +bool +column_lower(const Matrix& tableau, + const std::vector<dimension_type>& mapping, + const std::vector<bool>& basis, + const Row& pivot_a, + dimension_type ja, + const Row& pivot_b, + dimension_type jb, + const Coefficient& cst_a = -1, + const Coefficient& cst_b = -1) { + PPL_DIRTY_TEMP_COEFFICIENT(cij_a); + PPL_DIRTY_TEMP_COEFFICIENT(cij_b); + const Coefficient& sij_a = pivot_a[ja]; + const Coefficient& sij_b = pivot_b[jb]; + PPL_ASSERT(sij_a > 0); + PPL_ASSERT(sij_b > 0); + if (ja == jb) { + // Same column: just compare the ratios. + // This works since all columns are lexico-positive. + return cst_a * sij_b > cst_b * sij_a; + } + + dimension_type k = 0; + dimension_type num_vars = mapping.size(); + do { + dimension_type mk = mapping[k]; + if (basis[k]) { + // Reconstitute the identity submatrix part of tableau. + cij_a = (mk==ja) ? 1 : 0; + cij_b = (mk==jb) ? 1 : 0; + } else { + cij_a = tableau[mk][ja]; + cij_b = tableau[mk][jb]; + } + ++k; + } while (k < num_vars && cij_a * cst_a * sij_b == cij_b * cst_b * sij_a); + return k < num_vars && cij_a * cst_a * sij_b > cij_b * cst_b * sij_a; +} + +/* Find the column j in revised simplex tableau such as + - pivot_row[j] is positive + - (column j) / pivot_row[j] is lexico-minimal +*/ +bool +find_lexico_minimum_column(const Matrix& tableau, + const std::vector<dimension_type>& mapping, + const std::vector<bool>& basis, + const Row& pivot_row, + dimension_type start_j, + dimension_type& j) { + dimension_type num_cols = tableau.num_columns(); + bool has_positive_coefficient = false; + + j = num_cols; + for (dimension_type j_ = start_j; j_ < num_cols; ++j_) { + const Coefficient& c = pivot_row[j_]; + if (c <= 0) + continue; + has_positive_coefficient = true; + if (j == num_cols + || column_lower(tableau, mapping, basis, pivot_row, j_, pivot_row, j)) + j = j_; + } + return has_positive_coefficient; +} + + + } // namespace namespace IO_Operators { @@ -1386,45 +1459,14 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, std::cout << "Found row with negative parameters: " << i_ << std::endl; #endif - dimension_type k; - const Row& row = tableau.s[i_]; - PPL_DIRTY_TEMP_COEFFICIENT(sij); - PPL_DIRTY_TEMP_COEFFICIENT(cij); - PPL_DIRTY_TEMP_COEFFICIENT(cij_); /* Look for a positive S_ij such as the j^th column/S_ij is lexico-minimal */ - dimension_type j_ = n_a_d; - for (j=0; j<num_vars; ++j) { - if (row[j] > 0) { - if (j_ == n_a_d) { - j_ = j; - sij = row[j]; - } else { - /* Determine which column (j or j_) is lexico-minimal */ - dimension_type k = 0; - do { - dimension_type mk = mapping[k]; - if (basis[k]) { - /* reconstitute the identity submatrix part of S */ - cij = (mk==j) ? tableau.get_denominator() : 0; - cij_ = (mk==j_) ? tableau.get_denominator() : 0; - } else { - cij = tableau.s[mk][j]; - cij_ = tableau.s[mk][j_]; - } - ++k; - } while (k < num_vars && cij * sij == cij_ * row[j]); - if (k < num_vars && cij * sij < cij_ * row[j]) { - j_ = j; - sij = row[j]; - } - } - } - } - - /* If no positive S_ij: problem is empty */ - if (j_ == n_a_d) { + PPL_DIRTY_TEMP_COEFFICIENT(sij); + dimension_type j_; + if (!find_lexico_minimum_column(tableau.s, mapping, basis, + tableau.s[i_], 0, j_)) { + /* If no positive S_ij: problem is empty */ #ifdef NOISY_PIP std::cout << "No positive pivot found: Solution = _|_" << std::endl; @@ -1433,6 +1475,7 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, delete this; return UNFEASIBLE_PIP_PROBLEM; } + sij = tableau.s[i_][j_]; #ifdef NOISY_PIP std::cout << "Pivot column: " << j_ << std::endl; @@ -1464,6 +1507,7 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, sij_denom = tableau.get_denominator(); /* Compute columns s[*][j] : s[k][j] -= s[k][j_] * prs[j] / sij */ PPL_DIRTY_TEMP_COEFFICIENT(scale_factor); + dimension_type k; for (j=0; j<num_vars; ++j) { if (j==j_) continue;

1 0

[GIT] ppl/ppl(pip): Removed useless utility function.
by François Galea 26 Nov '09

26 Nov '09

Module: ppl/ppl Branch: pip Commit: 3c903922ece89f223620dd56311d4ef7ea1882a2 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3c903922ece8… Author: François Galea <francois.galea(a)uvsq.fr> Date: Wed Nov 25 17:26:20 2009 +0100 Removed useless utility function. --- src/PIP_Tree.cc | 27 ++------------------------- 1 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index de77be6..df37fe9 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -112,29 +112,6 @@ update_context(Variables_Set &params, Matrix &context, } } -void -row_normalize(Row& x) { - dimension_type size = x.size(); - if (size == 0) - return; - dimension_type j; - PPL_DIRTY_TEMP_COEFFICIENT(gcd); - gcd = x[0]; - for (j=1; j<size; ++j) { - const Coefficient& c = x[j]; - if (c != 0) { - gcd_assign(gcd, c, gcd); - if (gcd == 1) - return; - } - } - // Divide the coefficients by the GCD. - for (j=0; j<size; ++j) { - Coefficient& c = x[j]; - exact_div_assign(c, c, gcd); - } -} - } // namespace namespace IO_Operators { @@ -1605,7 +1582,7 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, << std::endl; #endif Row r(tableau.t[i]); - row_normalize(r); + r.normalize(); context.add_row(r); add_constraint(r, parameters); sign[i] = POSITIVE; @@ -1639,7 +1616,7 @@ PIP_Solution_Node::solve(PIP_Tree_Node*& parent_ref, i__ = best_i; Row test(tableau.t[i__]); - row_normalize(test); + test.normalize(); #ifdef NOISY_PIP { using namespace IO_Operators;

1 0