|
From: Matthias S. <mat...@us...> - 2007-04-05 21:56:17
|
Update of /cvsroot/boost-sandbox/boost-sandbox/libs/units/example In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30903/example Modified Files: unit_example_22.cpp unit_example_4.cpp Log Message: remove boost/units/measurement.hpp, move to libs/units/example test conversion_factor<> function Index: unit_example_22.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/units/example/unit_example_22.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- unit_example_22.cpp 5 Apr 2007 21:09:34 -0000 1.12 +++ unit_example_22.cpp 5 Apr 2007 21:56:15 -0000 1.13 @@ -419,6 +419,10 @@ #include <boost/units/quantity.hpp> #include <boost/units/systems/si/force.hpp> #include <boost/units/systems/cgs/force.hpp> +#include <boost/units/systems/si/mass.hpp> +#include <boost/units/systems/cgs/mass.hpp> +#include <boost/units/systems/si/momentum.hpp> +#include <boost/units/systems/cgs/momentum.hpp> int main() { @@ -426,7 +430,11 @@ using namespace boost::units; std::cout << quantity<SI::dimensionless>(1.0*CGS::dyne/SI::newton) << std::endl; - std::cout << conversion_factor<CGS::dyne,SI::newton,double>() << std::endl; + std::cout << exp(quantity<SI::dimensionless>(1.0*(SI::newtons*CGS::dynes)/(SI::newtons*CGS::dynes))) << std::endl; + std::cout << conversion_factor<double>(CGS::dyne,SI::newton) << std::endl; + std::cout << conversion_factor<double>(SI::newton/SI::kilogram,CGS::dyne/CGS::gram) << std::endl; + std::cout << conversion_factor<double>(CGS::momentum(),SI::momentum()) << std::endl; + std::cout << conversion_factor<double>(SI::momentum()/SI::mass(),CGS::momentum()/CGS::mass()) << std::endl; return 0; } Index: unit_example_4.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/units/example/unit_example_4.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- unit_example_4.cpp 4 Apr 2007 20:06:57 -0000 1.8 +++ unit_example_4.cpp 5 Apr 2007 21:56:15 -0000 1.9 @@ -141,12 +141,13 @@ #include <algorithm> #include <sstream> -#include <boost/units/measurement.hpp> #include <boost/units/io.hpp> #include <boost/units/systems/si.hpp> #include <boost/units/systems/trig.hpp> #include <boost/units/systems/si/codata/physico-chemical_constants.hpp> +#include "measurement.hpp" + namespace boost { namespace units { |