michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tests/interval): use new lean_assert and lean_assert_eq

Browse source
This commit is contained in:
Soonho Kong 2013-09-25 18:40:45 -07:00
parent 9f0dab1add
commit 475338080f
2 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/tests/interval/check.h
View file

@ -23,10 +23,10 @@ void check_interval_bop(std::string const & fname, std::string const & varname,
numeric_traits<T1>::set_rounding(true); numeric_traits<T1>::set_rounding(true);
f(lu, c); f(lu, c);
cout << "\t" << fname << "(" << i.lower() << ", " << c << ") = [" << ll << ", " << lu << "]"<< endl; cout << "\t" << fname << "(" << i.lower() << ", " << c << ") = [" << ll << ", " << lu << "]"<< endl;
lean_assert((r.is_lower_inf() || r.lower() <= ll) && lean_assert(r.is_lower_inf() || r.lower() <= ll, r, ll);
(r.is_upper_inf() || ll <= r.upper())); lean_assert(r.is_lower_inf() || r.lower() <= lu, r, lu);
lean_assert(r.is_lower_inf() || lean_assert(r.is_upper_inf() || ll <= r.upper(), r, ll);
((r.lower() <= lu) && (r.is_upper_inf() || (lu <= r.upper())))); lean_assert(r.is_upper_inf() || lu <= r.upper(), r, lu);
} }
if (!i.is_upper_inf()) { if (!i.is_upper_inf()) {
T1 ul = i.upper(); T1 ul = i.upper();
@ -36,10 +36,10 @@ void check_interval_bop(std::string const & fname, std::string const & varname,
numeric_traits<T1>::set_rounding(true); numeric_traits<T1>::set_rounding(true);
f(uu, c); f(uu, c);
cout << "\t" << fname << "(" << i.upper() << ", " << c << ") = [" << ul << ", " << uu << "]" << endl; cout << "\t" << fname << "(" << i.upper() << ", " << c << ") = [" << ul << ", " << uu << "]" << endl;
lean_assert((r.is_lower_inf() || r.lower() <= ul) && lean_assert(r.is_lower_inf() || r.lower() <= ul, r, ul);
(r.is_upper_inf() || ul <= r.upper())); lean_assert(r.is_lower_inf() || r.lower() <= uu, r, uu);
lean_assert((r.is_lower_inf() || r.lower() <= uu) && lean_assert(r.is_upper_inf() || ul <= r.upper(), r, ul);
(r.is_upper_inf() || uu <= r.upper())); lean_assert(r.is_upper_inf() || uu <= r.upper(), r, uu);
} }
} }
@ -56,10 +56,10 @@ void check_interval_uop(std::string const & fname, std::string const & varname,
numeric_traits<T>::set_rounding(true); numeric_traits<T>::set_rounding(true);
f(lu); f(lu);
cout << "\t" << fname << "(" << i.lower() << ") = [" << ll << ", " << lu << "]"<< endl; cout << "\t" << fname << "(" << i.lower() << ") = [" << ll << ", " << lu << "]"<< endl;
lean_assert((r.is_lower_inf() || r.lower() <= ll) && lean_assert(r.is_lower_inf() || r.lower() <= ll, r, ll);
(r.is_upper_inf() || ll <= r.upper())); lean_assert(r.is_lower_inf() || r.lower() <= lu, r, lu);
lean_assert(r.is_lower_inf() || lean_assert(r.is_upper_inf() || ll <= r.upper(), r, ll);
((r.lower() <= lu) && (r.is_upper_inf() || (lu <= r.upper())))); lean_assert(r.is_upper_inf() || lu <= r.upper(), r, lu);
} }
if (!i.is_upper_inf()) { if (!i.is_upper_inf()) {
T ul = i.upper(); T ul = i.upper();
@ -69,10 +69,10 @@ void check_interval_uop(std::string const & fname, std::string const & varname,
numeric_traits<T>::set_rounding(true); numeric_traits<T>::set_rounding(true);
f(uu); f(uu);
cout << "\t" << fname << "(" << i.upper() << ") = [" << ul << ", " << uu << "]" << endl; cout << "\t" << fname << "(" << i.upper() << ") = [" << ul << ", " << uu << "]" << endl;
lean_assert((r.is_lower_inf() || r.lower() <= ul) && lean_assert(r.is_lower_inf() || r.lower() <= ul, r, ul);
(r.is_upper_inf() || ul <= r.upper())); lean_assert(r.is_lower_inf() || r.lower() <= uu, r, uu);
lean_assert((r.is_lower_inf() || r.lower() <= uu) && lean_assert(r.is_upper_inf() || ul <= r.upper(), r, ul);
(r.is_upper_inf() || uu <= r.upper())); lean_assert(r.is_upper_inf() || uu <= r.upper(), r, uu);
} }
} }

46
src/tests/interval/interval.cpp
View file

@ -39,18 +39,18 @@ static void tst1() {
qi t(1, 3); qi t(1, 3);
std::cout << t + qi(2, 4, false, true) << "\n"; std::cout << t + qi(2, 4, false, true) << "\n";
std::cout << t << " --> " << inv(t) << "\n"; std::cout << t << " --> " << inv(t) << "\n";
lean_assert(neg(t) == qi(-3, -1)); lean_assert_eq(neg(t), qi(-3, -1));
lean_assert(neg(neg(t)) == t); lean_assert_eq(neg(neg(t)), t);
lean_assert(qi(1, 2) + qi(2, 3) == qi(3, 5)); lean_assert_eq(qi(1, 2) + qi(2, 3), qi(3, 5));
lean_assert(qi(1, 5) + qi(-2, -3) == qi(-1, 2)); lean_assert_eq(qi(1, 5) + qi(-2, -3), qi(-1, 2));
for (auto i1 : mk_some_intervals(-2, 2)) for (auto i1 : mk_some_intervals(-2, 2))
for (auto i2 : mk_some_intervals(-2, 2)) { for (auto i2 : mk_some_intervals(-2, 2)) {
auto r = i1 + i2; auto r = i1 + i2;
auto s = i1; auto s = i1;
s += i2; s += i2;
lean_assert(r == s); lean_assert_eq(r, s);
lean_assert(r.lower() == i1.lower() + i2.lower()); lean_assert_eq(r.lower(), i1.lower() + i2.lower());
lean_assert(r.upper() == i1.upper() + i2.upper()); lean_assert_eq(r.upper(), i1.upper() + i2.upper());
lean_assert(r.is_lower_open() == i1.is_lower_open() || i2.is_lower_open()); lean_assert(r.is_lower_open() == i1.is_lower_open() || i2.is_lower_open());
lean_assert(r.is_upper_open() == i1.is_upper_open() || i2.is_upper_open()); lean_assert(r.is_upper_open() == i1.is_upper_open() || i2.is_upper_open());
r -= i2; r -= i2;
@ -58,9 +58,9 @@ static void tst1() {
r = i1 - i2; r = i1 - i2;
s = i1; s = i1;
s -= i2; s -= i2;
lean_assert(r == s); lean_assert_eq(r, s);
lean_assert(r.lower() == i1.lower() - i2.upper()); lean_assert_eq(r.lower(), i1.lower() - i2.upper());
lean_assert(r.upper() == i1.upper() - i2.lower()); lean_assert_eq(r.upper(), i1.upper() - i2.lower());
lean_assert(r.is_lower_open() == i1.is_lower_open() || i2.is_upper_open()); lean_assert(r.is_lower_open() == i1.is_lower_open() || i2.is_upper_open());
lean_assert(r.is_upper_open() == i1.is_upper_open() || i2.is_lower_open()); lean_assert(r.is_upper_open() == i1.is_upper_open() || i2.is_lower_open());
r -= r; r -= r;
@ -68,9 +68,9 @@ static void tst1() {
r = i1 * i2; r = i1 * i2;
s = i1; s = i1;
s *= i2; s *= i2;
lean_assert(r == s); lean_assert_eq(r, s);
lean_assert(r.lower() == std::min(i1.lower()*i2.lower(), std::min(i1.lower()*i2.upper(), std::min(i1.upper()*i2.lower(), i1.upper()*i2.upper())))); lean_assert_eq(r.lower(), std::min(i1.lower()*i2.lower(), std::min(i1.lower()*i2.upper(), std::min(i1.upper()*i2.lower(), i1.upper()*i2.upper()))));
lean_assert(r.upper() == std::max(i1.lower()*i2.lower(), std::max(i1.lower()*i2.upper(), std::max(i1.upper()*i2.lower(), i1.upper()*i2.upper())))); lean_assert_eq(r.upper(), std::max(i1.lower()*i2.lower(), std::max(i1.lower()*i2.upper(), std::max(i1.upper()*i2.lower(), i1.upper()*i2.upper()))));
} }
lean_assert(qi(1, 3).before(qi(4, 6))); lean_assert(qi(1, 3).before(qi(4, 6)));
lean_assert(!qi(1, 3).before(qi(3, 6))); lean_assert(!qi(1, 3).before(qi(3, 6)));
@ -78,17 +78,17 @@ static void tst1() {
} }
static void tst2() { static void tst2() {
lean_assert(power(qi(2, 3), 2) == qi(4, 9)); lean_assert_eq(power(qi(2, 3), 2), qi(4, 9));
lean_assert(power(qi(-2, 3), 2) == qi(0, 9)); lean_assert_eq(power(qi(-2, 3), 2), qi(0, 9));
lean_assert(power(qi(true, -2, 3, true), 2) == qi(false, 0, 9, true)); lean_assert_eq(power(qi(true, -2, 3, true), 2), qi(false, 0, 9, true));
lean_assert(power(qi(true, -4, 3, true), 2) == qi(false, 0, 16, true)); lean_assert_eq(power(qi(true, -4, 3, true), 2), qi(false, 0, 16, true));
lean_assert(power(qi(-3, -2), 2) == qi(4, 9)); lean_assert_eq(power(qi(-3, -2), 2), qi(4, 9));
std::cout << power(qi(false, -3, -2, true), 2) << " --> " << qi(true, 4, 9, false) << "\n"; std::cout << power(qi(false, -3, -2, true), 2) << " --> " << qi(true, 4, 9, false) << "\n";
lean_assert(power(qi(false, -3, -2, true), 2) == qi(true, 4, 9, false)); lean_assert_eq(power(qi(false, -3, -2, true), 2), qi(true, 4, 9, false));
lean_assert(power(qi(-3, -1), 3) == qi(-27, -1)); lean_assert_eq(power(qi(-3, -1), 3), qi(-27, -1));
lean_assert(power(qi(-3, 4), 3) == qi(-27, 64)); lean_assert_eq(power(qi(-3, 4), 3), qi(-27, 64));
lean_assert(power(qi(), 3) == qi()); lean_assert_eq(power(qi(), 3), qi());
lean_assert(power(qi(), 2) == qi(false, 0)); // (-oo, oo)^2 == [0, oo) lean_assert_eq(power(qi(), 2), qi(false, 0)); // (-oo, oo)^2 == [0, oo)
} }
int main() { int main() {