Boost logo

Boost-Commit :

From: boost_at_[hidden]
Date: 2008-05-19 02:36:32


Author: matthiasschabel
Date: 2008-05-19 02:36:31 EDT (Mon, 19 May 2008)
New Revision: 45531
URL: http://svn.boost.org/trac/boost/changeset/45531

Log:
minor
Text files modified:
   sandbox/units/libs/units/example/quaternion.cpp | 2
   sandbox/units/libs/units/example/systems.cpp | 1309 ++++++++++++++++++---------------------
   sandbox/units/libs/units/test/fail_quantity_non_unit.cpp | 1
   sandbox/units/libs/units/test/test_custom_unit.cpp | 10
   4 files changed, 617 insertions(+), 705 deletions(-)

Modified: sandbox/units/libs/units/example/quaternion.cpp
==============================================================================
--- sandbox/units/libs/units/example/quaternion.cpp (original)
+++ sandbox/units/libs/units/example/quaternion.cpp 2008-05-19 02:36:31 EDT (Mon, 19 May 2008)
@@ -200,6 +200,7 @@
               << "L*L = " << L*L << std::endl
               << "L/L = " << L/L << std::endl
               << "L^3 = " << pow<3>(L) << std::endl
+ //<< "L^3 = " << boost::units::pow<3>(L) << std::endl // compiles if disambiguated
 // << "L^(3/2) = " << pow< static_rational<3,2> >(L) << std::endl
 // << "3vL = " << root<3>(L) << std::endl
 // << "(3/2)vL = " << root< static_rational<3,2> >(L) << std::endl
@@ -220,6 +221,7 @@
 // << "L*L = " << L*L << std::endl
 // << "L/L = " << L/L << std::endl
               << "L^3 = " << pow<3>(L) << std::endl
+// << "L^3 = " << boost::units::pow<3>(L) << std::endl // compiles if disambiguated
 // << "L^(3/2) = " << pow< static_rational<3,2> >(L) << std::endl
 // << "3vL = " << root<3>(L) << std::endl
 // << "(3/2)vL = " << root< static_rational<3,2> >(L) << std::endl

Modified: sandbox/units/libs/units/example/systems.cpp
==============================================================================
--- sandbox/units/libs/units/example/systems.cpp (original)
+++ sandbox/units/libs/units/example/systems.cpp 2008-05-19 02:36:31 EDT (Mon, 19 May 2008)
@@ -279,59 +279,50 @@
                 quantity<radian_plane_angle> r(1.0*radians);
                 quantity<revolution_plane_angle> rev(1.0*revolutions);
                 
- std::cout << as << std::endl
- << am << std::endl
- << d << std::endl
- << g << std::endl
- << r << std::endl
- << rev << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(rev/as) << std::endl
- << quantity<si::dimensionless>(rev/am) << std::endl
- << quantity<si::dimensionless>(rev/d) << std::endl
- << quantity<si::dimensionless>(rev/g) << std::endl
- << quantity<si::dimensionless>(rev/r) << std::endl
- << std::endl;
-
- std::cout << quantity<si::plane_angle>(as) << std::endl
- << quantity<si::plane_angle>(am) << std::endl
- << quantity<si::plane_angle>(d) << std::endl
- << quantity<si::plane_angle>(g) << std::endl
- << quantity<si::plane_angle>(r) << std::endl
- << quantity<si::plane_angle>(rev) << std::endl
+ std::cout << as << " = " << quantity<si::plane_angle>(as) << std::endl
+ << am << " = " << quantity<si::plane_angle>(am) << std::endl
+ << d << " = " << quantity<si::plane_angle>(d) << std::endl
+ << g << " = " << quantity<si::plane_angle>(g) << std::endl
+ << r << " = " << quantity<si::plane_angle>(r) << std::endl
+ << rev << " = " << quantity<si::plane_angle>(rev) << std::endl
                                   << std::endl;
         
+ std::cout << rev << "/" << as << " = " << quantity<si::dimensionless>(rev/as) << std::endl
+ << rev << "/" << am << " = " << quantity<si::dimensionless>(rev/am) << std::endl
+ << rev << "/" << d << " = " << quantity<si::dimensionless>(rev/d) << std::endl
+ << rev << "/" << g << " = " << quantity<si::dimensionless>(rev/g) << std::endl
+ << rev << "/" << r << " = " << quantity<si::dimensionless>(rev/r) << std::endl
+ << std::endl;
+
                 // conversions only work with exponent of +/- 1 in scaled_base_unit?
- std::cout << quantity<arcsecond_plane_angle>(as) << std::endl
- << quantity<arcsecond_plane_angle>(am) << std::endl
- << quantity<arcsecond_plane_angle>(d) << std::endl
- << quantity<arcsecond_plane_angle>(rev) << std::endl
+ std::cout << as << " = " << quantity<arcsecond_plane_angle>(as) << std::endl
+ << am << " = " << quantity<arcsecond_plane_angle>(am) << std::endl
+ << d << " = " << quantity<arcsecond_plane_angle>(d) << std::endl
+ << rev << " = " << quantity<arcsecond_plane_angle>(rev) << std::endl
                                   << std::endl;
                                   
                 // conversions only work with exponent of +/- 1 in scaled_base_unit? see arcsecond.hpp
- std::cout << quantity<arcminute_plane_angle>(as) << std::endl
- << quantity<arcminute_plane_angle>(am) << std::endl
- << quantity<arcminute_plane_angle>(d) << std::endl
- << quantity<arcminute_plane_angle>(rev) << std::endl
- << std::endl;
-
- std::cout << quantity<degree_plane_angle>(as) << std::endl
- << quantity<degree_plane_angle>(am) << std::endl
- << quantity<degree_plane_angle>(d) << std::endl
- << quantity<degree_plane_angle>(rev) << std::endl
- << std::endl;
-
- std::cout << quantity<revolution_plane_angle>(as) << std::endl
- << quantity<revolution_plane_angle>(am) << std::endl
- << quantity<revolution_plane_angle>(d) << std::endl
- << quantity<revolution_plane_angle>(rev) << std::endl
+ std::cout << as << " = " << quantity<arcminute_plane_angle>(as) << std::endl
+ << am << " = " << quantity<arcminute_plane_angle>(am) << std::endl
+ << d << " = " << quantity<arcminute_plane_angle>(d) << std::endl
+ << rev << " = " << quantity<arcminute_plane_angle>(rev) << std::endl
+ << std::endl;
+
+ std::cout << as << " = " << quantity<degree_plane_angle>(as) << std::endl
+ << am << " = " << quantity<degree_plane_angle>(am) << std::endl
+ << d << " = " << quantity<degree_plane_angle>(d) << std::endl
+ << rev << " = " << quantity<degree_plane_angle>(rev) << std::endl
+ << std::endl;
+
+ std::cout << as << " = " << quantity<revolution_plane_angle>(as) << std::endl
+ << am << " = " << quantity<revolution_plane_angle>(am) << std::endl
+ << d << " = " << quantity<revolution_plane_angle>(d) << std::endl
+ << rev << " = " << quantity<revolution_plane_angle>(rev) << std::endl
                                   << std::endl;
                                   
                 quantity<steradian_solid_angle> sa1(1.0*steradians);
                 
                 std::cout << sa1 << std::endl
- << quantity<si::solid_angle>(sa1) << std::endl
                                   << std::endl;
         }
         
@@ -348,65 +339,56 @@
                 quantity<light_year_length> ly(1.0*light_years);
                 quantity<parsec_length> ps(1.0*parsecs);
                 
- std::cout << ls << std::endl
- << lm << std::endl
- << au << std::endl
- << lh << std::endl
- << ld << std::endl
- << ly << std::endl
- << ps << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(ly/ls) << std::endl
- << quantity<si::dimensionless>(ly/lm) << std::endl
- << quantity<si::dimensionless>(ly/au) << std::endl
- << quantity<si::dimensionless>(ly/ld) << std::endl
- << quantity<si::dimensionless>(ly/lh) << std::endl
- << quantity<si::dimensionless>(ly/ps) << std::endl
- << std::endl;
-
- std::cout << quantity<si::length>(ls) << std::endl
- << quantity<si::length>(lm) << std::endl
- << quantity<si::length>(au) << std::endl
- << quantity<si::length>(lh) << std::endl
- << quantity<si::length>(ld) << std::endl
- << quantity<si::length>(ly) << std::endl
- << quantity<si::length>(ps) << std::endl
- << std::endl;
-
- std::cout << quantity<light_second_length>(ls) << std::endl
- << quantity<light_second_length>(lm) << std::endl
- << quantity<light_second_length>(lh) << std::endl
- << quantity<light_second_length>(ld) << std::endl
- << quantity<light_second_length>(ly) << std::endl
- << std::endl;
-
- std::cout << quantity<light_minute_length>(ls) << std::endl
- << quantity<light_minute_length>(lm) << std::endl
- << quantity<light_minute_length>(lh) << std::endl
- << quantity<light_minute_length>(ld) << std::endl
- << quantity<light_minute_length>(ly) << std::endl
- << std::endl;
-
- std::cout << quantity<light_hour_length>(ls) << std::endl
- << quantity<light_hour_length>(lm) << std::endl
- << quantity<light_hour_length>(lh) << std::endl
- << quantity<light_hour_length>(ld) << std::endl
- << quantity<light_hour_length>(ly) << std::endl
- << std::endl;
-
- std::cout << quantity<light_day_length>(ls) << std::endl
- << quantity<light_day_length>(lm) << std::endl
- << quantity<light_day_length>(lh) << std::endl
- << quantity<light_day_length>(ld) << std::endl
- << quantity<light_day_length>(ly) << std::endl
- << std::endl;
-
- std::cout << quantity<light_year_length>(ls) << std::endl
- << quantity<light_year_length>(lm) << std::endl
- << quantity<light_year_length>(ld) << std::endl
- << quantity<light_year_length>(lh) << std::endl
- << quantity<light_year_length>(ly) << std::endl
+ std::cout << ls << " = " << quantity<si::length>(ls) << std::endl
+ << lm << " = " << quantity<si::length>(lm) << std::endl
+ << au << " = " << quantity<si::length>(au) << std::endl
+ << lh << " = " << quantity<si::length>(lh) << std::endl
+ << ld << " = " << quantity<si::length>(ld) << std::endl
+ << ly << " = " << quantity<si::length>(ly) << std::endl
+ << ps << " = " << quantity<si::length>(ps) << std::endl
+ << std::endl;
+
+ std::cout << ly << "/" << ls << " = " << quantity<si::dimensionless>(ly/ls) << std::endl
+ << ly << "/" << lm << " = " << quantity<si::dimensionless>(ly/lm) << std::endl
+ << ly << "/" << au << " = " << quantity<si::dimensionless>(ly/au) << std::endl
+ << ly << "/" << lh << " = " << quantity<si::dimensionless>(ly/ld) << std::endl
+ << ly << "/" << ld << " = " << quantity<si::dimensionless>(ly/lh) << std::endl
+ << ly << "/" << ps << " = " << quantity<si::dimensionless>(ly/ps) << std::endl
+ << std::endl;
+
+ std::cout << ls << " = " << quantity<light_second_length>(ls) << std::endl
+ << lm << " = " << quantity<light_second_length>(lm) << std::endl
+ << lh << " = " << quantity<light_second_length>(lh) << std::endl
+ << ld << " = " << quantity<light_second_length>(ld) << std::endl
+ << ly << " = " << quantity<light_second_length>(ly) << std::endl
+ << std::endl;
+
+ std::cout << ls << " = " << quantity<light_minute_length>(ls) << std::endl
+ << lm << " = " << quantity<light_minute_length>(lm) << std::endl
+ << lh << " = " << quantity<light_minute_length>(lh) << std::endl
+ << ld << " = " << quantity<light_minute_length>(ld) << std::endl
+ << ly << " = " << quantity<light_minute_length>(ly) << std::endl
+ << std::endl;
+
+ std::cout << ls << " = " << quantity<light_hour_length>(ls) << std::endl
+ << lm << " = " << quantity<light_hour_length>(lm) << std::endl
+ << lh << " = " << quantity<light_hour_length>(lh) << std::endl
+ << ld << " = " << quantity<light_hour_length>(ld) << std::endl
+ << ly << " = " << quantity<light_hour_length>(ly) << std::endl
+ << std::endl;
+
+ std::cout << ls << " = " << quantity<light_day_length>(ls) << std::endl
+ << lm << " = " << quantity<light_day_length>(lm) << std::endl
+ << lh << " = " << quantity<light_day_length>(lh) << std::endl
+ << ld << " = " << quantity<light_day_length>(ld) << std::endl
+ << ly << " = " << quantity<light_day_length>(ly) << std::endl
+ << std::endl;
+
+ std::cout << ls << " = " << quantity<light_year_length>(ls) << std::endl
+ << lm << " = " << quantity<light_year_length>(lm) << std::endl
+ << lh << " = " << quantity<light_year_length>(ld) << std::endl
+ << ld << " = " << quantity<light_year_length>(lh) << std::endl
+ << ly << " = " << quantity<light_year_length>(ly) << std::endl
                                   << std::endl;
         }
         
@@ -423,93 +405,84 @@
                 quantity<mile_length> iml6(1.0*miles);
                 quantity<league_length> iml7(1.0*leagues);
                 
- std::cout << iml1 << std::endl
- << iml2 << std::endl
- << iml3 << std::endl
- << iml4 << std::endl
- << iml5 << std::endl
- << iml6 << std::endl
- << iml7 << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(iml7/iml1) << std::endl
- << quantity<si::dimensionless>(iml7/iml2) << std::endl
- << quantity<si::dimensionless>(iml7/iml3) << std::endl
- << quantity<si::dimensionless>(iml7/iml4) << std::endl
- << quantity<si::dimensionless>(iml7/iml5) << std::endl
- << quantity<si::dimensionless>(iml7/iml6) << std::endl
- << std::endl;
-
- std::cout << quantity<si::length>(iml1) << std::endl
- << quantity<si::length>(iml2) << std::endl
- << quantity<si::length>(iml3) << std::endl
- << quantity<si::length>(iml4) << std::endl
- << quantity<si::length>(iml5) << std::endl
- << quantity<si::length>(iml6) << std::endl
- << quantity<si::length>(iml7) << std::endl
- << std::endl;
-
- std::cout << quantity<thou_length>(iml1) << std::endl
- << quantity<thou_length>(iml2) << std::endl
- << quantity<thou_length>(iml3) << std::endl
- << quantity<thou_length>(iml4) << std::endl
- << quantity<thou_length>(iml5) << std::endl
- << quantity<thou_length>(iml6) << std::endl
- << quantity<thou_length>(iml7) << std::endl
- << std::endl;
-
- std::cout << quantity<inch_length>(iml1) << std::endl
- << quantity<inch_length>(iml2) << std::endl
- << quantity<inch_length>(iml3) << std::endl
- << quantity<inch_length>(iml4) << std::endl
- << quantity<inch_length>(iml5) << std::endl
- << quantity<inch_length>(iml6) << std::endl
- << quantity<inch_length>(iml7) << std::endl
- << std::endl;
-
- std::cout << quantity<foot_length>(iml1) << std::endl
- << quantity<foot_length>(iml2) << std::endl
- << quantity<foot_length>(iml3) << std::endl
- << quantity<foot_length>(iml4) << std::endl
- << quantity<foot_length>(iml5) << std::endl
- << quantity<foot_length>(iml6) << std::endl
- << quantity<foot_length>(iml7) << std::endl
- << std::endl;
-
- std::cout << quantity<yard_length>(iml1) << std::endl
- << quantity<yard_length>(iml2) << std::endl
- << quantity<yard_length>(iml3) << std::endl
- << quantity<yard_length>(iml4) << std::endl
- << quantity<yard_length>(iml5) << std::endl
- << quantity<yard_length>(iml6) << std::endl
- << quantity<yard_length>(iml7) << std::endl
- << std::endl;
-
- std::cout << quantity<furlong_length>(iml1) << std::endl
- << quantity<furlong_length>(iml2) << std::endl
- << quantity<furlong_length>(iml3) << std::endl
- << quantity<furlong_length>(iml4) << std::endl
- << quantity<furlong_length>(iml5) << std::endl
- << quantity<furlong_length>(iml6) << std::endl
- << quantity<furlong_length>(iml7) << std::endl
- << std::endl;
-
- std::cout << quantity<mile_length>(iml1) << std::endl
- << quantity<mile_length>(iml2) << std::endl
- << quantity<mile_length>(iml3) << std::endl
- << quantity<mile_length>(iml4) << std::endl
- << quantity<mile_length>(iml5) << std::endl
- << quantity<mile_length>(iml6) << std::endl
- << quantity<mile_length>(iml7) << std::endl
- << std::endl;
-
- std::cout << quantity<league_length>(iml1) << std::endl
- << quantity<league_length>(iml2) << std::endl
- << quantity<league_length>(iml3) << std::endl
- << quantity<league_length>(iml4) << std::endl
- << quantity<league_length>(iml5) << std::endl
- << quantity<league_length>(iml6) << std::endl
- << quantity<league_length>(iml7) << std::endl
+ std::cout << iml1 << " = " << quantity<si::length>(iml1) << std::endl
+ << iml2 << " = " << quantity<si::length>(iml2) << std::endl
+ << iml3 << " = " << quantity<si::length>(iml3) << std::endl
+ << iml4 << " = " << quantity<si::length>(iml4) << std::endl
+ << iml5 << " = " << quantity<si::length>(iml5) << std::endl
+ << iml6 << " = " << quantity<si::length>(iml6) << std::endl
+ << iml7 << " = " << quantity<si::length>(iml7) << std::endl
+ << std::endl;
+
+ std::cout << iml7 << "/" << iml1 << " = " << quantity<si::dimensionless>(iml7/iml1) << std::endl
+ << iml7 << "/" << iml2 << " = " << quantity<si::dimensionless>(iml7/iml2) << std::endl
+ << iml7 << "/" << iml3 << " = " << quantity<si::dimensionless>(iml7/iml3) << std::endl
+ << iml7 << "/" << iml4 << " = " << quantity<si::dimensionless>(iml7/iml4) << std::endl
+ << iml7 << "/" << iml5 << " = " << quantity<si::dimensionless>(iml7/iml5) << std::endl
+ << iml7 << "/" << iml6 << " = " << quantity<si::dimensionless>(iml7/iml6) << std::endl
+ << std::endl;
+
+ std::cout << iml1 << " = " << quantity<thou_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<thou_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<thou_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<thou_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<thou_length>(iml5) << std::endl
+ << iml6 << " = " << quantity<thou_length>(iml6) << std::endl
+ << iml7 << " = " << quantity<thou_length>(iml7) << std::endl
+ << std::endl;
+
+ std::cout << iml1 << " = " << quantity<inch_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<inch_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<inch_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<inch_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<inch_length>(iml5) << std::endl
+ << iml6 << " = " << quantity<inch_length>(iml6) << std::endl
+ << iml7 << " = " << quantity<inch_length>(iml7) << std::endl
+ << std::endl;
+
+ std::cout << iml1 << " = " << quantity<foot_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<foot_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<foot_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<foot_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<foot_length>(iml5) << std::endl
+ << iml6 << " = " << quantity<foot_length>(iml6) << std::endl
+ << iml7 << " = " << quantity<foot_length>(iml7) << std::endl
+ << std::endl;
+
+ std::cout << iml1 << " = " << quantity<yard_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<yard_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<yard_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<yard_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<yard_length>(iml5) << std::endl
+ << iml6 << " = " << quantity<yard_length>(iml6) << std::endl
+ << iml7 << " = " << quantity<yard_length>(iml7) << std::endl
+ << std::endl;
+
+ std::cout << iml1 << " = " << quantity<furlong_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<furlong_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<furlong_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<furlong_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<furlong_length>(iml5) << std::endl
+ << iml6 << " = " << quantity<furlong_length>(iml6) << std::endl
+ << iml7 << " = " << quantity<furlong_length>(iml7) << std::endl
+ << std::endl;
+
+ std::cout << iml1 << " = " << quantity<mile_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<mile_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<mile_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<mile_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<mile_length>(iml5) << std::endl
+ << iml6 << " = " << quantity<mile_length>(iml6) << std::endl
+ << iml7 << " = " << quantity<mile_length>(iml7) << std::endl
+ << std::endl;
+
+ std::cout << iml1 << " = " << quantity<league_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<league_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<league_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<league_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<league_length>(iml5) << std::endl
+ << iml6 << " = " << quantity<league_length>(iml6) << std::endl
+ << iml7 << " = " << quantity<league_length>(iml7) << std::endl
                                   << std::endl;
                                   
                 quantity<grain_mass> imm1(1.0*grains);
@@ -521,113 +494,103 @@
                 quantity<hundredweight_mass> imm7(1.0*hundredweights);
                 quantity<ton_mass> imm8(1.0*tons);
 
- std::cout << imm1 << std::endl
- << imm2 << std::endl
- << imm3 << std::endl
- << imm4 << std::endl
- << imm5 << std::endl
- << imm6 << std::endl
- << imm7 << std::endl
- << imm8 << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(imm8/imm1) << std::endl
- << quantity<si::dimensionless>(imm8/imm2) << std::endl
- << quantity<si::dimensionless>(imm8/imm3) << std::endl
- << quantity<si::dimensionless>(imm8/imm4) << std::endl
- << quantity<si::dimensionless>(imm8/imm5) << std::endl
- << quantity<si::dimensionless>(imm8/imm6) << std::endl
- << quantity<si::dimensionless>(imm8/imm7) << std::endl
- << std::endl;
-
- std::cout << quantity<si::mass>(imm1) << std::endl
- << quantity<si::mass>(imm2) << std::endl
- << quantity<si::mass>(imm3) << std::endl
- << quantity<si::mass>(imm4) << std::endl
- << quantity<si::mass>(imm5) << std::endl
- << quantity<si::mass>(imm6) << std::endl
- << quantity<si::mass>(imm7) << std::endl
- << quantity<si::mass>(imm8) << std::endl
- << std::endl;
-
- std::cout << quantity<grain_mass>(imm1) << std::endl
- << quantity<grain_mass>(imm2) << std::endl
- << quantity<grain_mass>(imm3) << std::endl
- << quantity<grain_mass>(imm4) << std::endl
- << quantity<grain_mass>(imm5) << std::endl
- << quantity<grain_mass>(imm6) << std::endl
- << quantity<grain_mass>(imm7) << std::endl
- << quantity<grain_mass>(imm8) << std::endl
- << std::endl;
-
- std::cout << quantity<drachm_mass>(imm1) << std::endl
- << quantity<drachm_mass>(imm2) << std::endl
- << quantity<drachm_mass>(imm3) << std::endl
- << quantity<drachm_mass>(imm4) << std::endl
- << quantity<drachm_mass>(imm5) << std::endl
- << quantity<drachm_mass>(imm6) << std::endl
- << quantity<drachm_mass>(imm7) << std::endl
- << quantity<drachm_mass>(imm8) << std::endl
- << std::endl;
-
- std::cout << quantity<ounce_mass>(imm1) << std::endl
- << quantity<ounce_mass>(imm2) << std::endl
- << quantity<ounce_mass>(imm3) << std::endl
- << quantity<ounce_mass>(imm4) << std::endl
- << quantity<ounce_mass>(imm5) << std::endl
- << quantity<ounce_mass>(imm6) << std::endl
- << quantity<ounce_mass>(imm7) << std::endl
- << quantity<ounce_mass>(imm8) << std::endl
- << std::endl;
-
- std::cout << quantity<pound_mass>(imm1) << std::endl
- << quantity<pound_mass>(imm2) << std::endl
- << quantity<pound_mass>(imm3) << std::endl
- << quantity<pound_mass>(imm4) << std::endl
- << quantity<pound_mass>(imm5) << std::endl
- << quantity<pound_mass>(imm6) << std::endl
- << quantity<pound_mass>(imm7) << std::endl
- << quantity<pound_mass>(imm8) << std::endl
- << std::endl;
-
- std::cout << quantity<stone_mass>(imm1) << std::endl
- << quantity<stone_mass>(imm2) << std::endl
- << quantity<stone_mass>(imm3) << std::endl
- << quantity<stone_mass>(imm4) << std::endl
- << quantity<stone_mass>(imm5) << std::endl
- << quantity<stone_mass>(imm6) << std::endl
- << quantity<stone_mass>(imm7) << std::endl
- << quantity<stone_mass>(imm8) << std::endl
- << std::endl;
-
- std::cout << quantity<quarter_mass>(imm1) << std::endl
- << quantity<quarter_mass>(imm2) << std::endl
- << quantity<quarter_mass>(imm3) << std::endl
- << quantity<quarter_mass>(imm4) << std::endl
- << quantity<quarter_mass>(imm5) << std::endl
- << quantity<quarter_mass>(imm6) << std::endl
- << quantity<quarter_mass>(imm7) << std::endl
- << quantity<quarter_mass>(imm8) << std::endl
- << std::endl;
-
- std::cout << quantity<hundredweight_mass>(imm1) << std::endl
- << quantity<hundredweight_mass>(imm2) << std::endl
- << quantity<hundredweight_mass>(imm3) << std::endl
- << quantity<hundredweight_mass>(imm4) << std::endl
- << quantity<hundredweight_mass>(imm5) << std::endl
- << quantity<hundredweight_mass>(imm6) << std::endl
- << quantity<hundredweight_mass>(imm7) << std::endl
- << quantity<hundredweight_mass>(imm8) << std::endl
- << std::endl;
-
- std::cout << quantity<ton_mass>(imm1) << std::endl
- << quantity<ton_mass>(imm2) << std::endl
- << quantity<ton_mass>(imm3) << std::endl
- << quantity<ton_mass>(imm4) << std::endl
- << quantity<ton_mass>(imm5) << std::endl
- << quantity<ton_mass>(imm6) << std::endl
- << quantity<ton_mass>(imm7) << std::endl
- << quantity<ton_mass>(imm8) << std::endl
+ std::cout << imm1 << " = " << quantity<si::mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<si::mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<si::mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<si::mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<si::mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<si::mass>(imm6) << std::endl
+ << imm7 << " = " << quantity<si::mass>(imm7) << std::endl
+ << imm8 << " = " << quantity<si::mass>(imm8) << std::endl
+ << std::endl;
+
+ std::cout << imm8 << "/" << imm1 << " = " << quantity<si::dimensionless>(imm8/imm1) << std::endl
+ << imm8 << "/" << imm2 << " = " << quantity<si::dimensionless>(imm8/imm2) << std::endl
+ << imm8 << "/" << imm3 << " = " << quantity<si::dimensionless>(imm8/imm3) << std::endl
+ << imm8 << "/" << imm4 << " = " << quantity<si::dimensionless>(imm8/imm4) << std::endl
+ << imm8 << "/" << imm5 << " = " << quantity<si::dimensionless>(imm8/imm5) << std::endl
+ << imm8 << "/" << imm6 << " = " << quantity<si::dimensionless>(imm8/imm6) << std::endl
+ << imm8 << "/" << imm7 << " = " << quantity<si::dimensionless>(imm8/imm7) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<grain_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<grain_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<grain_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<grain_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<grain_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<grain_mass>(imm6) << std::endl
+ << imm7 << " = " << quantity<grain_mass>(imm7) << std::endl
+ << imm8 << " = " << quantity<grain_mass>(imm8) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<drachm_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<drachm_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<drachm_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<drachm_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<drachm_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<drachm_mass>(imm6) << std::endl
+ << imm7 << " = " << quantity<drachm_mass>(imm7) << std::endl
+ << imm8 << " = " << quantity<drachm_mass>(imm8) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<ounce_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<ounce_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<ounce_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<ounce_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<ounce_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<ounce_mass>(imm6) << std::endl
+ << imm7 << " = " << quantity<ounce_mass>(imm7) << std::endl
+ << imm8 << " = " << quantity<ounce_mass>(imm8) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<pound_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<pound_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<pound_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<pound_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<pound_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<pound_mass>(imm6) << std::endl
+ << imm7 << " = " << quantity<pound_mass>(imm7) << std::endl
+ << imm8 << " = " << quantity<pound_mass>(imm8) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<stone_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<stone_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<stone_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<stone_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<stone_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<stone_mass>(imm6) << std::endl
+ << imm7 << " = " << quantity<stone_mass>(imm7) << std::endl
+ << imm8 << " = " << quantity<stone_mass>(imm8) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<quarter_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<quarter_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<quarter_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<quarter_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<quarter_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<quarter_mass>(imm6) << std::endl
+ << imm7 << " = " << quantity<quarter_mass>(imm7) << std::endl
+ << imm8 << " = " << quantity<quarter_mass>(imm8) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<hundredweight_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<hundredweight_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<hundredweight_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<hundredweight_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<hundredweight_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<hundredweight_mass>(imm6) << std::endl
+ << imm7 << " = " << quantity<hundredweight_mass>(imm7) << std::endl
+ << imm8 << " = " << quantity<hundredweight_mass>(imm8) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<ton_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<ton_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<ton_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<ton_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<ton_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<ton_mass>(imm6) << std::endl
+ << imm7 << " = " << quantity<ton_mass>(imm7) << std::endl
+ << imm8 << " = " << quantity<ton_mass>(imm8) << std::endl
                                   << std::endl;
                                   
                 quantity<fluid_ounce_volume> imv1(1.0*fluid_ounces);
@@ -636,59 +599,52 @@
                 quantity<quart_volume> imv4(1.0*quarts);
                 quantity<gallon_volume> imv5(1.0*gallons);
                 
- std::cout << imv1 << std::endl
- << imv2 << std::endl
- << imv3 << std::endl
- << imv4 << std::endl
- << imv5 << std::endl
+ std::cout << imv1 << " = " << quantity<si::volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<si::volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<si::volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<si::volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<si::volume>(imv5) << std::endl
                                   << std::endl;
-
- std::cout << quantity<si::dimensionless>(imv5/imv1) << std::endl
- << quantity<si::dimensionless>(imv5/imv2) << std::endl
- << quantity<si::dimensionless>(imv5/imv3) << std::endl
- << quantity<si::dimensionless>(imv5/imv4) << std::endl
+
+ std::cout << imv5 << "/" << imv1 << " = " << quantity<si::dimensionless>(imv5/imv1) << std::endl
+ << imv5 << "/" << imv2 << " = " << quantity<si::dimensionless>(imv5/imv2) << std::endl
+ << imv5 << "/" << imv3 << " = " << quantity<si::dimensionless>(imv5/imv3) << std::endl
+ << imv5 << "/" << imv4 << " = " << quantity<si::dimensionless>(imv5/imv4) << std::endl
                                   << std::endl;
 
- std::cout << quantity<si::volume>(imv1) << std::endl
- << quantity<si::volume>(imv2) << std::endl
- << quantity<si::volume>(imv3) << std::endl
- << quantity<si::volume>(imv4) << std::endl
- << quantity<si::volume>(imv5) << std::endl
+ std::cout << imv1 << " = " << quantity<fluid_ounce_volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<fluid_ounce_volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<fluid_ounce_volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<fluid_ounce_volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<fluid_ounce_volume>(imv5) << std::endl
                                   << std::endl;
                                   
- std::cout << quantity<fluid_ounce_volume>(imv1) << std::endl
- << quantity<fluid_ounce_volume>(imv2) << std::endl
- << quantity<fluid_ounce_volume>(imv3) << std::endl
- << quantity<fluid_ounce_volume>(imv4) << std::endl
- << quantity<fluid_ounce_volume>(imv5) << std::endl
+ std::cout << imv1 << " = " << quantity<gill_volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<gill_volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<gill_volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<gill_volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<gill_volume>(imv5) << std::endl
                                   << std::endl;
                                   
- std::cout << quantity<gill_volume>(imv1) << std::endl
- << quantity<gill_volume>(imv2) << std::endl
- << quantity<gill_volume>(imv3) << std::endl
- << quantity<gill_volume>(imv4) << std::endl
- << quantity<gill_volume>(imv5) << std::endl
+ std::cout << imv1 << " = " << quantity<pint_volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<pint_volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<pint_volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<pint_volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<pint_volume>(imv5) << std::endl
                                   << std::endl;
                                   
- std::cout << quantity<pint_volume>(imv1) << std::endl
- << quantity<pint_volume>(imv2) << std::endl
- << quantity<pint_volume>(imv3) << std::endl
- << quantity<pint_volume>(imv4) << std::endl
- << quantity<pint_volume>(imv5) << std::endl
+ std::cout << imv1 << " = " << quantity<quart_volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<quart_volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<quart_volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<quart_volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<quart_volume>(imv5) << std::endl
                                   << std::endl;
                                   
- std::cout << quantity<quart_volume>(imv1) << std::endl
- << quantity<quart_volume>(imv2) << std::endl
- << quantity<quart_volume>(imv3) << std::endl
- << quantity<quart_volume>(imv4) << std::endl
- << quantity<quart_volume>(imv5) << std::endl
- << std::endl;
-
- std::cout << quantity<gallon_volume>(imv1) << std::endl
- << quantity<gallon_volume>(imv2) << std::endl
- << quantity<gallon_volume>(imv3) << std::endl
- << quantity<gallon_volume>(imv4) << std::endl
- << quantity<gallon_volume>(imv5) << std::endl
+ std::cout << imv1 << " = " << quantity<gallon_volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<gallon_volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<gallon_volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<gallon_volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<gallon_volume>(imv5) << std::endl
                                   << std::endl;
         }
         
@@ -702,52 +658,45 @@
                 quantity<micron_length> ml3(1.0*microns);
                 quantity<nautical_mile_length> ml4(1.0*nautical_miles);
         
- std::cout << ml1 << std::endl
- << ml2 << std::endl
- << ml3 << std::endl
- << ml4 << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(ml4/ml1) << std::endl
- << quantity<si::dimensionless>(ml4/ml2) << std::endl
- << quantity<si::dimensionless>(ml4/ml3) << std::endl
+ std::cout << ml1 << " = " << quantity<si::length>(ml1) << std::endl
+ << ml2 << " = " << quantity<si::length>(ml2) << std::endl
+ << ml3 << " = " << quantity<si::length>(ml3) << std::endl
+ << ml4 << " = " << quantity<si::length>(ml4) << std::endl
                                   << std::endl;
 
- std::cout << quantity<si::length>(ml1) << std::endl
- << quantity<si::length>(ml2) << std::endl
- << quantity<si::length>(ml3) << std::endl
- << quantity<si::length>(ml4) << std::endl
+ std::cout << ml4 << "/" << ml1 << " = " << quantity<si::dimensionless>(ml4/ml1) << std::endl
+ << ml4 << "/" << ml2 << " = " << quantity<si::dimensionless>(ml4/ml2) << std::endl
+ << ml4 << "/" << ml3 << " = " << quantity<si::dimensionless>(ml4/ml3) << std::endl
                                   << std::endl;
 
-// std::cout << quantity<fermi_length>(ml1) << std::endl
-// << quantity<fermi_length>(ml2) << std::endl
-// << quantity<fermi_length>(ml3) << std::endl
-// << quantity<fermi_length>(ml4) << std::endl
+// std::cout << ml1 << " = " << quantity<fermi_length>(ml1) << std::endl
+// << ml2 << " = " << quantity<fermi_length>(ml2) << std::endl
+// << ml3 << " = " << quantity<fermi_length>(ml3) << std::endl
+// << ml4 << " = " << quantity<fermi_length>(ml4) << std::endl
 // << std::endl;
 
-// std::cout << quantity<angstrom_length>(ml1) << std::endl
-// << quantity<angstrom_length>(ml2) << std::endl
-// << quantity<angstrom_length>(ml3) << std::endl
-// << quantity<angstrom_length>(ml4) << std::endl
+// std::cout << ml1 << " = " << quantity<angstrom_length>(ml1) << std::endl
+// << ml2 << " = " << quantity<angstrom_length>(ml2) << std::endl
+// << ml3 << " = " << quantity<angstrom_length>(ml3) << std::endl
+// << ml4 << " = " << quantity<angstrom_length>(ml4) << std::endl
 // << std::endl;
 
-// std::cout << quantity<micron_length>(ml1) << std::endl
-// << quantity<micron_length>(ml2) << std::endl
-// << quantity<micron_length>(ml3) << std::endl
-// << quantity<micron_length>(ml4) << std::endl
+// std::cout << ml1 << " = " << quantity<micron_length>(ml1) << std::endl
+// << ml2 << " = " << quantity<micron_length>(ml2) << std::endl
+// << ml3 << " = " << quantity<micron_length>(ml3) << std::endl
+// << ml4 << " = " << quantity<micron_length>(ml4) << std::endl
 // << std::endl;
 
- std::cout << quantity<nautical_mile_length>(ml1) << std::endl
- << quantity<nautical_mile_length>(ml2) << std::endl
- << quantity<nautical_mile_length>(ml3) << std::endl
- << quantity<nautical_mile_length>(ml4) << std::endl
+ std::cout << ml1 << " = " << quantity<nautical_mile_length>(ml1) << std::endl
+ << ml2 << " = " << quantity<nautical_mile_length>(ml2) << std::endl
+ << ml3 << " = " << quantity<nautical_mile_length>(ml3) << std::endl
+ << ml4 << " = " << quantity<nautical_mile_length>(ml4) << std::endl
                                   << std::endl;
 
                 quantity<ton_mass> mm1(1.0*tons);
                 
- std::cout << mm1 << std::endl
+ std::cout << mm1 << " = " << quantity<cgs::mass>(mm1) << std::endl
                                   //<< quantity<si::mass>(mm1) << std::endl // this should work...
- << quantity<cgs::mass>(mm1) << std::endl
                                   << std::endl;
                                   
                 quantity<minute_time> mt1(1.0*minutes);
@@ -755,90 +704,77 @@
                 quantity<day_time> mt3(1.0*days);
                 quantity<year_time> mt4(1.0*years);
                 
- std::cout << mt1 << std::endl
- << mt2 << std::endl
- << mt3 << std::endl
- << mt4 << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(mt4/mt1) << std::endl
- << quantity<si::dimensionless>(mt4/mt2) << std::endl
- << quantity<si::dimensionless>(mt4/mt3) << std::endl
+ std::cout << mt1 << " = " << quantity<si::time>(mt1) << std::endl
+ << mt2 << " = " << quantity<si::time>(mt2) << std::endl
+ << mt3 << " = " << quantity<si::time>(mt3) << std::endl
+ << mt4 << " = " << quantity<si::time>(mt4) << std::endl
                                   << std::endl;
 
- std::cout << quantity<si::time>(mt1) << std::endl
- << quantity<si::time>(mt2) << std::endl
- << quantity<si::time>(mt3) << std::endl
- << quantity<si::time>(mt4) << std::endl
+ std::cout << mt4 << "/" << mt1 << " = " << quantity<si::dimensionless>(mt4/mt1) << std::endl
+ << mt4 << "/" << mt2 << " = " << quantity<si::dimensionless>(mt4/mt2) << std::endl
+ << mt4 << "/" << mt3 << " = " << quantity<si::dimensionless>(mt4/mt3) << std::endl
                                   << std::endl;
 
-// std::cout << quantity<minute_time>(mt1) << std::endl
-// << quantity<minute_time>(mt2) << std::endl
-// << quantity<minute_time>(mt3) << std::endl
-// << quantity<minute_time>(mt4) << std::endl
+// std::cout << mt1 << " = " << quantity<minute_time>(mt1) << std::endl
+// << mt2 << " = " << quantity<minute_time>(mt2) << std::endl
+// << mt3 << " = " << quantity<minute_time>(mt3) << std::endl
+// << mt4 << " = " << quantity<minute_time>(mt4) << std::endl
 // << std::endl;
 
-// std::cout << quantity<hour_time>(mt1) << std::endl
-// << quantity<hour_time>(mt2) << std::endl
-// << quantity<hour_time>(mt3) << std::endl
-// << quantity<hour_time>(mt4) << std::endl
+// std::cout << mt1 << " = " << quantity<hour_time>(mt1) << std::endl
+// << mt2 << " = " << quantity<hour_time>(mt2) << std::endl
+// << mt3 << " = " << quantity<hour_time>(mt3) << std::endl
+// << mt4 << " = " << quantity<hour_time>(mt4) << std::endl
 // << std::endl;
 
- std::cout << quantity<day_time>(mt1) << std::endl
- << quantity<day_time>(mt2) << std::endl
- << quantity<day_time>(mt3) << std::endl
- << quantity<day_time>(mt4) << std::endl
+ std::cout << mt1 << " = " << quantity<day_time>(mt1) << std::endl
+ << mt2 << " = " << quantity<day_time>(mt2) << std::endl
+ << mt3 << " = " << quantity<day_time>(mt3) << std::endl
+ << mt4 << " = " << quantity<day_time>(mt4) << std::endl
                                   << std::endl;
 
- std::cout << quantity<year_time>(mt1) << std::endl
- << quantity<year_time>(mt2) << std::endl
- << quantity<year_time>(mt3) << std::endl
- << quantity<year_time>(mt4) << std::endl
+ std::cout << mt1 << " = " << quantity<year_time>(mt1) << std::endl
+ << mt2 << " = " << quantity<year_time>(mt2) << std::endl
+ << mt3 << " = " << quantity<year_time>(mt3) << std::endl
+ << mt4 << " = " << quantity<year_time>(mt4) << std::endl
                                   << std::endl;
                                                   
                 quantity<knot_velocity> ms1(1.0*knots);
                 
- std::cout << ms1 << std::endl
- << quantity<si::velocity>(ms1) << std::endl
+ std::cout << ms1 << " = " << quantity<si::velocity>(ms1) << std::endl
                                   << std::endl;
                                   
                 quantity<barn_area> ma1(1.0*barns);
                 quantity<are_area> ma2(1.0*ares);
                 quantity<hectare_area> ma3(1.0*hectares);
                 
- std::cout << ma1 << std::endl
- << ma2 << std::endl
- << ma3 << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(ma3/ma1) << std::endl
- << quantity<si::dimensionless>(ma3/ma2) << std::endl
+ std::cout << ma1 << " = " << quantity<si::area>(ma1) << std::endl
+ << ma2 << " = " << quantity<si::area>(ma2) << std::endl
+ << ma3 << " = " << quantity<si::area>(ma3) << std::endl
                                   << std::endl;
 
- std::cout << quantity<si::area>(ma1) << std::endl
- << quantity<si::area>(ma2) << std::endl
- << quantity<si::area>(ma3) << std::endl
+ std::cout << ma3 << "/" << ma1 << " = " << quantity<si::dimensionless>(ma3/ma1) << std::endl
+ << ma3 << "/" << ma2 << " = " << quantity<si::dimensionless>(ma3/ma2) << std::endl
                                   << std::endl;
 
-// std::cout << quantity<barn_area>(ma1) << std::endl
-// << quantity<barn_area>(ma2) << std::endl
-// << quantity<barn_area>(ma3) << std::endl
+// std::cout << ma1 << " = " << quantity<barn_area>(ma1) << std::endl
+// << ma2 << " = " << quantity<barn_area>(ma2) << std::endl
+// << ma3 << " = " << quantity<barn_area>(ma3) << std::endl
 // << std::endl;
 
-// std::cout << quantity<are_area>(ma1) << std::endl
-// << quantity<are_area>(ma2) << std::endl
-// << quantity<are_area>(ma3) << std::endl
+// std::cout << ma1 << " = " << quantity<are_area>(ma1) << std::endl
+// << ma2 << " = " << quantity<are_area>(ma2) << std::endl
+// << ma3 << " = " << quantity<are_area>(ma3) << std::endl
 // << std::endl;
 
-// std::cout << quantity<hectare_area>(ma1) << std::endl
-// << quantity<hectare_area>(ma2) << std::endl
-// << quantity<hectare_area>(ma3) << std::endl
+// std::cout << ma1 << " = " << quantity<hectare_area>(ma1) << std::endl
+// << ma2 << " = " << quantity<hectare_area>(ma2) << std::endl
+// << ma3 << " = " << quantity<hectare_area>(ma3) << std::endl
 // << std::endl;
                 
                 quantity<liter_volume> mv1(1.0*liters);
                 
- std::cout << mv1 << std::endl
- << quantity<si::volume>(mv1) << std::endl
+ std::cout << mv1 << " = " << quantity<si::volume>(mv1) << std::endl
                                   << std::endl;
                 
                 quantity<mmHg_pressure> mp1(1.0*mmHgs);
@@ -846,45 +782,39 @@
                 quantity<bar_pressure> mp3(1.0*bars);
                 quantity<atmosphere_pressure> mp4(1.0*atmospheres);
                 
- std::cout << mp1 << std::endl
- << mp2 << std::endl
- << mp3 << std::endl
- << mp4 << std::endl
- << std::endl;
+ std::cout << mp1 << " = " << quantity<si::pressure>(mp1) << std::endl
+ << mp2 << " = " << quantity<si::pressure>(mp2) << std::endl
+ << mp3 << " = " << quantity<si::pressure>(mp3) << std::endl
+ << mp4 << " = " << quantity<si::pressure>(mp4) << std::endl
+ << std::endl;
 
- std::cout << quantity<si::dimensionless>(mp4/mp1) << std::endl
- << quantity<si::dimensionless>(mp4/mp2) << std::endl
- << quantity<si::dimensionless>(mp4/mp3) << std::endl
+ std::cout << mp4 << "/" << mp1 << " = " << quantity<si::dimensionless>(mp4/mp1) << std::endl
+ << mp4 << "/" << mp2 << " = " << quantity<si::dimensionless>(mp4/mp2) << std::endl
+ << mp4 << "/" << mp3 << " = " << quantity<si::dimensionless>(mp4/mp3) << std::endl
                                   << std::endl;
 
- std::cout << quantity<si::pressure>(mp1) << std::endl
- << quantity<si::pressure>(mp2) << std::endl
- << quantity<si::pressure>(mp3) << std::endl
- << quantity<si::pressure>(mp4) << std::endl
- << std::endl;
-
-// std::cout << quantity<mmHg_pressure>(mp1) << std::endl
-// << quantity<mmHg_pressure>(mp2) << std::endl
-// << quantity<mmHg_pressure>(mp3) << std::endl
-// << quantity<mmHg_pressure>(mp4) << std::endl
+// std::cout << mp1 << " = " << quantity<mmHg_pressure>(mp1) << std::endl
+// << mp2 << " = " << quantity<mmHg_pressure>(mp2) << std::endl
+// << mp3 << " = " << quantity<mmHg_pressure>(mp3) << std::endl
+// << mp4 << " = " << quantity<mmHg_pressure>(mp4) << std::endl
 // << std::endl;
 
-// std::cout << quantity<torr_pressure>(mp1) << std::endl
-// << quantity<torr_pressure>(mp2) << std::endl
-// << quantity<torr_pressure>(mp3) << std::endl
-// << quantity<torr_pressure>(mp4) << std::endl
+// std::cout << mp1 << " = " << quantity<torr_pressure>(mp1) << std::endl
+// << mp2 << " = " << quantity<torr_pressure>(mp2) << std::endl
+// << mp3 << " = " << quantity<torr_pressure>(mp3) << std::endl
+// << mp4 << " = " << quantity<torr_pressure>(mp4) << std::endl
 // << std::endl;
 
-// std::cout << quantity<bar_pressure>(mp1) << std::endl
-// << quantity<bar_pressure>(mp2) << std::endl
-// << quantity<bar_pressure>(mp3) << std::endl
-// << quantity<bar_pressure>(mp4) << std::endl
+// std::cout << mp1 << " = " << quantity<bar_pressure>(mp1) << std::endl
+// << mp2 << " = " << quantity<bar_pressure>(mp2) << std::endl
+// << mp3 << " = " << quantity<bar_pressure>(mp3) << std::endl
+// << mp4 << " = " << quantity<bar_pressure>(mp4) << std::endl
 // << std::endl;
 
-// std::cout << quantity<atmosphere_pressure>(mp1) << std::endl
-// << quantity<atmosphere_pressure>(mp2) << std::endl
-// << quantity<atmosphere_pressure>(mp3) << std::endl
-// << quantity<atmosphere_pressure>(mp4) << std::endl
+// std::cout << mp1 << " = " << quantity<atmosphere_pressure>(mp1) << std::endl
+// << mp2 << " = " << quantity<atmosphere_pressure>(mp2) << std::endl
+// << mp3 << " = " << quantity<atmosphere_pressure>(mp3) << std::endl
+// << mp4 << " = " << quantity<atmosphere_pressure>(mp4) << std::endl
 // << std::endl;
         }
         
@@ -899,59 +829,52 @@
                 quantity<yard_length> iml4(1.0*yards);
                 quantity<mile_length> iml5(1.0*miles);
                 
- std::cout << iml1 << std::endl
- << iml2 << std::endl
- << iml3 << std::endl
- << iml4 << std::endl
- << iml5 << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(iml5/iml1) << std::endl
- << quantity<si::dimensionless>(iml5/iml2) << std::endl
- << quantity<si::dimensionless>(iml5/iml3) << std::endl
- << quantity<si::dimensionless>(iml5/iml4) << std::endl
+ std::cout << iml1 << " = " << quantity<si::length>(iml1) << std::endl
+ << iml2 << " = " << quantity<si::length>(iml2) << std::endl
+ << iml3 << " = " << quantity<si::length>(iml3) << std::endl
+ << iml4 << " = " << quantity<si::length>(iml4) << std::endl
+ << iml5 << " = " << quantity<si::length>(iml5) << std::endl
                                   << std::endl;
 
- std::cout << quantity<si::length>(iml1) << std::endl
- << quantity<si::length>(iml2) << std::endl
- << quantity<si::length>(iml3) << std::endl
- << quantity<si::length>(iml4) << std::endl
- << quantity<si::length>(iml5) << std::endl
+ std::cout << iml5 << "/" << iml1 << " = " << quantity<si::dimensionless>(iml5/iml1) << std::endl
+ << iml5 << "/" << iml2 << " = " << quantity<si::dimensionless>(iml5/iml2) << std::endl
+ << iml5 << "/" << iml3 << " = " << quantity<si::dimensionless>(iml5/iml3) << std::endl
+ << iml5 << "/" << iml4 << " = " << quantity<si::dimensionless>(iml5/iml4) << std::endl
                                   << std::endl;
 
- std::cout << quantity<mil_length>(iml1) << std::endl
- << quantity<mil_length>(iml2) << std::endl
- << quantity<mil_length>(iml3) << std::endl
- << quantity<mil_length>(iml4) << std::endl
- << quantity<mil_length>(iml5) << std::endl
+ std::cout << iml1 << " = " << quantity<mil_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<mil_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<mil_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<mil_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<mil_length>(iml5) << std::endl
                                   << std::endl;
 
- std::cout << quantity<inch_length>(iml1) << std::endl
- << quantity<inch_length>(iml2) << std::endl
- << quantity<inch_length>(iml3) << std::endl
- << quantity<inch_length>(iml4) << std::endl
- << quantity<inch_length>(iml5) << std::endl
+ std::cout << iml1 << " = " << quantity<inch_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<inch_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<inch_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<inch_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<inch_length>(iml5) << std::endl
                                   << std::endl;
 
- std::cout << quantity<foot_length>(iml1) << std::endl
- << quantity<foot_length>(iml2) << std::endl
- << quantity<foot_length>(iml3) << std::endl
- << quantity<foot_length>(iml4) << std::endl
- << quantity<foot_length>(iml5) << std::endl
+ std::cout << iml1 << " = " << quantity<foot_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<foot_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<foot_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<foot_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<foot_length>(iml5) << std::endl
                                   << std::endl;
 
- std::cout << quantity<yard_length>(iml1) << std::endl
- << quantity<yard_length>(iml2) << std::endl
- << quantity<yard_length>(iml3) << std::endl
- << quantity<yard_length>(iml4) << std::endl
- << quantity<yard_length>(iml5) << std::endl
+ std::cout << iml1 << " = " << quantity<yard_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<yard_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<yard_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<yard_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<yard_length>(iml5) << std::endl
                                   << std::endl;
 
- std::cout << quantity<mile_length>(iml1) << std::endl
- << quantity<mile_length>(iml2) << std::endl
- << quantity<mile_length>(iml3) << std::endl
- << quantity<mile_length>(iml4) << std::endl
- << quantity<mile_length>(iml5) << std::endl
+ std::cout << iml1 << " = " << quantity<mile_length>(iml1) << std::endl
+ << iml2 << " = " << quantity<mile_length>(iml2) << std::endl
+ << iml3 << " = " << quantity<mile_length>(iml3) << std::endl
+ << iml4 << " = " << quantity<mile_length>(iml4) << std::endl
+ << iml5 << " = " << quantity<mile_length>(iml5) << std::endl
                                   << std::endl;
 
                 quantity<grain_mass> imm1(1.0*grains);
@@ -961,75 +884,67 @@
                 quantity<hundredweight_mass> imm5(1.0*hundredweights);
                 quantity<ton_mass> imm6(1.0*tons);
 
- std::cout << imm1 << std::endl
- << imm2 << std::endl
- << imm3 << std::endl
- << imm4 << std::endl
- << imm5 << std::endl
- << imm6 << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(imm6/imm1) << std::endl
- << quantity<si::dimensionless>(imm6/imm2) << std::endl
- << quantity<si::dimensionless>(imm6/imm3) << std::endl
- << quantity<si::dimensionless>(imm6/imm4) << std::endl
- << quantity<si::dimensionless>(imm6/imm5) << std::endl
- << std::endl;
-
- std::cout << quantity<si::mass>(imm1) << std::endl
- << quantity<si::mass>(imm2) << std::endl
- << quantity<si::mass>(imm3) << std::endl
- << quantity<si::mass>(imm4) << std::endl
- << quantity<si::mass>(imm5) << std::endl
- << quantity<si::mass>(imm6) << std::endl
- << std::endl;
-
- std::cout << quantity<grain_mass>(imm1) << std::endl
- << quantity<grain_mass>(imm2) << std::endl
- << quantity<grain_mass>(imm3) << std::endl
- << quantity<grain_mass>(imm4) << std::endl
- << quantity<grain_mass>(imm5) << std::endl
- << quantity<grain_mass>(imm6) << std::endl
- << std::endl;
-
- std::cout << quantity<dram_mass>(imm1) << std::endl
- << quantity<dram_mass>(imm2) << std::endl
- << quantity<dram_mass>(imm3) << std::endl
- << quantity<dram_mass>(imm4) << std::endl
- << quantity<dram_mass>(imm5) << std::endl
- << quantity<dram_mass>(imm6) << std::endl
- << std::endl;
-
- std::cout << quantity<ounce_mass>(imm1) << std::endl
- << quantity<ounce_mass>(imm2) << std::endl
- << quantity<ounce_mass>(imm3) << std::endl
- << quantity<ounce_mass>(imm4) << std::endl
- << quantity<ounce_mass>(imm5) << std::endl
- << quantity<ounce_mass>(imm6) << std::endl
- << std::endl;
-
- std::cout << quantity<pound_mass>(imm1) << std::endl
- << quantity<pound_mass>(imm2) << std::endl
- << quantity<pound_mass>(imm3) << std::endl
- << quantity<pound_mass>(imm4) << std::endl
- << quantity<pound_mass>(imm5) << std::endl
- << quantity<pound_mass>(imm6) << std::endl
- << std::endl;
-
- std::cout << quantity<hundredweight_mass>(imm1) << std::endl
- << quantity<hundredweight_mass>(imm2) << std::endl
- << quantity<hundredweight_mass>(imm3) << std::endl
- << quantity<hundredweight_mass>(imm4) << std::endl
- << quantity<hundredweight_mass>(imm5) << std::endl
- << quantity<hundredweight_mass>(imm6) << std::endl
- << std::endl;
-
- std::cout << quantity<ton_mass>(imm1) << std::endl
- << quantity<ton_mass>(imm2) << std::endl
- << quantity<ton_mass>(imm3) << std::endl
- << quantity<ton_mass>(imm4) << std::endl
- << quantity<ton_mass>(imm5) << std::endl
- << quantity<ton_mass>(imm6) << std::endl
+ std::cout << imm1 << " = " << quantity<si::mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<si::mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<si::mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<si::mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<si::mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<si::mass>(imm6) << std::endl
+ << std::endl;
+
+ std::cout << imm6 << "/" << imm1 << " = " << quantity<si::dimensionless>(imm6/imm1) << std::endl
+ << imm6 << "/" << imm2 << " = " << quantity<si::dimensionless>(imm6/imm2) << std::endl
+ << imm6 << "/" << imm3 << " = " << quantity<si::dimensionless>(imm6/imm3) << std::endl
+ << imm6 << "/" << imm4 << " = " << quantity<si::dimensionless>(imm6/imm4) << std::endl
+ << imm6 << "/" << imm5 << " = " << quantity<si::dimensionless>(imm6/imm5) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<grain_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<grain_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<grain_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<grain_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<grain_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<grain_mass>(imm6) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<dram_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<dram_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<dram_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<dram_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<dram_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<dram_mass>(imm6) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<ounce_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<ounce_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<ounce_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<ounce_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<ounce_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<ounce_mass>(imm6) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<pound_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<pound_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<pound_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<pound_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<pound_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<pound_mass>(imm6) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<hundredweight_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<hundredweight_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<hundredweight_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<hundredweight_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<hundredweight_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<hundredweight_mass>(imm6) << std::endl
+ << std::endl;
+
+ std::cout << imm1 << " = " << quantity<ton_mass>(imm1) << std::endl
+ << imm2 << " = " << quantity<ton_mass>(imm2) << std::endl
+ << imm3 << " = " << quantity<ton_mass>(imm3) << std::endl
+ << imm4 << " = " << quantity<ton_mass>(imm4) << std::endl
+ << imm5 << " = " << quantity<ton_mass>(imm5) << std::endl
+ << imm6 << " = " << quantity<ton_mass>(imm6) << std::endl
                                   << std::endl;
                                   
                 quantity<minim_volume> imv1(1.0*minims);
@@ -1043,159 +958,147 @@
                 quantity<quart_volume> imv9(1.0*quarts);
                 quantity<gallon_volume> imv10(1.0*gallons);
                 
- std::cout << imv1 << std::endl
- << imv2 << std::endl
- << imv3 << std::endl
- << imv4 << std::endl
- << imv5 << std::endl
- << imv6 << std::endl
- << imv7 << std::endl
- << imv8 << std::endl
- << imv9 << std::endl
- << imv10 << std::endl
- << std::endl;
-
- std::cout << quantity<si::dimensionless>(imv10/imv1) << std::endl
- << quantity<si::dimensionless>(imv10/imv2) << std::endl
- << quantity<si::dimensionless>(imv10/imv3) << std::endl
- << quantity<si::dimensionless>(imv10/imv4) << std::endl
- << quantity<si::dimensionless>(imv10/imv5) << std::endl
- << quantity<si::dimensionless>(imv10/imv6) << std::endl
- << quantity<si::dimensionless>(imv10/imv7) << std::endl
- << quantity<si::dimensionless>(imv10/imv8) << std::endl
- << quantity<si::dimensionless>(imv10/imv9) << std::endl
- << std::endl;
-
- std::cout << quantity<si::volume>(imv1) << std::endl
- << quantity<si::volume>(imv2) << std::endl
- << quantity<si::volume>(imv3) << std::endl
- << quantity<si::volume>(imv4) << std::endl
- << quantity<si::volume>(imv5) << std::endl
- << quantity<si::volume>(imv6) << std::endl
- << quantity<si::volume>(imv7) << std::endl
- << quantity<si::volume>(imv8) << std::endl
- << quantity<si::volume>(imv9) << std::endl
- << quantity<si::volume>(imv10) << std::endl
- << std::endl;
-
- std::cout << quantity<minim_volume>(imv1) << std::endl
- << quantity<minim_volume>(imv2) << std::endl
- << quantity<minim_volume>(imv3) << std::endl
- << quantity<minim_volume>(imv4) << std::endl
- << quantity<minim_volume>(imv5) << std::endl
- << quantity<minim_volume>(imv6) << std::endl
- << quantity<minim_volume>(imv7) << std::endl
- << quantity<minim_volume>(imv8) << std::endl
- << quantity<minim_volume>(imv9) << std::endl
- << quantity<minim_volume>(imv10) << std::endl
- << std::endl;
-
-// std::cout << quantity<fluid_dram_volume>(imv1) << std::endl
-// << quantity<fluid_dram_volume>(imv2) << std::endl
-// << quantity<fluid_dram_volume>(imv3) << std::endl
-// << quantity<fluid_dram_volume>(imv4) << std::endl
-// << quantity<fluid_dram_volume>(imv5) << std::endl
-// << quantity<fluid_dram_volume>(imv6) << std::endl
-// << quantity<fluid_dram_volume>(imv7) << std::endl
-// << quantity<fluid_dram_volume>(imv8) << std::endl
-// << quantity<fluid_dram_volume>(imv9) << std::endl
-// << quantity<fluid_dram_volume>(imv10) << std::endl
-// << std::endl;
-
- std::cout << quantity<teaspoon_volume>(imv1) << std::endl
- << quantity<teaspoon_volume>(imv2) << std::endl
- << quantity<teaspoon_volume>(imv3) << std::endl
- << quantity<teaspoon_volume>(imv4) << std::endl
- << quantity<teaspoon_volume>(imv5) << std::endl
- << quantity<teaspoon_volume>(imv6) << std::endl
- << quantity<teaspoon_volume>(imv7) << std::endl
- << quantity<teaspoon_volume>(imv8) << std::endl
- << quantity<teaspoon_volume>(imv9) << std::endl
- << quantity<teaspoon_volume>(imv10) << std::endl
- << std::endl;
-
-// std::cout << quantity<tablespoon_volume>(imv1) << std::endl
-// << quantity<tablespoon_volume>(imv2) << std::endl
-// << quantity<tablespoon_volume>(imv3) << std::endl
-// << quantity<tablespoon_volume>(imv4) << std::endl
-// << quantity<tablespoon_volume>(imv5) << std::endl
-// << quantity<tablespoon_volume>(imv6) << std::endl
-// << quantity<tablespoon_volume>(imv7) << std::endl
-// << quantity<tablespoon_volume>(imv8) << std::endl
-// << quantity<tablespoon_volume>(imv9) << std::endl
-// << quantity<tablespoon_volume>(imv10) << std::endl
-// << std::endl;
-
- std::cout << quantity<fluid_ounce_volume>(imv1) << std::endl
- << quantity<fluid_ounce_volume>(imv2) << std::endl
- << quantity<fluid_ounce_volume>(imv3) << std::endl
- << quantity<fluid_ounce_volume>(imv4) << std::endl
- << quantity<fluid_ounce_volume>(imv5) << std::endl
- << quantity<fluid_ounce_volume>(imv6) << std::endl
- << quantity<fluid_ounce_volume>(imv7) << std::endl
- << quantity<fluid_ounce_volume>(imv8) << std::endl
- << quantity<fluid_ounce_volume>(imv9) << std::endl
- << quantity<fluid_ounce_volume>(imv10) << std::endl
+ std::cout << imv1 << " = " << quantity<si::volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<si::volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<si::volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<si::volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<si::volume>(imv5) << std::endl
+ << imv6 << " = " << quantity<si::volume>(imv6) << std::endl
+ << imv7 << " = " << quantity<si::volume>(imv7) << std::endl
+ << imv8 << " = " << quantity<si::volume>(imv8) << std::endl
+ << imv9 << " = " << quantity<si::volume>(imv9) << std::endl
+ << imv10 << " = " << quantity<si::volume>(imv10) << std::endl
+ << std::endl;
+
+ std::cout << imv10 << "/" << imv1 << " = " << quantity<si::dimensionless>(imv10/imv1) << std::endl
+ << imv10 << "/" << imv2 << " = " << quantity<si::dimensionless>(imv10/imv2) << std::endl
+ << imv10 << "/" << imv3 << " = " << quantity<si::dimensionless>(imv10/imv3) << std::endl
+ << imv10 << "/" << imv4 << " = " << quantity<si::dimensionless>(imv10/imv4) << std::endl
+ << imv10 << "/" << imv5 << " = " << quantity<si::dimensionless>(imv10/imv5) << std::endl
+ << imv10 << "/" << imv6 << " = " << quantity<si::dimensionless>(imv10/imv6) << std::endl
+ << imv10 << "/" << imv7 << " = " << quantity<si::dimensionless>(imv10/imv7) << std::endl
+ << imv10 << "/" << imv8 << " = " << quantity<si::dimensionless>(imv10/imv8) << std::endl
+ << imv10 << "/" << imv9 << " = " << quantity<si::dimensionless>(imv10/imv9) << std::endl
+ << std::endl;
+
+ std::cout << imv1 << " = " << quantity<minim_volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<minim_volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<minim_volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<minim_volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<minim_volume>(imv5) << std::endl
+ << imv6 << " = " << quantity<minim_volume>(imv6) << std::endl
+ << imv7 << " = " << quantity<minim_volume>(imv7) << std::endl
+ << imv8 << " = " << quantity<minim_volume>(imv8) << std::endl
+ << imv9 << " = " << quantity<minim_volume>(imv9) << std::endl
+ << imv10 << " = " << quantity<minim_volume>(imv10) << std::endl
+ << std::endl;
+
+// std::cout << imv1 << " = " << quantity<fluid_dram_volume>(imv1) << std::endl
+// << imv2 << " = " << quantity<fluid_dram_volume>(imv2) << std::endl
+// << imv3 << " = " << quantity<fluid_dram_volume>(imv3) << std::endl
+// << imv4 << " = " << quantity<fluid_dram_volume>(imv4) << std::endl
+// << imv5 << " = " << quantity<fluid_dram_volume>(imv5) << std::endl
+// << imv6 << " = " << quantity<fluid_dram_volume>(imv6) << std::endl
+// << imv7 << " = " << quantity<fluid_dram_volume>(imv7) << std::endl
+// << imv8 << " = " << quantity<fluid_dram_volume>(imv8) << std::endl
+// << imv9 << " = " << quantity<fluid_dram_volume>(imv9) << std::endl
+// << imv10 << " = " << quantity<fluid_dram_volume>(imv10) << std::endl
+// << std::endl;
+
+ std::cout << imv1 << " = " << quantity<teaspoon_volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<teaspoon_volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<teaspoon_volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<teaspoon_volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<teaspoon_volume>(imv5) << std::endl
+ << imv6 << " = " << quantity<teaspoon_volume>(imv6) << std::endl
+ << imv7 << " = " << quantity<teaspoon_volume>(imv7) << std::endl
+ << imv8 << " = " << quantity<teaspoon_volume>(imv8) << std::endl
+ << imv9 << " = " << quantity<teaspoon_volume>(imv9) << std::endl
+ << imv10 << " = " << quantity<teaspoon_volume>(imv10) << std::endl
+ << std::endl;
+
+// std::cout << imv1 << " = " << quantity<tablespoon_volume>(imv1) << std::endl
+// << imv2 << " = " << quantity<tablespoon_volume>(imv2) << std::endl
+// << imv3 << " = " << quantity<tablespoon_volume>(imv3) << std::endl
+// << imv4 << " = " << quantity<tablespoon_volume>(imv4) << std::endl
+// << imv5 << " = " << quantity<tablespoon_volume>(imv5) << std::endl
+// << imv6 << " = " << quantity<tablespoon_volume>(imv6) << std::endl
+// << imv7 << " = " << quantity<tablespoon_volume>(imv7) << std::endl
+// << imv8 << " = " << quantity<tablespoon_volume>(imv8) << std::endl
+// << imv9 << " = " << quantity<tablespoon_volume>(imv9) << std::endl
+// << imv10 << " = " << quantity<tablespoon_volume>(imv10) << std::endl
+// << std::endl;
+
+ std::cout << imv1 << " = " << quantity<fluid_ounce_volume>(imv1) << std::endl
+ << imv2 << " = " << quantity<fluid_ounce_volume>(imv2) << std::endl
+ << imv3 << " = " << quantity<fluid_ounce_volume>(imv3) << std::endl
+ << imv4 << " = " << quantity<fluid_ounce_volume>(imv4) << std::endl
+ << imv5 << " = " << quantity<fluid_ounce_volume>(imv5) << std::endl
+ << imv6 << " = " << quantity<fluid_ounce_volume>(imv6) << std::endl
+ << imv7 << " = " << quantity<fluid_ounce_volume>(imv7) << std::endl
+ << imv8 << " = " << quantity<fluid_ounce_volume>(imv8) << std::endl
+ << imv9 << " = " << quantity<fluid_ounce_volume>(imv9) << std::endl
+ << imv10 << " = " << quantity<fluid_ounce_volume>(imv10) << std::endl
                                   << std::endl;
 //
-// std::cout << quantity<gill_volume>(imv1) << std::endl
-// << quantity<gill_volume>(imv2) << std::endl
-// << quantity<gill_volume>(imv3) << std::endl
-// << quantity<gill_volume>(imv4) << std::endl
-// << quantity<gill_volume>(imv5) << std::endl
-// << quantity<gill_volume>(imv6) << std::endl
-// << quantity<gill_volume>(imv7) << std::endl
-// << quantity<gill_volume>(imv8) << std::endl
-// << quantity<gill_volume>(imv9) << std::endl
-// << quantity<gill_volume>(imv10) << std::endl
+// std::cout << imv1 << " = " << quantity<gill_volume>(imv1) << std::endl
+// << imv2 << " = " << quantity<gill_volume>(imv2) << std::endl
+// << imv3 << " = " << quantity<gill_volume>(imv3) << std::endl
+// << imv4 << " = " << quantity<gill_volume>(imv4) << std::endl
+// << imv5 << " = " << quantity<gill_volume>(imv5) << std::endl
+// << imv6 << " = " << quantity<gill_volume>(imv6) << std::endl
+// << imv7 << " = " << quantity<gill_volume>(imv7) << std::endl
+// << imv8 << " = " << quantity<gill_volume>(imv8) << std::endl
+// << imv9 << " = " << quantity<gill_volume>(imv9) << std::endl
+// << imv10 << " = " << quantity<gill_volume>(imv10) << std::endl
 // << std::endl;
 //
-// std::cout << quantity<cup_volume>(imv1) << std::endl
-// << quantity<cup_volume>(imv2) << std::endl
-// << quantity<cup_volume>(imv3) << std::endl
-// << quantity<cup_volume>(imv4) << std::endl
-// << quantity<cup_volume>(imv5) << std::endl
-// << quantity<cup_volume>(imv6) << std::endl
-// << quantity<cup_volume>(imv7) << std::endl
-// << quantity<cup_volume>(imv8) << std::endl
-// << quantity<cup_volume>(imv9) << std::endl
-// << quantity<cup_volume>(imv10) << std::endl
+// std::cout << imv1 << " = " << quantity<cup_volume>(imv1) << std::endl
+// << imv2 << " = " << quantity<cup_volume>(imv2) << std::endl
+// << imv3 << " = " << quantity<cup_volume>(imv3) << std::endl
+// << imv4 << " = " << quantity<cup_volume>(imv4) << std::endl
+// << imv5 << " = " << quantity<cup_volume>(imv5) << std::endl
+// << imv6 << " = " << quantity<cup_volume>(imv6) << std::endl
+// << imv7 << " = " << quantity<cup_volume>(imv7) << std::endl
+// << imv8 << " = " << quantity<cup_volume>(imv8) << std::endl
+// << imv9 << " = " << quantity<cup_volume>(imv9) << std::endl
+// << imv10 << " = " << quantity<cup_volume>(imv10) << std::endl
 // << std::endl;
 //
-// std::cout << quantity<pint_volume>(imv1) << std::endl
-// << quantity<pint_volume>(imv2) << std::endl
-// << quantity<pint_volume>(imv3) << std::endl
-// << quantity<pint_volume>(imv4) << std::endl
-// << quantity<pint_volume>(imv5) << std::endl
-// << quantity<pint_volume>(imv6) << std::endl
-// << quantity<pint_volume>(imv7) << std::endl
-// << quantity<pint_volume>(imv8) << std::endl
-// << quantity<pint_volume>(imv9) << std::endl
-// << quantity<pint_volume>(imv10) << std::endl
+// std::cout << imv1 << " = " << quantity<pint_volume>(imv1) << std::endl
+// << imv2 << " = " << quantity<pint_volume>(imv2) << std::endl
+// << imv3 << " = " << quantity<pint_volume>(imv3) << std::endl
+// << imv4 << " = " << quantity<pint_volume>(imv4) << std::endl
+// << imv5 << " = " << quantity<pint_volume>(imv5) << std::endl
+// << imv6 << " = " << quantity<pint_volume>(imv6) << std::endl
+// << imv7 << " = " << quantity<pint_volume>(imv7) << std::endl
+// << imv8 << " = " << quantity<pint_volume>(imv8) << std::endl
+// << imv9 << " = " << quantity<pint_volume>(imv9) << std::endl
+// << imv10 << " = " << quantity<pint_volume>(imv10) << std::endl
 // << std::endl;
 //
-// std::cout << quantity<quart_volume>(imv1) << std::endl
-// << quantity<quart_volume>(imv2) << std::endl
-// << quantity<quart_volume>(imv3) << std::endl
-// << quantity<quart_volume>(imv4) << std::endl
-// << quantity<quart_volume>(imv5) << std::endl
-// << quantity<quart_volume>(imv6) << std::endl
-// << quantity<quart_volume>(imv7) << std::endl
-// << quantity<quart_volume>(imv8) << std::endl
-// << quantity<quart_volume>(imv9) << std::endl
-// << quantity<quart_volume>(imv10) << std::endl
+// std::cout << imv1 << " = " << quantity<quart_volume>(imv1) << std::endl
+// << imv2 << " = " << quantity<quart_volume>(imv2) << std::endl
+// << imv3 << " = " << quantity<quart_volume>(imv3) << std::endl
+// << imv4 << " = " << quantity<quart_volume>(imv4) << std::endl
+// << imv5 << " = " << quantity<quart_volume>(imv5) << std::endl
+// << imv6 << " = " << quantity<quart_volume>(imv6) << std::endl
+// << imv7 << " = " << quantity<quart_volume>(imv7) << std::endl
+// << imv8 << " = " << quantity<quart_volume>(imv8) << std::endl
+// << imv9 << " = " << quantity<quart_volume>(imv9) << std::endl
+// << imv10 << " = " << quantity<quart_volume>(imv10) << std::endl
 // << std::endl;
 //
-// std::cout << quantity<gallon_volume>(imv1) << std::endl
-// << quantity<gallon_volume>(imv2) << std::endl
-// << quantity<gallon_volume>(imv3) << std::endl
-// << quantity<gallon_volume>(imv4) << std::endl
-// << quantity<gallon_volume>(imv5) << std::endl
-// << quantity<gallon_volume>(imv6) << std::endl
-// << quantity<gallon_volume>(imv7) << std::endl
-// << quantity<gallon_volume>(imv8) << std::endl
-// << quantity<gallon_volume>(imv9) << std::endl
-// << quantity<gallon_volume>(imv10) << std::endl
+// std::cout << imv1 << " = " << quantity<gallon_volume>(imv1) << std::endl
+// << imv2 << " = " << quantity<gallon_volume>(imv2) << std::endl
+// << imv3 << " = " << quantity<gallon_volume>(imv3) << std::endl
+// << imv4 << " = " << quantity<gallon_volume>(imv4) << std::endl
+// << imv5 << " = " << quantity<gallon_volume>(imv5) << std::endl
+// << imv6 << " = " << quantity<gallon_volume>(imv6) << std::endl
+// << imv7 << " = " << quantity<gallon_volume>(imv7) << std::endl
+// << imv8 << " = " << quantity<gallon_volume>(imv8) << std::endl
+// << imv9 << " = " << quantity<gallon_volume>(imv9) << std::endl
+// << imv10 << " = " << quantity<gallon_volume>(imv10) << std::endl
 // << std::endl;
         }
         

Modified: sandbox/units/libs/units/test/fail_quantity_non_unit.cpp
==============================================================================
--- sandbox/units/libs/units/test/fail_quantity_non_unit.cpp (original)
+++ sandbox/units/libs/units/test/fail_quantity_non_unit.cpp 2008-05-19 02:36:31 EDT (Mon, 19 May 2008)
@@ -31,6 +31,7 @@
 {
 
     bu::quantity<bu::meter_base_unit> q;
+
 
     return 0;
 }

Modified: sandbox/units/libs/units/test/test_custom_unit.cpp
==============================================================================
--- sandbox/units/libs/units/test/test_custom_unit.cpp (original)
+++ sandbox/units/libs/units/test/test_custom_unit.cpp 2008-05-19 02:36:31 EDT (Mon, 19 May 2008)
@@ -41,12 +41,18 @@
 template<int Mass1, int Length1, int Time1, int Mass2, int Length2, int Time2>
 simple_unit<Mass1 + Mass2, Length1 + Length2, Time1 + Time2>
 operator*(const simple_unit<Mass1, Length1, Time1>&,
- const simple_unit<Mass2, Length2, Time2>&) {}
+ const simple_unit<Mass2, Length2, Time2>&)
+{
+ return simple_unit<Mass1 + Mass2, Length1 + Length2, Time1 + Time2>();
+}
 
 template<int Mass1, int Length1, int Time1, int Mass2, int Length2, int Time2>
 simple_unit<Mass1 - Mass2, Length1 - Length2, Time1 - Time2>
 operator/(const simple_unit<Mass1, Length1, Time1>&,
- const simple_unit<Mass2, Length2, Time2>&) {}
+ const simple_unit<Mass2, Length2, Time2>&)
+{
+ return simple_unit<Mass1 - Mass2, Length1 - Length2, Time1 - Time2>();
+}
 
 int test_main(int,char *[])
 {


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk