[mlpack-svn] r10828 - mlpack/trunk/src/mlpack/tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Thu Dec 15 02:50:43 EST 2011
Author: rcurtin
Date: 2011-12-15 02:50:42 -0500 (Thu, 15 Dec 2011)
New Revision: 10828
Modified:
mlpack/trunk/src/mlpack/tests/math_test.cpp
mlpack/trunk/src/mlpack/tests/tree_test.cpp
Log:
Update tests to use accessors and mutators for math::Range.
Modified: mlpack/trunk/src/mlpack/tests/math_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/math_test.cpp 2011-12-15 07:50:12 UTC (rev 10827)
+++ mlpack/trunk/src/mlpack/tests/math_test.cpp 2011-12-15 07:50:42 UTC (rev 10828)
@@ -22,7 +22,7 @@
Range x = Range();
// Just verify that it is empty.
- BOOST_REQUIRE_GT(x.lo, x.hi);
+ BOOST_REQUIRE_GT(x.Lo(), x.Hi());
}
/**
@@ -33,10 +33,10 @@
{
Range x(10.0);
- BOOST_REQUIRE_CLOSE(x.lo, x.hi, 1e-25);
+ BOOST_REQUIRE_CLOSE(x.Lo(), x.Hi(), 1e-25);
BOOST_REQUIRE_SMALL(x.Width(), 1e-5);
- BOOST_REQUIRE_CLOSE(x.lo, 10.0, 1e-25);
- BOOST_REQUIRE_CLOSE(x.hi, 10.0, 1e-25);
+ BOOST_REQUIRE_CLOSE(x.Lo(), 10.0, 1e-25);
+ BOOST_REQUIRE_CLOSE(x.Hi(), 10.0, 1e-25);
}
/**
@@ -46,8 +46,8 @@
{
Range x(0.5, 5.5);
- BOOST_REQUIRE_CLOSE(x.lo, 0.5, 1e-25);
- BOOST_REQUIRE_CLOSE(x.hi, 5.5, 1e-25);
+ BOOST_REQUIRE_CLOSE(x.Lo(), 0.5, 1e-25);
+ BOOST_REQUIRE_CLOSE(x.Hi(), 5.5, 1e-25);
}
/**
@@ -60,18 +60,18 @@
BOOST_REQUIRE_CLOSE(x.Width(), 10.0, 1e-20);
// Make it empty.
- x.hi = 0.0;
+ x.Hi() = 0.0;
BOOST_REQUIRE_SMALL(x.Width(), 1e-5);
// Make it negative.
- x.hi = -2.0;
+ x.Hi() = -2.0;
BOOST_REQUIRE_SMALL(x.Width(), 1e-5);
// Just one more test.
- x.lo = -5.2;
- x.hi = 5.2;
+ x.Lo() = -5.2;
+ x.Hi() = 5.2;
BOOST_REQUIRE_CLOSE(x.Width(), 10.4, 1e-5);
}
@@ -85,7 +85,7 @@
BOOST_REQUIRE_CLOSE(x.Mid(), 5.0, 1e-5);
- x.lo = -5.0;
+ x.Lo() = -5.0;
BOOST_REQUIRE_CLOSE(x.Mid(), 2.5, 1e-5);
}
@@ -106,20 +106,20 @@
z |= y;
w = x | y;
- BOOST_REQUIRE_SMALL(z.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 5.0, 1e-5);
- BOOST_REQUIRE_SMALL(w.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 5.0, 1e-5);
+ BOOST_REQUIRE_SMALL(z.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 5.0, 1e-5);
+ BOOST_REQUIRE_SMALL(w.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 5.0, 1e-5);
// Switch operator precedence.
z = y;
z |= x;
w = y | x;
- BOOST_REQUIRE_SMALL(z.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 5.0, 1e-5);
- BOOST_REQUIRE_SMALL(w.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 5.0, 1e-5);
+ BOOST_REQUIRE_SMALL(z.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 5.0, 1e-5);
+ BOOST_REQUIRE_SMALL(w.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 5.0, 1e-5);
// Now make them overlapping.
x = Range(0.0, 3.5);
@@ -129,20 +129,20 @@
z |= y;
w = x | y;
- BOOST_REQUIRE_SMALL(z.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 4.0, 1e-5);
- BOOST_REQUIRE_SMALL(w.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 4.0, 1e-5);
+ BOOST_REQUIRE_SMALL(z.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 4.0, 1e-5);
+ BOOST_REQUIRE_SMALL(w.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 4.0, 1e-5);
// Switch operator precedence.
z = y;
z |= x;
w = y | x;
- BOOST_REQUIRE_SMALL(z.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 4.0, 1e-5);
- BOOST_REQUIRE_SMALL(w.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 4.0, 1e-5);
+ BOOST_REQUIRE_SMALL(z.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 4.0, 1e-5);
+ BOOST_REQUIRE_SMALL(w.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 4.0, 1e-5);
// Now the equivalent case.
x = Range(0.0, 2.0);
@@ -152,19 +152,19 @@
z |= y;
w = x | y;
- BOOST_REQUIRE_SMALL(z.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 2.0, 1e-5);
- BOOST_REQUIRE_SMALL(w.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 2.0, 1e-5);
+ BOOST_REQUIRE_SMALL(z.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_SMALL(w.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 2.0, 1e-5);
z = y;
z |= x;
w = y | x;
- BOOST_REQUIRE_SMALL(z.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 2.0, 1e-5);
- BOOST_REQUIRE_SMALL(w.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 2.0, 1e-5);
+ BOOST_REQUIRE_SMALL(z.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_SMALL(w.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 2.0, 1e-5);
}
/**
@@ -202,20 +202,20 @@
z &= y;
w = x & y;
- BOOST_REQUIRE_CLOSE(z.lo, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 3.5, 1e-5);
- BOOST_REQUIRE_CLOSE(w.lo, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 3.5, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Lo(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 3.5, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Lo(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 3.5, 1e-5);
// Reverse operator precedence.
z = y;
z &= x;
w = y & x;
- BOOST_REQUIRE_CLOSE(z.lo, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 3.5, 1e-5);
- BOOST_REQUIRE_CLOSE(w.lo, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 3.5, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Lo(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 3.5, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Lo(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 3.5, 1e-5);
// Now make them equivalent.
x = Range(2.0, 4.0);
@@ -225,10 +225,10 @@
z &= y;
w = x & y;
- BOOST_REQUIRE_CLOSE(z.lo, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.lo, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Lo(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Lo(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 4.0, 1e-5);
}
/**
@@ -251,36 +251,36 @@
z = x * -1.0;
w = -1.0 * x;
- BOOST_REQUIRE_CLOSE(y.lo, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(y.hi, 5.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.lo, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 5.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.lo, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Lo(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Hi(), 5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Lo(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Lo(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 5.0, 1e-5);
y = x;
y *= 0.0;
z = x * 0.0;
w = 0.0 * x;
- BOOST_REQUIRE_SMALL(y.lo, 1e-5);
- BOOST_REQUIRE_SMALL(y.hi, 1e-5);
- BOOST_REQUIRE_SMALL(z.lo, 1e-5);
- BOOST_REQUIRE_SMALL(z.hi, 1e-5);
- BOOST_REQUIRE_SMALL(w.lo, 1e-5);
- BOOST_REQUIRE_SMALL(w.hi, 1e-5);
+ BOOST_REQUIRE_SMALL(y.Lo(), 1e-5);
+ BOOST_REQUIRE_SMALL(y.Hi(), 1e-5);
+ BOOST_REQUIRE_SMALL(z.Lo(), 1e-5);
+ BOOST_REQUIRE_SMALL(z.Hi(), 1e-5);
+ BOOST_REQUIRE_SMALL(w.Lo(), 1e-5);
+ BOOST_REQUIRE_SMALL(w.Hi(), 1e-5);
y = x;
y *= 2.0;
z = x * 2.0;
w = 2.0 * x;
- BOOST_REQUIRE_CLOSE(y.lo, -10.0, 1e-5);
- BOOST_REQUIRE_CLOSE(y.hi, -6.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.lo, -10.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, -6.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.lo, -10.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, -6.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Lo(), -10.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Hi(), -6.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Lo(), -10.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), -6.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Lo(), -10.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), -6.0, 1e-5);
x = Range(-2.0, 2.0);
y = x;
@@ -289,36 +289,36 @@
z = x * -1.0;
w = -1.0 * x;
- BOOST_REQUIRE_CLOSE(y.lo, -2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(y.hi, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.lo, -2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.lo, -2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Lo(), -2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Lo(), -2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Lo(), -2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 2.0, 1e-5);
y = x;
y *= 0.0;
z = x * 0.0;
w = 0.0 * x;
- BOOST_REQUIRE_SMALL(y.lo, 1e-5);
- BOOST_REQUIRE_SMALL(y.hi, 1e-5);
- BOOST_REQUIRE_SMALL(z.lo, 1e-5);
- BOOST_REQUIRE_SMALL(z.hi, 1e-5);
- BOOST_REQUIRE_SMALL(w.lo, 1e-5);
- BOOST_REQUIRE_SMALL(w.hi, 1e-5);
+ BOOST_REQUIRE_SMALL(y.Lo(), 1e-5);
+ BOOST_REQUIRE_SMALL(y.Hi(), 1e-5);
+ BOOST_REQUIRE_SMALL(z.Lo(), 1e-5);
+ BOOST_REQUIRE_SMALL(z.Hi(), 1e-5);
+ BOOST_REQUIRE_SMALL(w.Lo(), 1e-5);
+ BOOST_REQUIRE_SMALL(w.Hi(), 1e-5);
y = x;
y *= 2.0;
z = x * 2.0;
w = 2.0 * x;
- BOOST_REQUIRE_CLOSE(y.lo, -4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(y.hi, 4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.lo, -4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.lo, -4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Lo(), -4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Hi(), 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Lo(), -4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Lo(), -4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 4.0, 1e-5);
x = Range(3.0, 5.0);
@@ -327,36 +327,36 @@
z = x * -1.0;
w = -1.0 * x;
- BOOST_REQUIRE_CLOSE(y.lo, -5.0, 1e-5);
- BOOST_REQUIRE_CLOSE(y.hi, -3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.lo, -5.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, -3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.lo, -5.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, -3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Lo(), -5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Hi(), -3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Lo(), -5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), -3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Lo(), -5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), -3.0, 1e-5);
y = x;
y *= 0.0;
z = x * 0.0;
w = 0.0 * x;
- BOOST_REQUIRE_SMALL(y.lo, 1e-5);
- BOOST_REQUIRE_SMALL(y.hi, 1e-5);
- BOOST_REQUIRE_SMALL(z.lo, 1e-5);
- BOOST_REQUIRE_SMALL(z.hi, 1e-5);
- BOOST_REQUIRE_SMALL(w.lo, 1e-5);
- BOOST_REQUIRE_SMALL(w.hi, 1e-5);
+ BOOST_REQUIRE_SMALL(y.Lo(), 1e-5);
+ BOOST_REQUIRE_SMALL(y.Hi(), 1e-5);
+ BOOST_REQUIRE_SMALL(z.Lo(), 1e-5);
+ BOOST_REQUIRE_SMALL(z.Hi(), 1e-5);
+ BOOST_REQUIRE_SMALL(w.Lo(), 1e-5);
+ BOOST_REQUIRE_SMALL(w.Hi(), 1e-5);
y = x;
y *= 2.0;
z = x * 2.0;
w = 2.0 * x;
- BOOST_REQUIRE_CLOSE(y.lo, 6.0, 1e-5);
- BOOST_REQUIRE_CLOSE(y.hi, 10.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.lo, 6.0, 1e-5);
- BOOST_REQUIRE_CLOSE(z.hi, 10.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.lo, 6.0, 1e-5);
- BOOST_REQUIRE_CLOSE(w.hi, 10.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Lo(), 6.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(y.Hi(), 10.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Lo(), 6.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(z.Hi(), 10.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Lo(), 6.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(w.Hi(), 10.0, 1e-5);
}
/**
Modified: mlpack/trunk/src/mlpack/tests/tree_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/tree_test.cpp 2011-12-15 07:50:12 UTC (rev 10827)
+++ mlpack/trunk/src/mlpack/tests/tree_test.cpp 2011-12-15 07:50:42 UTC (rev 10828)
@@ -62,10 +62,10 @@
HRectBound<2> c(b);
BOOST_REQUIRE_EQUAL(c.Dim(), 2);
- BOOST_REQUIRE_SMALL(c[0].lo, 1e-5);
- BOOST_REQUIRE_CLOSE(c[0].hi, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(c[1].lo, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(c[1].hi, 3.0, 1e-5);
+ BOOST_REQUIRE_SMALL(c[0].Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(c[0].Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(c[1].Lo(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(c[1].Hi(), 3.0, 1e-5);
}
/**
@@ -82,10 +82,10 @@
c = b;
BOOST_REQUIRE_EQUAL(c.Dim(), 2);
- BOOST_REQUIRE_SMALL(c[0].lo, 1e-5);
- BOOST_REQUIRE_CLOSE(c[0].hi, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(c[1].lo, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(c[1].hi, 3.0, 1e-5);
+ BOOST_REQUIRE_SMALL(c[0].Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(c[0].Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(c[1].Lo(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(c[1].Hi(), 3.0, 1e-5);
}
/**
@@ -382,14 +382,14 @@
Range r = a.RangeDistance(b);
Range s = b.RangeDistance(a);
- BOOST_REQUIRE_CLOSE(r.lo, s.lo, 1e-5);
- BOOST_REQUIRE_CLOSE(r.hi, s.hi, 1e-5);
+ BOOST_REQUIRE_CLOSE(r.Lo(), s.Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(r.Hi(), s.Hi(), 1e-5);
- BOOST_REQUIRE_CLOSE(r.lo, a.MinDistance(b), 1e-5);
- BOOST_REQUIRE_CLOSE(r.hi, a.MaxDistance(b), 1e-5);
+ BOOST_REQUIRE_CLOSE(r.Lo(), a.MinDistance(b), 1e-5);
+ BOOST_REQUIRE_CLOSE(r.Hi(), a.MaxDistance(b), 1e-5);
- BOOST_REQUIRE_CLOSE(s.lo, b.MinDistance(a), 1e-5);
- BOOST_REQUIRE_CLOSE(s.hi, b.MaxDistance(a), 1e-5);
+ BOOST_REQUIRE_CLOSE(s.Lo(), b.MinDistance(a), 1e-5);
+ BOOST_REQUIRE_CLOSE(s.Hi(), b.MaxDistance(a), 1e-5);
}
}
@@ -428,8 +428,8 @@
Range r = a.RangeDistance(point);
- BOOST_REQUIRE_CLOSE(r.lo, a.MinDistance(point), 1e-5);
- BOOST_REQUIRE_CLOSE(r.hi, a.MaxDistance(point), 1e-5);
+ BOOST_REQUIRE_CLOSE(r.Lo(), a.MinDistance(point), 1e-5);
+ BOOST_REQUIRE_CLOSE(r.Hi(), a.MaxDistance(point), 1e-5);
}
}
}
@@ -453,16 +453,16 @@
b |= point;
- BOOST_REQUIRE_CLOSE(b[0].lo, 1.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[0].hi, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[1].lo, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[1].hi, 4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[2].lo, -2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[2].hi, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[3].lo, -1.0, 1e-5);
- BOOST_REQUIRE_SMALL(b[3].hi, 1e-5);
- BOOST_REQUIRE_CLOSE(b[4].lo, 6.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[4].hi, 6.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[0].Lo(), 1.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[0].Hi(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[1].Lo(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[1].Hi(), 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[2].Lo(), -2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[2].Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[3].Lo(), -1.0, 1e-5);
+ BOOST_REQUIRE_SMALL(b[3].Hi(), 1e-5);
+ BOOST_REQUIRE_CLOSE(b[4].Lo(), 6.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[4].Hi(), 6.0, 1e-5);
}
/**
@@ -499,45 +499,45 @@
b |= c;
d |= b;
- BOOST_REQUIRE_CLOSE(b[0].lo, -3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[0].hi, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[0].lo, -3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[0].hi, 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[0].Lo(), -3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[0].Hi(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[0].Lo(), -3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[0].Hi(), 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[1].lo, 0.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[1].hi, 4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[1].lo, 0.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[1].hi, 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[1].Lo(), 0.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[1].Hi(), 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[1].Lo(), 0.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[1].Hi(), 4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[2].lo, -3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[2].hi, -1.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[2].lo, -3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[2].hi, -1.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[2].Lo(), -3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[2].Hi(), -1.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[2].Lo(), -3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[2].Hi(), -1.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[3].lo, 4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[3].hi, 5.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[3].lo, 4.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[3].hi, 5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[3].Lo(), 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[3].Hi(), 5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[3].Lo(), 4.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[3].Hi(), 5.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[4].lo, 1.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[4].hi, 5.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[4].lo, 1.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[4].hi, 5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[4].Lo(), 1.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[4].Hi(), 5.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[4].Lo(), 1.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[4].Hi(), 5.0, 1e-5);
- BOOST_REQUIRE_SMALL(b[5].lo, 1e-5);
- BOOST_REQUIRE_CLOSE(b[5].hi, 2.0, 1e-5);
- BOOST_REQUIRE_SMALL(d[5].lo, 1e-5);
- BOOST_REQUIRE_CLOSE(d[5].hi, 2.0, 1e-5);
+ BOOST_REQUIRE_SMALL(b[5].Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(b[5].Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_SMALL(d[5].Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(d[5].Hi(), 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[6].lo, 1.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[6].hi, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[6].lo, 1.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[6].hi, 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[6].Lo(), 1.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[6].Hi(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[6].Lo(), 1.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[6].Hi(), 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[7].lo, 1.0, 1e-5);
- BOOST_REQUIRE_CLOSE(b[7].hi, 3.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[7].lo, 1.0, 1e-5);
- BOOST_REQUIRE_CLOSE(d[7].hi, 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[7].Lo(), 1.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(b[7].Hi(), 3.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[7].Lo(), 1.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(d[7].Hi(), 3.0, 1e-5);
}
/**
@@ -600,18 +600,18 @@
b2.set_radius(0.4);
BOOST_REQUIRE_CLOSE(sqrt(b1.MinDistanceSq(b2)), 1-0.3-0.4, 1e-5);
- BOOST_REQUIRE_CLOSE(sqrt(b1.RangeDistanceSq(b2).hi), 1+0.3+0.4, 1e-5);
- BOOST_REQUIRE_CLOSE(sqrt(b1.RangeDistanceSq(b2).lo), 1-0.3-0.4, 1e-5);
- BOOST_REQUIRE_CLOSE(b1.RangeDistance(b2).hi, 1+0.3+0.4, 1e-5);
- BOOST_REQUIRE_CLOSE(b1.RangeDistance(b2).lo, 1-0.3-0.4, 1e-5);
+ BOOST_REQUIRE_CLOSE(sqrt(b1.RangeDistanceSq(b2).Hi()), 1+0.3+0.4, 1e-5);
+ BOOST_REQUIRE_CLOSE(sqrt(b1.RangeDistanceSq(b2).Lo()), 1-0.3-0.4, 1e-5);
+ BOOST_REQUIRE_CLOSE(b1.RangeDistance(b2).Hi(), 1+0.3+0.4, 1e-5);
+ BOOST_REQUIRE_CLOSE(b1.RangeDistance(b2).Lo(), 1-0.3-0.4, 1e-5);
BOOST_REQUIRE_CLOSE(sqrt(b1.MinToMidSq(b2)), 1-0.3, 1e-5);
BOOST_REQUIRE_CLOSE(sqrt(b1.MinimaxDistanceSq(b2)), 1-0.3+0.4, 1e-5);
BOOST_REQUIRE_CLOSE(sqrt(b1.MidDistanceSq(b2)), 1.0, 1e-5);
BOOST_REQUIRE_CLOSE(sqrt(b2.MinDistanceSq(b1)), 1-0.3-0.4, 1e-5);
BOOST_REQUIRE_CLOSE(sqrt(b2.MaxDistanceSq(b1)), 1+0.3+0.4, 1e-5);
- BOOST_REQUIRE_CLOSE(sqrt(b2.RangeDistanceSq(b1).hi), 1+0.3+0.4, 1e-5);
- BOOST_REQUIRE_CLOSE(sqrt(b2.RangeDistanceSq(b1).lo), 1-0.3-0.4, 1e-5);
+ BOOST_REQUIRE_CLOSE(sqrt(b2.RangeDistanceSq(b1).Hi()), 1+0.3+0.4, 1e-5);
+ BOOST_REQUIRE_CLOSE(sqrt(b2.RangeDistanceSq(b1).Lo()), 1-0.3-0.4, 1e-5);
BOOST_REQUIRE_CLOSE(sqrt(b2.MinToMidSq(b1)), 1-0.4, 1e-5);
BOOST_REQUIRE_CLOSE(sqrt(b2.MinimaxDistanceSq(b1)), 1-0.4+0.3, 1e-5);
BOOST_REQUIRE_CLOSE(sqrt(b2.MidDistanceSq(b1)), 1.0, 1e-5);
@@ -690,10 +690,10 @@
PeriodicHRectBound<2> c(b);
BOOST_REQUIRE_EQUAL(c.Dim(), 2);
- BOOST_REQUIRE_SMALL(c[0].lo, 1e-5);
- BOOST_REQUIRE_CLOSE(c[0].hi, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(c[1].lo, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(c[1].hi, 3.0, 1e-5);
+ BOOST_REQUIRE_SMALL(c[0].Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(c[0].Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(c[1].Lo(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(c[1].Hi(), 3.0, 1e-5);
BOOST_REQUIRE_EQUAL(c.box().n_elem, 2);
BOOST_REQUIRE_CLOSE(c.box()[0], 3.0, 1e-5);
BOOST_REQUIRE_CLOSE(c.box()[1], 4.0, 1e-5);
@@ -713,10 +713,10 @@
c = b;
BOOST_REQUIRE_EQUAL(c.Dim(), 2);
- BOOST_REQUIRE_SMALL(c[0].lo, 1e-5);
- BOOST_REQUIRE_CLOSE(c[0].hi, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(c[1].lo, 2.0, 1e-5);
- BOOST_REQUIRE_CLOSE(c[1].hi, 3.0, 1e-5);
+ BOOST_REQUIRE_SMALL(c[0].Lo(), 1e-5);
+ BOOST_REQUIRE_CLOSE(c[0].Hi(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(c[1].Lo(), 2.0, 1e-5);
+ BOOST_REQUIRE_CLOSE(c[1].Hi(), 3.0, 1e-5);
BOOST_REQUIRE_EQUAL(c.box().n_elem, 2);
BOOST_REQUIRE_CLOSE(c.box()[0], 3.0, 1e-5);
BOOST_REQUIRE_CLOSE(c.box()[1], 4.0, 1e-5);
More information about the mlpack-svn
mailing list