Skip to content

Commit 069615b

Browse files
committed
better tests
1 parent ac397b0 commit 069615b

File tree

2 files changed

+28
-16
lines changed

2 files changed

+28
-16
lines changed

Diff for: test/axis_regular_test.cpp

+14-8
Original file line numberDiff line numberDiff line change
@@ -226,18 +226,24 @@ int main() {
226226

227227
// axis with overflow bin represents open interval
228228
{
229-
axis::regular<double, def, def, op::overflow_t> a{1, 0, 1};
230-
BOOST_TEST_EQ(a.index(0.9), 0);
231-
BOOST_TEST_EQ(a.index(1), 1); // overflow bin
232-
BOOST_TEST_EQ(a.index(1.1), 1); // overflow bin
229+
axis::regular<double, def, def, op::overflow_t> a{2, 0, 1};
230+
BOOST_TEST_EQ(a.index(0), 0);
231+
BOOST_TEST_EQ(a.index(0.49), 0);
232+
BOOST_TEST_EQ(a.index(0.50), 1);
233+
BOOST_TEST_EQ(a.index(0.99), 1);
234+
BOOST_TEST_EQ(a.index(1), 2); // overflow bin
235+
BOOST_TEST_EQ(a.index(1.1), 2); // overflow bin
233236
}
234237

235238
// axis without overflow bin represents a closed interval
236239
{
237-
axis::regular<double, def, def, op::none_t> a{1, 0, 1};
238-
BOOST_TEST_EQ(a.index(0.9), 0);
239-
BOOST_TEST_EQ(a.index(1), 0); // last ordinary bin
240-
BOOST_TEST_EQ(a.index(1.1), 1); // out of range
240+
axis::regular<double, def, def, op::none_t> a{2, 0, 1};
241+
BOOST_TEST_EQ(a.index(0), 0);
242+
BOOST_TEST_EQ(a.index(0.49), 0);
243+
BOOST_TEST_EQ(a.index(0.50), 1);
244+
BOOST_TEST_EQ(a.index(0.99), 1);
245+
BOOST_TEST_EQ(a.index(1), 1); // last ordinary bin
246+
BOOST_TEST_EQ(a.index(1.1), 2); // out of range
241247
}
242248

243249
// iterators

Diff for: test/axis_variable_test.cpp

+14-8
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,24 @@ int main() {
152152

153153
// axis with overflow bin represents open interval
154154
{
155-
axis::variable<double, boost::use_default, op::overflow_t> a{0, 1};
156-
BOOST_TEST_EQ(a.index(0.9), 0);
157-
BOOST_TEST_EQ(a.index(1), 1); // overflow bin
158-
BOOST_TEST_EQ(a.index(1.1), 1); // overflow bin
155+
axis::variable<double, boost::use_default, op::overflow_t> a{0.0, 0.5, 1.0};
156+
BOOST_TEST_EQ(a.index(0), 0);
157+
BOOST_TEST_EQ(a.index(0.49), 0);
158+
BOOST_TEST_EQ(a.index(0.50), 1);
159+
BOOST_TEST_EQ(a.index(0.99), 1);
160+
BOOST_TEST_EQ(a.index(1), 2); // overflow bin
161+
BOOST_TEST_EQ(a.index(1.1), 2); // overflow bin
159162
}
160163

161164
// axis without overflow bin represents a closed interval
162165
{
163-
axis::variable<double, boost::use_default, op::none_t> a{0, 1};
164-
BOOST_TEST_EQ(a.index(0.9), 0);
165-
BOOST_TEST_EQ(a.index(1), 0); // last ordinary bin
166-
BOOST_TEST_EQ(a.index(1.1), 1); // out of range
166+
axis::variable<double, boost::use_default, op::none_t> a{0.0, 0.5, 1.0};
167+
BOOST_TEST_EQ(a.index(0), 0);
168+
BOOST_TEST_EQ(a.index(0.49), 0);
169+
BOOST_TEST_EQ(a.index(0.50), 1);
170+
BOOST_TEST_EQ(a.index(0.99), 1);
171+
BOOST_TEST_EQ(a.index(1), 1); // last ordinary bin
172+
BOOST_TEST_EQ(a.index(1.1), 2); // out of range
167173
}
168174

169175
// iterators

0 commit comments

Comments
 (0)