summaryrefslogtreecommitdiff
path: root/libs/units/test/test_scaled_conversion.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libs/units/test/test_scaled_conversion.cpp')
-rw-r--r--libs/units/test/test_scaled_conversion.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/libs/units/test/test_scaled_conversion.cpp b/libs/units/test/test_scaled_conversion.cpp
index b8e2088e3..c9da8fcf3 100644
--- a/libs/units/test/test_scaled_conversion.cpp
+++ b/libs/units/test/test_scaled_conversion.cpp
@@ -28,6 +28,7 @@ Output:
#include <boost/units/scaled_base_unit.hpp>
#include <boost/units/scale.hpp>
#include <boost/units/base_dimension.hpp>
+#include <boost/units/derived_dimension.hpp>
#include <boost/test/minimal.hpp>
@@ -36,12 +37,19 @@ Output:
namespace bu = boost::units;
struct base_dimension1 : bu::base_dimension<base_dimension1, 1> {};
+struct base_dimension2 : bu::base_dimension<base_dimension2, 2> {};
+struct base_dimension3 : bu::base_dimension<base_dimension3, 3> {};
+
+typedef bu::derived_dimension<base_dimension1, 1, base_dimension2, 1, base_dimension3, 1>::type dimension4;
struct base_unit1 : bu::base_unit<base_unit1, base_dimension1::dimension_type, 1> {};
struct base_unit2 : bu::base_unit<base_unit2, base_dimension1::dimension_type, 2> {};
struct base_unit3 : bu::base_unit<base_unit3, base_dimension1::dimension_type, 3> {};
+struct base_unit4 : bu::base_unit<base_unit4, dimension4, 4> {};
+struct base_unit5 : bu::base_unit<base_unit5, base_dimension3::dimension_type, 5> {};
typedef bu::scaled_base_unit<base_unit2, bu::scale<10, bu::static_rational<3> > > scaled_base_unit2;
+typedef bu::scaled_base_unit<base_unit4, bu::scale<10, bu::static_rational<3> > > scaled_base_unit4;
BOOST_UNITS_DEFINE_CONVERSION_FACTOR(base_unit1, scaled_base_unit2, double, 5);
BOOST_UNITS_DEFINE_CONVERSION_FACTOR(scaled_base_unit2, base_unit3, double, 3);
@@ -52,5 +60,7 @@ int test_main(int,char *[])
BOOST_UNITS_CHECK_CLOSE(bu::conversion_factor(base_unit2::unit_type(), base_unit3::unit_type()), 0.003);
BOOST_UNITS_CHECK_CLOSE(bu::conversion_factor(scaled_base_unit2::unit_type(), base_unit2::unit_type()), 1000);
+ BOOST_UNITS_CHECK_CLOSE(bu::conversion_factor(base_unit4::unit_type()/base_unit5::unit_type(), scaled_base_unit4::unit_type()/base_unit5::unit_type()), 1e-3);
+
return(0);
}