- PPL-devel - BUGSENG Mailman

[GIT] ppl/ppl(pip): Corrected expected results.
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: bb08fb49f561adff12634ec0468d0138f0913533 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bb08fb49f561… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 10 18:46:41 2011 +0100 Corrected expected results. --- demos/ppl_pips/expected_int16 | 16 ++++++++-------- demos/ppl_pips/expected_int16_a | 16 ++++++++-------- demos/ppl_pips/expected_int32 | 20 ++++++++++---------- demos/ppl_pips/expected_int32_a | 20 ++++++++++---------- demos/ppl_pips/expected_int64 | 22 +++++++++++----------- demos/ppl_pips/expected_int64_a | 22 +++++++++++----------- demos/ppl_pips/expected_int8 | 8 ++++---- demos/ppl_pips/expected_int8_a | 8 ++++---- demos/ppl_pips/expected_mpz | 8 ++++---- demos/ppl_pips/expected_mpz_a | 8 ++++---- 10 files changed, 74 insertions(+), 74 deletions(-) Diff: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commitdiff;h=bb08fb49…

1 0

[GIT] ppl/ppl(pip): Fixed stream state on checked input.
by Abramo Bagnara 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: d0f6bd037c90676130e9547e5ed909cf6ba8eee9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d0f6bd037c90… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 10 16:47:22 2011 +0100 Fixed stream state on checked input. --- src/checked.cc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index 34c84c2..e428109 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -337,6 +337,11 @@ input_mpq(mpq_class& to, std::istream& is) { number_struct num_struct; number_struct den_struct; Result r = parse_number(is, num_struct, den_struct); + if (r == V_CVT_STR_UNK) { + is.setstate(is.failbit); + return r; + } + is.clear(is.rdstate() & ~is.failbit); if (r != V_EQ) return r; if (den_struct.base && den_struct.mantissa.empty())

1 0

[GIT] ppl/ppl(master): Fixed stream state on checked input.
by Abramo Bagnara 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: master Commit: d0f6bd037c90676130e9547e5ed909cf6ba8eee9 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d0f6bd037c90… Author: Abramo Bagnara <abramo.bagnara(a)gmail.com> Date: Thu Feb 10 16:47:22 2011 +0100 Fixed stream state on checked input. --- src/checked.cc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/checked.cc b/src/checked.cc index 34c84c2..e428109 100644 --- a/src/checked.cc +++ b/src/checked.cc @@ -337,6 +337,11 @@ input_mpq(mpq_class& to, std::istream& is) { number_struct num_struct; number_struct den_struct; Result r = parse_number(is, num_struct, den_struct); + if (r == V_CVT_STR_UNK) { + is.setstate(is.failbit); + return r; + } + is.clear(is.rdstate() & ~is.failbit); if (r != V_EQ) return r; if (den_struct.base && den_struct.mantissa.empty())

1 0

[GIT] ppl/ppl(pip): Merge branch 'master' into pip
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: b86cb60dbf7774131f5739879beff3015decbce5 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b86cb60dbf77… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 10 10:49:20 2011 +0100 Merge branch 'master' into pip ---

1 0

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

10 Feb '11

Module: ppl/ppl Branch: pip 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(pip): Polyhedron: fix an invalid reference bug in generalized_affine_image().
by Marco Poletti 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip 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(pip): Grid: avoid using an invalid reference in the constructor from a Box.
by Marco Poletti 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip 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): Corrected the expected result for test02 to match integral simplifications .
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: 3c8f16e240439811d501629660cedb8f99f0009a URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3c8f16e24043… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 10 10:47:59 2011 +0100 Corrected the expected result for test02 to match integral simplifications. --- tests/PIP_Problem/pipproblem1.cc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/PIP_Problem/pipproblem1.cc b/tests/PIP_Problem/pipproblem1.cc index b69a5d3..98ea9b0 100644 --- a/tests/PIP_Problem/pipproblem1.cc +++ b/tests/PIP_Problem/pipproblem1.cc @@ -90,9 +90,9 @@ test02() { return false; const Constraint& c = *cs.begin(); if (!(c.is_inequality() - && c.coefficient(n) == 7 + && c.coefficient(n) == 1 && c.coefficient(m) == 0 - && c.inhomogeneous_term() == -10)) + && c.inhomogeneous_term() == -2)) return false; } if (root->child_node(true) == 0 || root->child_node(false) != 0) @@ -110,8 +110,8 @@ test02() { const Constraint& c = *cs.begin(); if (!(c.is_inequality() && c.coefficient(n) == 0 - && c.coefficient(m) == 7 - && c.inhomogeneous_term() == -12)) + && c.coefficient(m) == 1 + && c.inhomogeneous_term() == -2)) return false; // Dummy print of (non-root) tree node to increase code coverage. using namespace IO_Operators;

1 0

[GIT] ppl/ppl(pip): Exploit variable integrality when creating tautology constraints.
by Enea Zaffanella 10 Feb '11

10 Feb '11

Module: ppl/ppl Branch: pip Commit: 0e4098c48d6fe9daae9d405112df1aac7ed66742 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0e4098c48d6f… Author: Enea Zaffanella <zaffanella(a)cs.unipr.it> Date: Thu Feb 10 10:46:03 2011 +0100 Exploit variable integrality when creating tautology constraints. Factored out helper function void integral_simplification(Row&); used when generating tautology and sign splitting constraints. --- src/PIP_Tree.cc | 67 ++++++++++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 30 deletions(-) diff --git a/src/PIP_Tree.cc b/src/PIP_Tree.cc index 1a21047..38a30e5 100644 --- a/src/PIP_Tree.cc +++ b/src/PIP_Tree.cc @@ -488,6 +488,33 @@ gcd_assign_iter(Coefficient& gcd, Iter first, Iter last) { } } +// Simplify row by exploiting variable integrality. +void +integral_simplification(Row& row) { + if (row[0] != 0) { + Row::const_iterator j_begin = row.begin(); + Row::const_iterator j_end = row.end(); + PPL_ASSERT(j_begin != j_end && j_begin.index() == 0 && *j_begin != 0); + /* Find next column with a non-zero value (there should be one). */ + ++j_begin; + PPL_ASSERT(j_begin != j_end); + for ( ; *j_begin == 0; ++j_begin) + PPL_ASSERT(j_begin != j_end); + /* Use it to initialize gcd. */ + PPL_DIRTY_TEMP_COEFFICIENT(gcd); + gcd = *j_begin; + ++j_begin; + gcd_assign_iter(gcd, j_begin, j_end); + if (gcd != 1) { + PPL_DIRTY_TEMP_COEFFICIENT(mod); + pos_mod_assign(mod, row[0], gcd); + row[0] -= mod; + } + } + /* Final normalization. */ + row.normalize(); +} + // Divide all coefficients in row x and denominator y by their GCD. void row_normalize(Row& x, Coefficient& den) { @@ -2730,25 +2757,26 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, } if (i_neg != not_a_dim) { - Row copy = tableau.t[i_neg]; - copy.normalize(); - context.add_row(copy); - add_constraint(copy, all_params); + Row tautology = tableau.t[i_neg]; + /* Simplify tautology by exploiting integrality. */ + integral_simplification(tautology); + context.add_row(tautology); + add_constraint(tautology, all_params); sign[i_neg] = POSITIVE; #ifdef NOISY_PIP { - Linear_Expression expr = Linear_Expression(copy.get(0)); + Linear_Expression expr = Linear_Expression(tautology.get(0)); dimension_type j = 1; for (Variables_Set::const_iterator p = all_params.begin(), p_end = all_params.end(); p != p_end; ++p, ++j) - add_mul_assign(expr, copy.get(j), Variable(*p)); - Constraint tautology(expr >= 0); + add_mul_assign(expr, tautology.get(j), Variable(*p)); using namespace IO_Operators; std::cerr << std::setw(2 * indent_level) << "" << "Row " << i_neg << ": mixed param sign, negative var coeffs\n"; std::cerr << std::setw(2 * indent_level) << "" - << "==> adding tautology: " << tautology << ".\n"; + << "==> adding tautology: " + << Constraint(expr >= 0) << ".\n"; } #endif // #ifdef NOISY_PIP // Jump to next iteration. @@ -2776,28 +2804,7 @@ PIP_Solution_Node::solve(const PIP_Problem& pip, Row t_test(tableau.t[best_i]); /* Simplify t_test by exploiting integrality. */ - if (t_test[0] != 0) { - Row::const_iterator j_begin = t_test.begin(); - Row::const_iterator j_end = t_test.end(); - PPL_ASSERT(j_begin != j_end && j_begin.index() == 0 && *j_begin != 0); - /* Find next column with a non-zero value (there should be one). */ - ++j_begin; - PPL_ASSERT(j_begin != j_end); - for ( ; *j_begin == 0; ++j_begin) - PPL_ASSERT(j_begin != j_end); - /* Use it to initialize gcd. */ - PPL_DIRTY_TEMP_COEFFICIENT(gcd); - gcd = *j_begin; - ++j_begin; - gcd_assign_iter(gcd, j_begin, j_end); - if (gcd != 1) { - PPL_DIRTY_TEMP_COEFFICIENT(mod); - pos_mod_assign(mod, t_test[0], gcd); - t_test[0] -= mod; - } - } - /* Normalize t_test. */ - t_test.normalize(); + integral_simplification(t_test); #ifdef NOISY_PIP {

1 0

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

09 Feb '11

URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5d8f155f5a01… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Feb 9 00:25:35 2011 +0100 Linear_System: make protected methods and fields private. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=ae8338d88ffd… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Feb 9 00:25:28 2011 +0100 Linear_System: 'iterator' does not allow to modify rows anymore. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=987662e2bd29… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Feb 9 00:25:04 2011 +0100 Linear_System, Constraint_System, Generator_System, Grid_Generator_System: remove the non-const operator[]. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=5cba657b8de1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Feb 9 00:24:20 2011 +0100 Grid: avoid using the non-const Linear_System::operator[], in the constructor from a Box. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8c1b17b92fe1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Wed Feb 9 00:06:50 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in generalized_affine_image() (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d01b4467d360… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 23:53:57 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in topological_closure_assign(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=9eaf3ffc4c12… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 23:52:20 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in time_elapse_assign(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8a23adaac4c8… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 23:46:26 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in generalized_affine_image(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=6eca39a48dd1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 23:25:27 2011 +0100 Generator_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=5cfd7ac32782… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 22:38:26 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in add_recycled_generators(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=c2c759bd162a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 22:29:12 2011 +0100 Polyhedron: prefer const references to non-const ones. URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=34240fb916a3… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 22:27:28 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in add_generator(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bf90bd70c5dc… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 22:18:52 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in drop_some_non_integer_points(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d3061d2cfa20… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 22:15:33 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in strongly_minimize_constraints(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=58664a0a5c42… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 22:06:22 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in concatenate_assign() (#2). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b997c0acc4b9… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 22:00:48 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in concatenate_assign(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=b3f9f696b6d4… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 21:53:09 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in add_space_dimensions_and_project(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=3974a2029be1… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 21:49:08 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in add_space_dimensions_and_embed(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=10282f29c959… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 21:44:09 2011 +0100 Polyhedron: use Linear_System::swap_rows() when needed, in simplify(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8be6b90e6b6a… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 21:35:18 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in simplify(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=4a00e13b9305… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 19:46:54 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in minimize(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=544fc56fc85b… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 19:42:39 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in conversion(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=d0dffc9ccd5d… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 19:09:39 2011 +0100 Polyhedron: avoid using the non-const Linear_System::operator[], in add_space_dimensions(). URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=e402376c61fa… Author: Marco Poletti <poletti.marco(a)gmail.com> Date: Tue Feb 8 10:52:13 2011 +0100 Polyhedron: fix an efficiency bug introduced in commit 436f43.

1 0