From fd219abe8c3ce297aaa11c8d766a37477ee73f98 Mon Sep 17 00:00:00 2001 From: Lev Nachmanson Date: Wed, 25 Mar 2020 18:50:53 -0700 Subject: [PATCH] fix test build Signed-off-by: Lev Nachmanson --- src/test/lp/gomory_test.h | 2 +- src/test/lp/lp.cpp | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/test/lp/gomory_test.h b/src/test/lp/gomory_test.h index fdf62d992..f7dc52b05 100644 --- a/src/test/lp/gomory_test.h +++ b/src/test/lp/gomory_test.h @@ -187,7 +187,7 @@ struct gomory_test { void print_term(lar_term & t, std::ostream & out) { vector> row; for (auto p : t) - row.push_back(std::make_pair(p.coeff(), p.var())); + row.push_back(std::make_pair(p.coeff(), p.var().index())); print_row(out, row); } diff --git a/src/test/lp/lp.cpp b/src/test/lp/lp.cpp index 5ac0121a1..1d2bef52d 100644 --- a/src/test/lp/lp.cpp +++ b/src/test/lp/lp.cpp @@ -44,7 +44,7 @@ #include "math/lp/numeric_pair.h" #include "math/lp/binary_heap_upair_queue.h" #include "math/lp/stacked_value.h" -#include "math/lp/int_set.h" +#include "math/lp/u_set.h" #include "util/stopwatch.h" #include #include "test/lp/gomory_test.h" @@ -3219,19 +3219,16 @@ void test_bound_propagation() { } void test_int_set() { - int_set s(4); + u_set s(4); s.insert(2); - s.print(std::cout); s.insert(1); s.insert(2); - s.print(std::cout); lp_assert(s.contains(2)); lp_assert(s.size() == 2); s.erase(2); lp_assert(s.size() == 1); s.erase(2); lp_assert(s.size() == 1); - s.print(std::cout); s.insert(3); s.insert(2); s.clear();