|
17 | 17 | #include <boost/geometry/extensions/generic_robust_predicates/strategies/cartesian/detail/approximate.hpp> |
18 | 18 | #include <boost/geometry/extensions/generic_robust_predicates/strategies/cartesian/detail/expression_tree.hpp> |
19 | 19 |
|
20 | | -namespace p = boost::geometry::detail::generic_robust_predicates; |
21 | | - |
22 | 20 | template <typename CalculationType> |
23 | 21 | void test_all() |
24 | 22 | { |
| 23 | + using bg::detail::generic_robust_predicates::_1; |
| 24 | + using bg::detail::generic_robust_predicates::_2; |
| 25 | + using bg::detail::generic_robust_predicates::_3; |
| 26 | + using bg::detail::generic_robust_predicates::_4; |
| 27 | + using bg::detail::generic_robust_predicates::sum; |
| 28 | + using bg::detail::generic_robust_predicates::difference; |
| 29 | + using bg::detail::generic_robust_predicates::product; |
| 30 | + using bg::detail::generic_robust_predicates::max; |
| 31 | + using bg::detail::generic_robust_predicates::abs; |
| 32 | + using bg::detail::generic_robust_predicates::post_order; |
| 33 | + using bg::detail::generic_robust_predicates::approximate_value; |
| 34 | + using bg::detail::generic_robust_predicates::get_approx; |
| 35 | + using bg::detail::generic_robust_predicates::approximate_interim; |
25 | 36 | using ct = CalculationType; |
26 | | - ct r1 = p::approximate_value<p::sum<p::_1, p::_2>, ct>( |
| 37 | + ct r1 = approximate_value<sum<_1, _2>, ct>( |
27 | 38 | std::array<ct, 2>{1.0, 2.0}); |
28 | 39 | BOOST_CHECK_EQUAL(3.0, r1); |
29 | | - ct r2 = p::approximate_value<p::max<p::abs<p::_1>, p::abs<p::_2>>, ct>( |
| 40 | + ct r2 = approximate_value<max<abs<_1>, abs<_2>>, ct>( |
30 | 41 | std::array<ct, 2>{-10.0, 2.0}); |
31 | 42 | BOOST_CHECK_EQUAL(10.0, r2); |
32 | 43 |
|
33 | | - using expression = p::product |
| 44 | + using expression = product |
34 | 45 | < |
35 | | - p::difference<p::_1, p::_2>, |
36 | | - p::difference<p::_3, p::_4> |
| 46 | + difference<_1, _2>, |
| 47 | + difference<_3, _4> |
37 | 48 | >; |
38 | | - using evals = p::post_order<expression>; |
| 49 | + using evals = post_order<expression>; |
39 | 50 | std::array<ct, boost::mp11::mp_size<evals>::value> r; |
40 | 51 | std::array<ct, 4> input {5.0, 3.0, 2.0, 8.0}; |
41 | | - p::approximate_interim<evals, evals, ct>(r, input); |
42 | | - ct r3 = p::get_approx<evals, typename expression::left, ct>(r, input); |
| 52 | + approximate_interim<evals, evals, ct>(r, input); |
| 53 | + ct r3 = get_approx<evals, typename expression::left, ct>(r, input); |
43 | 54 | BOOST_CHECK_EQUAL(2.0, r3); |
44 | | - ct r4 = p::get_approx<evals, typename expression::right, ct>(r, input); |
| 55 | + ct r4 = get_approx<evals, typename expression::right, ct>(r, input); |
45 | 56 | BOOST_CHECK_EQUAL(-6.0, r4); |
46 | | - ct r5 = p::get_approx<evals, expression, ct>(r, input); |
| 57 | + ct r5 = get_approx<evals, expression, ct>(r, input); |
47 | 58 | BOOST_CHECK_EQUAL(-12.0, r5); |
48 | 59 | } |
49 | 60 |
|
|
0 commit comments