|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r60676 - in branches/units/autoprefix: boost/units boost/units/detail boost/units/systems/si/codata libs/units/doc libs/units/example libs/units/test
From: steven_at_[hidden]
Date: 2010-03-17 12:38:54
Author: steven_watanabe
Date: 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
New Revision: 60676
URL: http://svn.boost.org/trac/boost/changeset/60676
Log:
Revert spurious changes
Text files modified:
branches/units/autoprefix/boost/units/absolute.hpp | 19 +-
branches/units/autoprefix/boost/units/base_dimension.hpp | 22 +-
branches/units/autoprefix/boost/units/base_unit.hpp | 18 -
branches/units/autoprefix/boost/units/cmath.hpp | 226 ++++++++++++-------------
branches/units/autoprefix/boost/units/config.hpp | 36 ---
branches/units/autoprefix/boost/units/conversion.hpp | 5
branches/units/autoprefix/boost/units/derived_dimension.hpp | 25 +-
branches/units/autoprefix/boost/units/detail/linear_algebra.hpp | 2
branches/units/autoprefix/boost/units/dim.hpp | 60 +++---
branches/units/autoprefix/boost/units/dimension.hpp | 48 ++--
branches/units/autoprefix/boost/units/dimensionless_quantity.hpp | 2
branches/units/autoprefix/boost/units/dimensionless_type.hpp | 6
branches/units/autoprefix/boost/units/dimensionless_unit.hpp | 2
branches/units/autoprefix/boost/units/get_dimension.hpp | 2
branches/units/autoprefix/boost/units/get_system.hpp | 4
branches/units/autoprefix/boost/units/heterogeneous_system.hpp | 4
branches/units/autoprefix/boost/units/homogeneous_system.hpp | 17 -
branches/units/autoprefix/boost/units/io.hpp | 164 ++++++++++--------
branches/units/autoprefix/boost/units/is_dim.hpp | 4
branches/units/autoprefix/boost/units/is_dimension_list.hpp | 2
branches/units/autoprefix/boost/units/is_dimensionless.hpp | 4
branches/units/autoprefix/boost/units/is_dimensionless_quantity.hpp | 4
branches/units/autoprefix/boost/units/is_dimensionless_unit.hpp | 4
branches/units/autoprefix/boost/units/is_quantity.hpp | 4
branches/units/autoprefix/boost/units/is_quantity_of_dimension.hpp | 2
branches/units/autoprefix/boost/units/is_quantity_of_system.hpp | 4
branches/units/autoprefix/boost/units/is_unit.hpp | 4
branches/units/autoprefix/boost/units/is_unit_of_dimension.hpp | 4
branches/units/autoprefix/boost/units/is_unit_of_system.hpp | 8
branches/units/autoprefix/boost/units/lambda.hpp | 7
branches/units/autoprefix/boost/units/limits.hpp | 2
branches/units/autoprefix/boost/units/make_scaled_unit.hpp | 7
branches/units/autoprefix/boost/units/make_system.hpp | 6
branches/units/autoprefix/boost/units/operators.hpp | 16
branches/units/autoprefix/boost/units/physical_dimensions.hpp | 2
branches/units/autoprefix/boost/units/pow.hpp | 26 +-
branches/units/autoprefix/boost/units/quantity.hpp | 293 ++++++++++++++++-----------------
branches/units/autoprefix/boost/units/reduce_unit.hpp | 4
branches/units/autoprefix/boost/units/scale.hpp | 5
branches/units/autoprefix/boost/units/scaled_base_unit.hpp | 8
branches/units/autoprefix/boost/units/static_constant.hpp | 15 -
branches/units/autoprefix/boost/units/static_rational.hpp | 3
branches/units/autoprefix/boost/units/systems/si/codata/electromagnetic_constants.hpp | 8
branches/units/autoprefix/boost/units/unit.hpp | 80 ++++----
branches/units/autoprefix/boost/units/units_fwd.hpp | 9
branches/units/autoprefix/libs/units/doc/units.qbk | 346 +++++++++++++++++++--------------------
branches/units/autoprefix/libs/units/example/complex.cpp | 132 +++++++-------
branches/units/autoprefix/libs/units/example/composite_output.cpp | 12
branches/units/autoprefix/libs/units/example/conversion.cpp | 34 +-
branches/units/autoprefix/libs/units/example/conversion_factor.cpp | 10
branches/units/autoprefix/libs/units/example/dimension.cpp | 26 +-
branches/units/autoprefix/libs/units/example/tutorial.cpp | 4
branches/units/autoprefix/libs/units/test/test_output.cpp | 2
branches/units/autoprefix/libs/units/test/test_unscale.cpp | 4
54 files changed, 846 insertions(+), 921 deletions(-)
Modified: branches/units/autoprefix/boost/units/absolute.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/absolute.hpp (original)
+++ branches/units/autoprefix/boost/units/absolute.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -16,6 +16,7 @@
#ifndef BOOST_UNITS_ABSOLUTE_HPP
#define BOOST_UNITS_ABSOLUTE_HPP
+
#include <iosfwd>
#include <boost/units/detail/absolute_impl.hpp>
@@ -25,7 +26,7 @@
namespace units {
/// A wrapper to represent absolute units (points rather than vectors). Intended
-/// originally for temperatures, this class implements operators for absolute units
+/// originally for temperatures, this class implements operators for absolute units
/// so that addition of a relative unit to an absolute unit results in another
/// absolute unit : absolute<T> +/- T -> absolute<T> and subtraction of one absolute
/// unit from another results in a relative unit : absolute<T> - absolute<T> -> T.
@@ -35,18 +36,18 @@
public:
typedef absolute<Y> this_type;
typedef Y value_type;
-
+
absolute() : val_() { }
absolute(const value_type& val) : val_(val) { }
absolute(const this_type& source) : val_(source.val_) { }
-
+
this_type& operator=(const this_type& source) { val_ = source.val_; return *this; }
-
+
const value_type& value() const { return val_; }
-
+
const this_type& operator+=(const value_type& val) { val_ += val; return *this; }
const this_type& operator-=(const value_type& val) { val_ -= val; return *this; }
-
+
private:
value_type val_;
};
@@ -99,7 +100,7 @@
{
os << "absolute " << aval.value();
-
+
return os;
}
@@ -126,7 +127,7 @@
/// @endcode
/// @c BOOST_UNITS_DEFINE_CONVERSION_FACTOR is also necessary to
/// specify the conversion factor. Like @c BOOST_UNITS_DEFINE_CONVERSION_FACTOR
-/// this macro defines both forward and reverse conversions so
+/// this macro defines both forward and reverse conversions so
/// defining, e.g., the conversion from celsius to fahrenheit as above will also
/// define the inverse conversion from fahrenheit to celsius.
#define BOOST_UNITS_DEFINE_CONVERSION_OFFSET(From, To, type_, value_) \
Modified: branches/units/autoprefix/boost/units/base_dimension.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/base_dimension.hpp (original)
+++ branches/units/autoprefix/boost/units/base_dimension.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -8,11 +8,9 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-///
/// \file
/// \brief base dimensions (mass, length, time...).
/// \details base dimension definition registration.
-///
#ifndef BOOST_UNITS_BASE_DIMENSION_HPP
#define BOOST_UNITS_BASE_DIMENSION_HPP
@@ -41,7 +39,7 @@
template<class T, long N>
struct check_base_dimension {
enum {
- value =
+ value =
sizeof(boost_units_is_registered(units::base_dimension_ordinal<N>())) == sizeof(detail::yes) &&
sizeof(boost_units_is_registered(units::base_dimension_pair<T, N>())) != sizeof(detail::yes)
};
@@ -63,14 +61,14 @@
>::type
#endif
>
-class base_dimension :
- public ordinal<N>
+class base_dimension :
+ public ordinal<N>
{
public:
/// INTERNAL ONLY
typedef base_dimension this_type;
/// A convenience typedef. Equivalent to boost::units::derived_dimension<Derived,1>::type.
-#ifndef BOOST_UNITS_DOXYGEN
+#ifndef BOOST_UNITS_DOXYGEN
typedef list<dim<Derived,static_rational<1> >, dimensionless_type> dimension_type;
#else
typedef detail::unspecified dimension_type;
@@ -81,14 +79,14 @@
private:
/// Register this ordinal
/// INTERNAL ONLY
- friend detail::yes
- boost_units_is_registered(const units::base_dimension_ordinal<N>&)
+ friend detail::yes
+ boost_units_is_registered(const units::base_dimension_ordinal<N>&)
{ detail::yes result; return(result); }
-
+
/// But make sure we can identify the current instantiation!
/// INTERNAL ONLY
- friend detail::yes
- boost_units_is_registered(const units::base_dimension_pair<Derived, N>&)
+ friend detail::yes
+ boost_units_is_registered(const units::base_dimension_pair<Derived, N>&)
{ detail::yes result; return(result); }
};
Modified: branches/units/autoprefix/boost/units/base_unit.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/base_unit.hpp (original)
+++ branches/units/autoprefix/boost/units/base_unit.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -8,11 +8,9 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-///
/// \file
/// \brief base unit (meter, kg, sec...).
/// \details base unit definition registration.
-///
#ifndef BOOST_UNITS_BASE_UNIT_HPP
#define BOOST_UNITS_BASE_UNIT_HPP
@@ -66,8 +64,8 @@
>::type
#endif
>
-class base_unit :
- public ordinal<N>
+class base_unit :
+ public ordinal<N>
{
public:
/// INTERNAL ONLY
@@ -102,14 +100,14 @@
private:
/// Register this ordinal
/// INTERNAL ONLY
- friend detail::yes
- boost_units_unit_is_registered(const units::base_unit_ordinal<N>&)
+ friend detail::yes
+ boost_units_unit_is_registered(const units::base_unit_ordinal<N>&)
{ detail::yes result; return(result); }
-
+
/// But make sure we can identify the current instantiation!
/// INTERNAL ONLY
- friend detail::yes
- boost_units_unit_is_registered(const units::base_unit_pair<Derived, N>&)
+ friend detail::yes
+ boost_units_unit_is_registered(const units::base_unit_pair<Derived, N>&)
{ detail::yes result; return(result); }
};
Modified: branches/units/autoprefix/boost/units/cmath.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/cmath.hpp (original)
+++ branches/units/autoprefix/boost/units/cmath.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,24 +1,16 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
-// Copyright (C) 2007-2010 Steven Watanabe
+// Copyright (C) 2007-2008 Steven Watanabe
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_UNITS_CMATH_HPP
+#ifndef BOOST_UNITS_CMATH_HPP
#define BOOST_UNITS_CMATH_HPP
-///
-/// \file
-/// \brief Overloads of functions in \<cmath\> for quantities.
-/// \details Only functions for which a dimensionally-correct result type
-/// can be determined are overloaded.
-/// All functions work with dimensionless quantities.
-///
-
#include <boost/config/no_tr1/cmath.hpp>
#include <cstdlib>
@@ -35,195 +27,201 @@
#include <boost/units/systems/si/plane_angle.hpp>
-// BOOST_PREVENT_MACRO_SUBSTITUTION is needed on certain compilers that define
+/// \file
+/// \brief Overloads of functions in \<cmath\> for quantities.
+/// \details Only functions for which a dimensionally-correct result type
+/// can be determined are overloaded.
+/// All functions work with dimensionless quantities.
+
+// BOOST_PREVENT_MACRO_SUBSTITUTION is needed on certain compilers that define
// some <cmath> functions as macros; it is used for all functions even though it
// isn't necessary -- I didn't want to think :)
//
-// the form \code using namespace detail; return(f(x)); \endcode is used
+// the form using namespace detail; return(f(x)); is used
// to enable ADL for UDTs.
namespace boost {
-namespace units {
+namespace units {
template<class Unit,class Y>
-inline
-bool
+inline
+bool
isfinite BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
-{
+{
using boost::math::isfinite;
return isfinite BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
}
template<class Unit,class Y>
-inline
-bool
+inline
+bool
isinf BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
-{
+{
using boost::math::isinf;
return isinf BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
}
template<class Unit,class Y>
inline
-bool
+bool
isnan BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
-{
+{
using boost::math::isnan;
return isnan BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
}
template<class Unit,class Y>
-inline
-bool
+inline
+bool
isnormal BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
-{
+{
using boost::math::isnormal;
return isnormal BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
}
template<class Unit,class Y>
-inline
-bool
+inline
+bool
isgreater BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
-{
+{
using namespace detail;
return isgreater BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
}
template<class Unit,class Y>
-inline
-bool
+inline
+bool
isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
-{
+{
using namespace detail;
return isgreaterequal BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
}
template<class Unit,class Y>
-inline
-bool
+inline
+bool
isless BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
-{
+{
using namespace detail;
return isless BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
}
template<class Unit,class Y>
-inline
-bool
+inline
+bool
islessequal BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
-{
+{
using namespace detail;
return islessequal BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
}
template<class Unit,class Y>
-inline
-bool
+inline
+bool
islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
-{
+{
using namespace detail;
return islessgreater BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
}
template<class Unit,class Y>
-inline
-bool
+inline
+bool
isunordered BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
-{
+{
using namespace detail;
return isunordered BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value());
}
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
abs BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
{
using std::abs;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(abs BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
}
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
ceil BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
{
using std::ceil;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(ceil BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
}
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
copysign BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
{
using boost::math::copysign;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(copysign BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
}
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
fabs BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
{
using std::fabs;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(fabs BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
}
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
floor BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
{
using std::floor;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(floor BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
}
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
fdim BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
{
using namespace detail;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(fdim BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
}
#if 0
template<class Unit1,class Unit2,class Unit3,class Y>
-inline
+inline
typename add_typeof_helper<
typename multiply_typeof_helper<quantity<Unit1,Y>,
quantity<Unit2,Y> >::type,
- quantity<Unit3,Y> >::type
+ quantity<Unit3,Y> >::type
fma BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit1,Y>& q1,
const quantity<Unit2,Y>& q2,
const quantity<Unit3,Y>& q3)
@@ -233,53 +231,53 @@
typedef quantity<Unit1,Y> type1;
typedef quantity<Unit2,Y> type2;
typedef quantity<Unit3,Y> type3;
-
+
typedef typename multiply_typeof_helper<type1,type2>::type prod_type;
typedef typename add_typeof_helper<prod_type,type3>::type quantity_type;
-
+
return quantity_type::from_value(fma BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value(),q3.value()));
}
#endif
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
fmax BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
{
using namespace detail;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(fmax BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
}
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
fmin BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
{
using namespace detail;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(fmin BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
}
template<class Unit,class Y>
-inline
-int
+inline
+int
fpclassify BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
-{
+{
using boost::math::fpclassify;
return fpclassify BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
}
template<class Unit,class Y>
-inline
+inline
typename root_typeof_helper<
typename add_typeof_helper<
typename power_typeof_helper<quantity<Unit,Y>,
@@ -292,69 +290,69 @@
using boost::math::hypot;
typedef quantity<Unit,Y> type1;
-
+
typedef typename power_typeof_helper<type1,static_rational<2> >::type pow_type;
typedef typename add_typeof_helper<pow_type,pow_type>::type add_type;
typedef typename root_typeof_helper<add_type,static_rational<2> >::type quantity_type;
-
+
return quantity_type::from_value(hypot BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
}
// does ISO C++ support long long? g++ claims not
//template<class Unit,class Y>
-//inline
-//quantity<Unit,long long>
+//inline
+//quantity<Unit,long long>
//llrint BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
//{
// using namespace detail;
//
// typedef quantity<Unit,long long> quantity_type;
-//
+//
// return quantity_type::from_value(llrint BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
//}
// does ISO C++ support long long? g++ claims not
//template<class Unit,class Y>
-//inline
-//quantity<Unit,long long>
+//inline
+//quantity<Unit,long long>
//llround BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
//{
// using namespace detail;
//
// typedef quantity<Unit,long long> quantity_type;
-//
+//
// return quantity_type::from_value(llround BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
//}
#if 0
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
nearbyint BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
{
using namespace detail;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(nearbyint BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
}
#endif
template<class Unit,class Y>
-inline
+inline
quantity<Unit,Y> nextafter BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
{
using boost::math::nextafter;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(nextafter BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
}
template<class Unit,class Y>
-inline
+inline
quantity<Unit,Y> nexttoward BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q1,
const quantity<Unit,Y>& q2)
{
@@ -364,57 +362,57 @@
using boost::math::nextafter;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(nextafter BOOST_PREVENT_MACRO_SUBSTITUTION (q1.value(),q2.value()));
}
#if 0
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
rint BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
{
using namespace detail;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(rint BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
}
#endif
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
round BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
{
using boost::math::round;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(round BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
}
template<class Unit,class Y>
-inline
-int
+inline
+int
signbit BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
-{
+{
using boost::math::signbit;
return signbit BOOST_PREVENT_MACRO_SUBSTITUTION (q.value());
}
template<class Unit,class Y>
-inline
-quantity<Unit,Y>
+inline
+quantity<Unit,Y>
trunc BOOST_PREVENT_MACRO_SUBSTITUTION (const quantity<Unit,Y>& q)
{
using namespace detail;
typedef quantity<Unit,Y> quantity_type;
-
+
return quantity_type::from_value(trunc BOOST_PREVENT_MACRO_SUBSTITUTION (q.value()));
}
@@ -424,7 +422,7 @@
fmod(const quantity<Unit,Y>& q1, const quantity<Unit,Y>& q2)
{
using std::fmod;
-
+
typedef quantity<Unit,Y> quantity_type;
return quantity_type::from_value(fmod(q1.value(), q2.value()));
@@ -454,7 +452,7 @@
return quantity_type::from_value(frexp(q.value(),ex));
}
-/// For non-dimensionless quantities, integral and rational powers
+/// For non-dimensionless quantities, integral and rational powers
/// and roots can be computed by @c pow<Ex> and @c root<Rt> respectively.
template<class S, class Y>
inline
@@ -518,7 +516,7 @@
}
template<class Unit,class Y>
-inline
+inline
typename root_typeof_helper<
quantity<Unit,Y>,
static_rational<2>
@@ -547,7 +545,7 @@
/// cos of theta in radians
template<class Y>
-typename dimensionless_quantity<si::system,Y>::type
+typename dimensionless_quantity<si::system,Y>::type
cos(const quantity<si::plane_angle,Y>& theta)
{
using std::cos;
@@ -556,7 +554,7 @@
/// sin of theta in radians
template<class Y>
-typename dimensionless_quantity<si::system,Y>::type
+typename dimensionless_quantity<si::system,Y>::type
sin(const quantity<si::plane_angle,Y>& theta)
{
using std::sin;
@@ -565,32 +563,32 @@
/// tan of theta in radians
template<class Y>
-typename dimensionless_quantity<si::system,Y>::type
+typename dimensionless_quantity<si::system,Y>::type
tan(const quantity<si::plane_angle,Y>& theta)
{
using std::tan;
return tan(theta.value());
}
-/// cos of theta in other angular units
+/// cos of theta in other angular units
template<class System,class Y>
-typename dimensionless_quantity<System,Y>::type
+typename dimensionless_quantity<System,Y>::type
cos(const quantity<unit<plane_angle_dimension,System>,Y>& theta)
{
return cos(quantity<si::plane_angle,Y>(theta));
}
-/// sin of theta in other angular units
+/// sin of theta in other angular units
template<class System,class Y>
-typename dimensionless_quantity<System,Y>::type
+typename dimensionless_quantity<System,Y>::type
sin(const quantity<unit<plane_angle_dimension,System>,Y>& theta)
{
return sin(quantity<si::plane_angle,Y>(theta));
}
-/// tan of theta in other angular units
+/// tan of theta in other angular units
template<class System,class Y>
-typename dimensionless_quantity<System,Y>::type
+typename dimensionless_quantity<System,Y>::type
tan(const quantity<unit<plane_angle_dimension,System>,Y>& theta)
{
return tan(quantity<si::plane_angle,Y>(theta));
Modified: branches/units/autoprefix/boost/units/config.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/config.hpp (original)
+++ branches/units/autoprefix/boost/units/config.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,18 +1,16 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
-// Copyright (C) 2010 Steven Watanabe
+// Copyright (C) 2008 Steven Watanabe
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-///
/// \file
/// \brief Boost units library configuration and Doxygen mainpage.
/// \details BOOST_UNITS_HAS_BOOST_TYPEOF, BOOST_UNITS_REQUIRE_LAYOUT_COMPATIBILITY
-///
#ifndef BOOST_UNITS_CONFIG_HPP
#define BOOST_UNITS_CONFIG_HPP
@@ -28,13 +26,13 @@
///INTERNAL ONLY
#define BOOST_UNITS_HAS_BOOST_TYPEOF 0
#endif
-#endif
+#endif
#if (BOOST_UNITS_HAS_BOOST_TYPEOF)
- #include <boost/typeof/typeof.hpp>
+ #include <boost/typeof/typeof.hpp>
///INTERNAL ONLY
#define BOOST_UNITS_HAS_TYPEOF 1
-#else
+#else
#if (__GNUC__ && __cplusplus && __GNUC__ >= 3)
///INTERNAL ONLY
#define BOOST_UNITS_HAS_TYPEOF 1
@@ -91,30 +89,6 @@
#define BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(a, b) ((void)0)
#endif
-// Create a Doxygen main page that will only appear if standalone Doxygen documentation
-// is produced using the Doxywizard GUI using information in the /doc/doxygen/doxyfile.
-
-/*! \mainpage Boost.Units
-
-A C++ library for zero-overhead dimensional analysis and
-unit and quantity manipulation and conversion.
-
-Copyright (C) 2003-2008 Matthias Christian Schabel
-Copyright (C) 2010 Steven Watanabe
-
-Distributed under the Boost Software License, Version 1.0.
-(See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org//LICENSE_1_0.txt)
-
-This is a standalone index produced by the Doxygen Doxywizard GUI using information in the units/doc/doxygen/doxyfile.
-
-A full index that includes the full documentation and tutorial is at
-
-http://www.boost.org/doc/libs/1_42_0/libs/units/index.html
-
-*/ // end mainpage
-
-/// Defined in jamfile.v2 line 30 during build of documentation,
-/// to ensure these macros are documented.
#ifdef BOOST_UNITS_DOXYGEN
/// If defined will trigger a static assertion if quantity<Unit, T>
Modified: branches/units/autoprefix/boost/units/conversion.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/conversion.hpp (original)
+++ branches/units/autoprefix/boost/units/conversion.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,10 +11,8 @@
#ifndef BOOST_UNITS_CONVERSION_HPP
#define BOOST_UNITS_CONVERSION_HPP
-///
/// \file
/// \brief Template for defining conversions between quantities.
-///
#include <boost/units/detail/conversion_impl.hpp>
@@ -27,7 +25,6 @@
#ifdef BOOST_UNITS_DOXYGEN
-/// \details
/// Template for defining conversions between
/// quantities. This template should be specialized
/// for every quantity that allows conversions.
Modified: branches/units/autoprefix/boost/units/derived_dimension.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/derived_dimension.hpp (original)
+++ branches/units/autoprefix/boost/units/derived_dimension.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,11 +11,6 @@
#ifndef BOOST_UNITS_DERIVED_DIMENSION_HPP
#define BOOST_UNITS_DERIVED_DIMENSION_HPP
-///
-/// \file
-/// \brief Utility classes for defining composite and derived dimensions with integer powers.
-/// \details
-///
#include <boost/units/dim.hpp>
#include <boost/units/dimension.hpp>
#include <boost/units/static_rational.hpp>
@@ -40,7 +35,7 @@
#ifdef BOOST_UNITS_DOXYGEN
typedef detail::unspecified type;
#else
- typedef typename
+ typedef typename
make_dimension_list< list< dim< DT1,static_rational<E1> >,
list< dim< DT2,static_rational<E2> >,
list< dim< DT3,static_rational<E3> >,
@@ -64,7 +59,7 @@
dimensionless_type,0,
dimensionless_type,0>
{
- typedef typename
+ typedef typename
make_dimension_list< list< dim< DT1,static_rational<E1> >, dimensionless_type > >::type type;
};
@@ -81,7 +76,7 @@
dimensionless_type,0,
dimensionless_type,0>
{
- typedef typename
+ typedef typename
make_dimension_list< list< dim< DT1,static_rational<E1> >,
list< dim< DT2,static_rational<E2> >, dimensionless_type > > >::type type;
};
@@ -100,7 +95,7 @@
dimensionless_type,0,
dimensionless_type,0>
{
- typedef typename
+ typedef typename
make_dimension_list< list< dim< DT1,static_rational<E1> >,
list< dim< DT2,static_rational<E2> >,
list< dim< DT3,static_rational<E3> >, dimensionless_type > > > >::type type;
@@ -121,7 +116,7 @@
dimensionless_type,0,
dimensionless_type,0>
{
- typedef typename
+ typedef typename
make_dimension_list< list< dim< DT1,static_rational<E1> >,
list< dim< DT2,static_rational<E2> >,
list< dim< DT3,static_rational<E3> >,
@@ -144,7 +139,7 @@
dimensionless_type,0,
dimensionless_type,0>
{
- typedef typename
+ typedef typename
make_dimension_list< list< dim< DT1,static_rational<E1> >,
list< dim< DT2,static_rational<E2> >,
list< dim< DT3,static_rational<E3> >,
@@ -169,7 +164,7 @@
dimensionless_type,0,
dimensionless_type,0>
{
- typedef typename
+ typedef typename
make_dimension_list< list< dim< DT1,static_rational<E1> >,
list< dim< DT2,static_rational<E2> >,
list< dim< DT3,static_rational<E3> >,
@@ -196,7 +191,7 @@
DT7, E7,
dimensionless_type,0>
{
- typedef typename
+ typedef typename
make_dimension_list< list< dim< DT1,static_rational<E1> >,
list< dim< DT2,static_rational<E2> >,
list< dim< DT3,static_rational<E3> >,
@@ -208,6 +203,6 @@
} // namespace units
-} // namespace boost
+} // namespace boost
#endif // BOOST_UNITS_DERIVED_DIMENSION_HPP
Modified: branches/units/autoprefix/boost/units/detail/linear_algebra.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/detail/linear_algebra.hpp (original)
+++ branches/units/autoprefix/boost/units/detail/linear_algebra.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -200,7 +200,7 @@
RemainingRows == 2 // the next one will be the last.
>::template apply<
typename RowsBegin::next,
- (RemainingRows - 1),
+ RemainingRows - 1,
CurrentColumn,
TotalColumns,
Result
Modified: branches/units/autoprefix/boost/units/dim.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/dim.hpp (original)
+++ branches/units/autoprefix/boost/units/dim.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,8 +1,8 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
-// Copyright (C) 2007-2010 Steven Watanabe
+// Copyright (C) 2007-2008 Steven Watanabe
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
@@ -11,13 +11,36 @@
#ifndef BOOST_UNITS_DIM_HPP
#define BOOST_UNITS_DIM_HPP
+#include <boost/static_assert.hpp>
+
+#include <boost/type_traits/is_same.hpp>
+
+#include <boost/mpl/arithmetic.hpp>
+
+#include <boost/units/config.hpp>
+#include <boost/units/static_rational.hpp>
+#include <boost/units/detail/dim_impl.hpp>
+
+/// \file dim.hpp
+/// \brief Handling of fundamental dimension/exponent pairs.
+
+namespace boost {
+
+namespace units {
+
+namespace detail {
+
+struct dim_tag { };
+
+}
+
+/// \brief Dimension tag/exponent pair for a single fundamental dimension.
///
-/// \file
-/// \brief Handling of fundamental dimension/exponent pairs.
-/// \details The dim class represents a single dimension tag/dimension exponent pair.
+/// \details
+/// The dim class represents a single dimension tag/dimension exponent pair.
/// That is, @c dim<tag_type,value_type> is a pair where @c tag_type represents the
-/// fundamental dimension being represented and @c value_type represents the
-/// exponent of that fundamental dimension as a @c static_rational. @c tag_type must
+/// fundamental dimension being represented and @c value_type represents the
+/// exponent of that fundamental dimension as a @c static_rational. @c tag_type must
/// be a derived from a specialization of @c base_dimension.
/// Specialization of the following Boost.MPL metafunctions are provided
///
@@ -34,26 +57,7 @@
/// - @c mpl::divides for a @c static_rational and a @c dim in either order
///
/// These metafunctions likewise operate on the exponent only.
-///
-
-#include <boost/static_assert.hpp>
-
-#include <boost/type_traits/is_same.hpp>
-
-#include <boost/mpl/arithmetic.hpp>
-
-#include <boost/units/config.hpp>
-#include <boost/units/static_rational.hpp>
-#include <boost/units/detail/dim_impl.hpp>
-
-namespace boost {
-namespace units {
-namespace detail
-{
- struct dim_tag { };
-}
-
-template<typename T,typename V>
+template<typename T,typename V>
struct dim
{
typedef dim type;
@@ -80,7 +84,7 @@
namespace mpl {
-/// define MPL operators acting on dim<T,V>
+// define MPL operators acting on dim<T,V>
template<>
struct plus_impl<boost::units::detail::dim_tag,boost::units::detail::dim_tag>
Modified: branches/units/autoprefix/boost/units/dimension.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/dimension.hpp (original)
+++ branches/units/autoprefix/boost/units/dimension.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,12 +11,26 @@
#ifndef BOOST_UNITS_DIMENSION_HPP
#define BOOST_UNITS_DIMENSION_HPP
-///
-/// \file
+#include <boost/static_assert.hpp>
+
+#include <boost/type_traits/is_same.hpp>
+
+#include <boost/mpl/arithmetic.hpp>
+
+#include <boost/units/static_rational.hpp>
+#include <boost/units/detail/dimension_list.hpp>
+#include <boost/units/detail/dimension_impl.hpp>
+
+/// \file
/// \brief Core metaprogramming utilities for compile-time dimensional analysis.
-/// \details Reduce dimension list to cardinal form. This algorithm collapses duplicate
+
+namespace boost {
+
+namespace units {
+
+/// Reduce dimension list to cardinal form. This algorithm collapses duplicate
/// base dimension tags and sorts the resulting list by the tag ordinal value.
-/// Dimension lists that resolve to the same dimension are guaranteed to be
+/// Dimension lists that resolve to the same dimension are guaranteed to be
/// represented by an identical type.
///
/// The argument should be an MPL forward sequence containing instances
@@ -36,22 +50,6 @@
/// the exponents of the dimension by the static_rational.
/// - @c static_root takes a dimension and a static_rational and divides all
/// the exponents of the dimension by the static_rational.
-///
-
-#include <boost/static_assert.hpp>
-
-#include <boost/type_traits/is_same.hpp>
-
-#include <boost/mpl/arithmetic.hpp>
-
-#include <boost/units/static_rational.hpp>
-#include <boost/units/detail/dimension_list.hpp>
-#include <boost/units/detail/dimension_impl.hpp>
-
-namespace boost {
-
-namespace units {
-
template<typename Seq>
struct make_dimension_list
{
@@ -59,23 +57,23 @@
};
/// Raise a dimension list to a scalar power.
-template<typename DL,typename Ex>
+template<typename DL,typename Ex>
struct static_power
{
typedef typename detail::static_power_impl<DL::size::value>::template apply<
DL,
Ex
- >::type type;
+ >::type type;
};
/// Take a scalar root of a dimension list.
-template<typename DL,typename Rt>
+template<typename DL,typename Rt>
struct static_root
{
typedef typename detail::static_root_impl<DL::size::value>::template apply<
DL,
Rt
- >::type type;
+ >::type type;
};
} // namespace units
Modified: branches/units/autoprefix/boost/units/dimensionless_quantity.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/dimensionless_quantity.hpp (original)
+++ branches/units/autoprefix/boost/units/dimensionless_quantity.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
Modified: branches/units/autoprefix/boost/units/dimensionless_type.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/dimensionless_type.hpp (original)
+++ branches/units/autoprefix/boost/units/dimensionless_type.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -47,7 +47,9 @@
#if BOOST_UNITS_HAS_BOOST_TYPEOF
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()
- BOOST_TYPEOF_REGISTER_TYPE(boost::units::dimensionless_type)
+
+BOOST_TYPEOF_REGISTER_TYPE(boost::units::dimensionless_type)
+
#endif
#endif // BOOST_UNITS_DIMENSIONLESS_TYPE_HPP
Modified: branches/units/autoprefix/boost/units/dimensionless_unit.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/dimensionless_unit.hpp (original)
+++ branches/units/autoprefix/boost/units/dimensionless_unit.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
Modified: branches/units/autoprefix/boost/units/get_dimension.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/get_dimension.hpp (original)
+++ branches/units/autoprefix/boost/units/get_dimension.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
Modified: branches/units/autoprefix/boost/units/get_system.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/get_system.hpp (original)
+++ branches/units/autoprefix/boost/units/get_system.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,10 +11,8 @@
#ifndef BOOST_UNITS_GET_SYSTEM_HPP
#define BOOST_UNITS_GET_SYSTEM_HPP
-///
/// \file
/// \brief Get the system of a unit, absolute unit or quantity.
-///
#include <boost/units/units_fwd.hpp>
Modified: branches/units/autoprefix/boost/units/heterogeneous_system.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/heterogeneous_system.hpp (original)
+++ branches/units/autoprefix/boost/units/heterogeneous_system.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,12 +11,10 @@
#ifndef BOOST_UNITS_HETEROGENEOUS_SYSTEM_HPP
#define BOOST_UNITS_HETEROGENEOUS_SYSTEM_HPP
-///
/// \file
/// \brief A heterogeneous system is a sorted list of base unit/exponent pairs.
/// \details As long as we don't need to convert heterogeneous systems
/// directly everything is cool.
-///
#include <boost/mpl/bool.hpp>
#include <boost/mpl/plus.hpp>
Modified: branches/units/autoprefix/boost/units/homogeneous_system.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/homogeneous_system.hpp (original)
+++ branches/units/autoprefix/boost/units/homogeneous_system.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,15 +11,6 @@
#ifndef BOOST_UNITS_HOMOGENEOUS_SYSTEM_HPP_INCLUDED
#define BOOST_UNITS_HOMOGENEOUS_SYSTEM_HPP_INCLUDED
-///
-/// \file
-/// \brief Homogeneous systems.
-/// \details A system that can uniquely represent any unit
-/// which can be composed from a linearly independent set
-/// of base units. It is safe to rebind a unit with
-/// such a system to different dimensions.
-///
-
#include <boost/mpl/bool.hpp>
#include <boost/units/config.hpp>
@@ -38,7 +29,11 @@
namespace units {
-
+/// A system that can uniquely represent any unit
+/// which can be composed from a linearly independent set
+/// of base units. It is safe to rebind a unit with
+/// such a system to different dimensions.
+///
/// Do not construct this template directly. Use
/// make_system instead.
template<class L>
Modified: branches/units/autoprefix/boost/units/io.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/io.hpp (original)
+++ branches/units/autoprefix/boost/units/io.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,13 +11,11 @@
#ifndef BOOST_UNITS_IO_HPP
#define BOOST_UNITS_IO_HPP
-///
/// \file
/// \brief Stream input and output for rationals, units and quantities.
/// \details Functions and manipulators for output and input of units and quantities.
/// symbol and name format, and engineering and binary autoprefix.
/// Serialisation output is also supported.
-///
#include <cassert>
#include <cmath>
@@ -39,8 +37,7 @@
namespace boost {
-namespace serialization
-{ /// \namespace serialization for classes providing support for Boost Serialization library.
+namespace serialization {
/// Boost Serialization library support for units.
template<class Archive,class System,class Dim>
@@ -53,16 +50,18 @@
{
ar & boost::serialization::make_nvp("value", units::quantity_cast<Y&>(q));
}
-
+
} // namespace serialization
namespace units {
-/// get string representation of arbitrary type.
+// get string representation of arbitrary type.
template<class T> std::string to_string(const T& t)
{
std::stringstream sstr;
+
sstr << t;
+
return sstr.str();
}
@@ -92,22 +91,21 @@
{
/// INTERNAL ONLY
typedef void base_unit_info_primary_template;
- /// The full name of the unit ( by default)
+ /// The full name of the unit (returns BaseUnit::name() by default)
static std::string name()
{
- return(BaseUnit::name()); /// \returns BaseUnit::name(), for example "meter"
+ return(BaseUnit::name());
}
-
- /// The symbol for the base unit.
-
+ /// The symbol for the base unit (Returns BaseUnit::symbol() by default)
static std::string symbol()
{
return(BaseUnit::symbol()); /// \returns BaseUnit::symbol(), for example "m"
}
};
+/// \enum format_mode format of output of units, for example "m" or "meter".
enum format_mode
-{ /// \enum format_mode format of output of units, for example "m" or "meter".
+{
symbol_fmt = 0, /// default - reduces unit names to known symbols for both base and derived units.
name_fmt = 1, /// output full unit names for base and derived units, for example "meter".
raw_fmt = 2, /// output only symbols for base units (but not derived units), for example "m".
@@ -115,8 +113,9 @@
fmt_mask = 3 /// Bits used for format.
};
+/// \enum autoprefix_mode automatic scaling and prefix (controlled by value of quantity) a, if any,
enum autoprefix_mode
-{ /// \enum autoprefix_mode automatic scaling and prefix (controlled by value of quantity) a, if any,
+{
autoprefix_none = 0, /// No automatic prefix.
autoprefix_engineering = 4, /// Scale and prefix with 10^3 multiples, 1234.5 m output as 1.2345 km.
autoprefix_binary = 8, /// Scale and prefix with 2^10 (1024) multiples, 1024 as 1 kb.
@@ -126,7 +125,7 @@
namespace detail {
template<bool>
-struct xalloc_key_holder
+struct xalloc_key_holder
{
static int value;
static bool initialized;
@@ -138,11 +137,11 @@
template<bool b>
bool xalloc_key_holder<b>::initialized = 0;
-struct xalloc_key_initializer_t
+struct xalloc_key_initializer_t
{
- xalloc_key_initializer_t()
+ xalloc_key_initializer_t()
{
- if (!xalloc_key_holder<true>::initialized)
+ if (!xalloc_key_holder<true>::initialized)
{
xalloc_key_holder<true>::value = std::ios_base::xalloc();
xalloc_key_holder<true>::initialized = true;
@@ -151,105 +150,122 @@
};
namespace /**/ {
-
+
xalloc_key_initializer_t xalloc_key_initializer;
} // namespace
} // namespace detail
-inline int get_flags(std::ios_base& ios, int mask)
-{ /// \return flags controlling output.
+/// \return flags controlling output.
+inline int get_flags(std::ios_base& ios, int mask)
+{
return(ios.iword(detail::xalloc_key_holder<true>::value) & mask);
}
-inline void set_flags(std::ios_base& ios, int new_flags, int mask)
-{ /// Set new flags controlling output format.
- /// \return previous flags.
-
+/// Set new flags controlling output format.
+/// \return previous flags.
+inline void set_flags(std::ios_base& ios, int new_flags, int mask)
+{
assert((~mask & new_flags) == 0);
long& flags = ios.iword(detail::xalloc_key_holder<true>::value);
flags = (flags & ~mask) | static_cast<long>(new_flags);
}
-inline format_mode get_format(std::ios_base& ios)
-{ /// \return flags controlling output format.
+/// \return flags controlling output format.
+inline format_mode get_format(std::ios_base& ios)
+{
return(static_cast<format_mode>((get_flags)(ios, fmt_mask)));
}
-inline void set_format(std::ios_base& ios, format_mode new_mode)
-{ /// Set new flags controlling output format.
- (set_flags)(ios, new_mode, fmt_mask);
+/// Set new flags controlling output format.
+inline void set_format(std::ios_base& ios, format_mode new_mode)
+{
+ (set_flags)(ios, new_mode, fmt_mask);
}
-inline std::ios_base& typename_format(std::ios_base& ios)
-{ /// Set new flags for type_name output format.
- /// \return previous format flags.
+/// Set new flags for type_name output format.
+/// \return previous format flags.
+inline std::ios_base& typename_format(std::ios_base& ios)
+{
(set_format)(ios, typename_fmt);
return(ios);
}
-inline std::ios_base& raw_format(std::ios_base& ios)
-{ /// set new flag for raw format output, for example "m".
- (set_format)(ios, raw_fmt); /// \return previous format flags.
+/// set new flag for raw format output, for example "m".
+/// \return previous format flags.
+inline std::ios_base& raw_format(std::ios_base& ios)
+{
+ (set_format)(ios, raw_fmt);
return(ios);
}
-inline std::ios_base& symbol_format(std::ios_base& ios)
-{ // set new format flag for symbol output, for example "m".
- (set_format)(ios, symbol_fmt); /// \return previous format flags.
+// set new format flag for symbol output, for example "m".
+/// \return previous format flags.
+inline std::ios_base& symbol_format(std::ios_base& ios)
+{
+ (set_format)(ios, symbol_fmt);
return(ios);
}
-inline std::ios_base& name_format(std::ios_base& ios)
-{ /// set new format for name output, for example "meter".
+/// set new format for name output, for example "meter".
+/// \return previous format flags.
+inline std::ios_base& name_format(std::ios_base& ios)
+{
(set_format)(ios, name_fmt);
- return(ios); /// \return previous format flags.
+ return(ios);
}
+/// get autoprefix flags for output.
inline autoprefix_mode get_autoprefix(std::ios_base& ios)
-{ /// get autoprefix flags for output.
-
+{
return static_cast<autoprefix_mode>((get_flags)(ios, autoprefix_mask));
}
+/// Get format for output.
inline void set_autoprefix(std::ios_base& ios, autoprefix_mode new_mode)
-{ /// Get format for output.
+{
(set_flags)(ios, new_mode, autoprefix_mask);
}
+/// Clear autoprefix flags.
+/// \return previous prefix flags.
inline std::ios_base& no_prefix(std::ios_base& ios)
-{ /// Clear autoprefix flags.
-
+{
(set_autoprefix)(ios, autoprefix_none);
- return ios; /// \return previous prefix flags.
+ return ios;
}
+/// Set flag for engineering prefix, so 1234.5 m displays as "1.2345 km".
+/// \return previous prefix flags.
inline std::ios_base& engineering_prefix(std::ios_base& ios)
-{ /// Set flag for engineering prefix, so 1234.5 m displays as "1.2345 km".
-
+{
(set_autoprefix)(ios, autoprefix_engineering);
- return ios; /// \return previous prefix flags.
+ return ios;
}
+/// Set flag for binary prefix, so 1024 byte displays as "1 Kib".
+/// \return previous prefix flags.
inline std::ios_base& binary_prefix(std::ios_base& ios)
-{ /// Set flag for binary prefix, so 1024 byte displays as "1 Kib".
+{
(set_autoprefix)(ios, autoprefix_binary);
- return ios; /// \return previous prefix flags.
+ return ios;
}
namespace detail {
+/// \return exponent string like "^1/2".
template<integer_type N, integer_type D>
inline std::string exponent_string(const static_rational<N,D>& r)
{
- return '^' + to_string(r); ///\return exponent string like "^1/2".
+ return '^' + to_string(r);
}
+/// \return empty exponent string for integer rational like 2.
template<>
inline std::string exponent_string(const static_rational<1>&)
{
- return ""; ///\return empty exponent string for integer rational like 2.
+ return "";
}
template<class T>
@@ -258,7 +274,7 @@
return base_unit_info<typename T::tag_type>::symbol() + exponent_string(typename T::value_type());
}
-template<class T>
+template<class T>
inline std::string base_unit_name_string(const T&)
{
return base_unit_info<typename T::tag_type>::name() + exponent_string(typename T::value_type());
@@ -302,18 +318,18 @@
static void value(std::string& str)
{
// better shorthand for dimensionless?
- str += "dimensionless"; /// \return appended "dimensionless".
+ str += "dimensionless";
}
};
};
template<int N>
-struct scale_symbol_string_impl
+struct scale_symbol_string_impl
{
template<class Begin>
- struct apply
+ struct apply
{
- static void value(std::string& str)
+ static void value(std::string& str)
{
str += Begin::item::symbol();
scale_symbol_string_impl<N - 1>::template apply<typename Begin::next>::value(str);
@@ -325,7 +341,7 @@
struct scale_symbol_string_impl<0>
{
template<class Begin>
- struct apply
+ struct apply
{
static void value(std::string&) { }
};
@@ -374,12 +390,12 @@
};
template<int N>
-struct scale_name_string_impl
+struct scale_name_string_impl
{
template<class Begin>
- struct apply
+ struct apply
{
- static void value(std::string& str)
+ static void value(std::string& str)
{
str += Begin::item::name();
scale_name_string_impl<N - 1>::template apply<typename Begin::next>::value(str);
@@ -391,7 +407,7 @@
struct scale_name_string_impl<0>
{
template<class Begin>
- struct apply
+ struct apply
{
static void value(std::string&) { }
};
@@ -455,14 +471,14 @@
f.template append_scale_to<Scale>(str);
std::string without_scale = f(unit<Dimension, heterogeneous_system<heterogeneous_system_impl<Units, Dimension, dimensionless_type> > >());
-
+
if (f.is_default_string(without_scale, unit<Dimension, heterogeneous_system<heterogeneous_system_impl<Units, Dimension, dimensionless_type> > >()))
{
str += "(";
str += without_scale;
str += ")";
- }
- else
+ }
+ else
{
str += without_scale;
}
@@ -947,27 +963,27 @@
template<class Char, class Traits, class Dimension, class System>
inline std::basic_ostream<Char, Traits>& operator<<(std::basic_ostream<Char, Traits>& os, const unit<Dimension, System>& u)
{
- if (units::get_format(os) == typename_fmt)
+ if (units::get_format(os) == typename_fmt)
{
detail::do_print(os, typename_string(u));
}
- else if (units::get_format(os) == raw_fmt)
+ else if (units::get_format(os) == raw_fmt)
{
detail::do_print(os, detail::to_string_impl(u, detail::format_raw_symbol_impl()));
}
- else if (units::get_format(os) == symbol_fmt)
+ else if (units::get_format(os) == symbol_fmt)
{
detail::do_print(os, symbol_string(u));
}
- else if (units::get_format(os) == name_fmt)
+ else if (units::get_format(os) == name_fmt)
{
detail::do_print(os, name_string(u));
}
- else
+ else
{
assert(!"The format mode must be one of: typename_format, raw_format, name_format, symbol_format");
}
-
+
return(os);
}
Modified: branches/units/autoprefix/boost/units/is_dim.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_dim.hpp (original)
+++ branches/units/autoprefix/boost/units/is_dim.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -25,7 +25,7 @@
namespace units {
/// Check that a type is a valid @c dim.
-template<typename T>
+template<typename T>
struct is_dim :
public mpl::false_
{ };
Modified: branches/units/autoprefix/boost/units/is_dimension_list.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_dimension_list.hpp (original)
+++ branches/units/autoprefix/boost/units/is_dimension_list.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
Modified: branches/units/autoprefix/boost/units/is_dimensionless.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_dimensionless.hpp (original)
+++ branches/units/autoprefix/boost/units/is_dimensionless.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,6 +1,4 @@
-
-
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
Modified: branches/units/autoprefix/boost/units/is_dimensionless_quantity.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_dimensionless_quantity.hpp (original)
+++ branches/units/autoprefix/boost/units/is_dimensionless_quantity.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,10 +11,8 @@
#ifndef BOOST_UNITS_IS_DIMENSIONLESS_QUANTITY_HPP
#define BOOST_UNITS_IS_DIMENSIONLESS_QUANTITY_HPP
-///
/// \file
/// \brief check that a type is a dimensionless quantity
-///
#include <boost/units/is_quantity_of_dimension.hpp>
#include <boost/units/units_fwd.hpp>
Modified: branches/units/autoprefix/boost/units/is_dimensionless_unit.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_dimensionless_unit.hpp (original)
+++ branches/units/autoprefix/boost/units/is_dimensionless_unit.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,10 +11,8 @@
#ifndef BOOST_UNITS_IS_DIMENSIONLESS_UNIT_HPP
#define BOOST_UNITS_IS_DIMENSIONLESS_UNIT_HPP
-///
/// \file
/// \brief Check that a type is a dimensionless unit.
-///
#include <boost/units/is_unit_of_dimension.hpp>
#include <boost/units/units_fwd.hpp>
Modified: branches/units/autoprefix/boost/units/is_quantity.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_quantity.hpp (original)
+++ branches/units/autoprefix/boost/units/is_quantity.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -31,7 +31,7 @@
template<class Unit,
class Y>
-struct is_quantity< quantity<Unit,Y> > :
+struct is_quantity< quantity<Unit,Y> > :
public mpl::true_
{ };
Modified: branches/units/autoprefix/boost/units/is_quantity_of_dimension.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_quantity_of_dimension.hpp (original)
+++ branches/units/autoprefix/boost/units/is_quantity_of_dimension.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
Modified: branches/units/autoprefix/boost/units/is_quantity_of_system.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_quantity_of_system.hpp (original)
+++ branches/units/autoprefix/boost/units/is_quantity_of_system.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -24,7 +24,7 @@
namespace units {
-/// Check that a type is a quantity in a specified system.
+/// Check that a type is a quantity in a specified system.
template<class T,class System>
struct is_quantity_of_system :
public mpl::false_
Modified: branches/units/autoprefix/boost/units/is_unit.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_unit.hpp (original)
+++ branches/units/autoprefix/boost/units/is_unit.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -25,7 +25,7 @@
/// Check that a type is a unit.
template<class T>
-struct is_unit :
+struct is_unit :
public mpl::false_
{ };
Modified: branches/units/autoprefix/boost/units/is_unit_of_dimension.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_unit_of_dimension.hpp (original)
+++ branches/units/autoprefix/boost/units/is_unit_of_dimension.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -23,7 +23,7 @@
namespace units {
-/// Check that a type is a unit of the specified dimension.
+/// Check that a type is a unit of the specified dimension.
template<class T,class Dim>
struct is_unit_of_dimension :
public mpl::false_
Modified: branches/units/autoprefix/boost/units/is_unit_of_system.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/is_unit_of_system.hpp (original)
+++ branches/units/autoprefix/boost/units/is_unit_of_system.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -23,17 +23,17 @@
namespace units {
-/// Check that a type is a unit in a specified system.
+/// Check that a type is a unit in a specified system.
template<class T,class System>
struct is_unit_of_system :
public mpl::false_
{ };
-
+
template<class Dim,class System>
struct is_unit_of_system< unit<Dim,System>,System > :
public mpl::true_
{ };
-
+
template<class Dim,class System>
struct is_unit_of_system< absolute<unit<Dim,System> >,System > :
public mpl::true_
Modified: branches/units/autoprefix/boost/units/lambda.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/lambda.hpp (original)
+++ branches/units/autoprefix/boost/units/lambda.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -13,6 +13,7 @@
#ifndef BOOST_UNITS_LAMBDA_HPP
#define BOOST_UNITS_LAMBDA_HPP
+
////////////////////////////////////////////////////////////////////////
///
/// \file lambda.hpp
@@ -24,7 +25,7 @@
/// \author Torsten Maehne
/// \date 2008-06-16
///
-/// \details Boost.Lambda's return type deduction system is extented to make
+/// Boost.Lambda's return type deduction system is extented to make
/// use of Boost.Units' typeof_helper trait classes for Boost.Units'
/// quantity, absolute, and unit template classes.
///
@@ -518,7 +519,7 @@
} // namespace lambda
namespace units {
-
+
template<typename System, typename Dim, typename Arg>
struct multiply_typeof_helper<boost::lambda::lambda_functor<Arg>, boost::units::absolute<boost::units::unit<Dim, System> > > {
typedef boost::lambda::lambda_functor<
@@ -560,7 +561,7 @@
} // namespace lambda
namespace units {
-
+
template<typename System, typename Dim, typename Arg>
struct multiply_typeof_helper<boost::units::absolute<boost::units::unit<Dim, System> >, boost::lambda::lambda_functor<Arg> > {
typedef boost::lambda::lambda_functor<
Modified: branches/units/autoprefix/boost/units/limits.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/limits.hpp (original)
+++ branches/units/autoprefix/boost/units/limits.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
Modified: branches/units/autoprefix/boost/units/make_scaled_unit.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/make_scaled_unit.hpp (original)
+++ branches/units/autoprefix/boost/units/make_scaled_unit.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,11 +11,6 @@
#ifndef BOOST_UNITS_MAKE_SCALED_UNIT_HPP_INCLUDED
#define BOOST_UNITS_MAKE_SCALED_UNIT_HPP_INCLUDED
-///
-/// \file
-/// \brief Make scaled unit.
-///
-
#include <boost/units/units_fwd.hpp>
#include <boost/units/heterogeneous_system.hpp>
#include <boost/units/unit.hpp>
Modified: branches/units/autoprefix/boost/units/make_system.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/make_system.hpp (original)
+++ branches/units/autoprefix/boost/units/make_system.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,7 +11,6 @@
#ifndef BOOST_UNITS_MAKE_SYSTEM_HPP
#define BOOST_UNITS_MAKE_SYSTEM_HPP
-///
/// \file
/// \brief Metafunction returning a homogeneous system that can
/// represent any combination of the base units.
@@ -21,7 +20,6 @@
/// be no way to represent any of the base units in terms
/// of the others. make_system<foot_base_unit, meter_base_unit>::type
/// is not allowed, for example.
-///
#include <boost/units/config.hpp>
#include <boost/units/dimensionless_type.hpp>
@@ -41,7 +39,7 @@
}
-/// Metafunction make_system returning a homogeneous system that can
+/// Metafunction returning a homogeneous system that can
/// represent any combination of the base units. There must
/// be no way to represent any of the base units in terms
/// of the others. make_system<foot_base_unit, meter_base_unit>::type
Modified: branches/units/autoprefix/boost/units/operators.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/operators.hpp (original)
+++ branches/units/autoprefix/boost/units/operators.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -8,7 +8,7 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_UNITS_OPERATORS_HPP
+#ifndef BOOST_UNITS_OPERATORS_HPP
#define BOOST_UNITS_OPERATORS_HPP
@@ -46,37 +46,37 @@
#if (BOOST_UNITS_HAS_BOOST_TYPEOF)
-template<typename X> struct unary_plus_typeof_helper
+template<typename X> struct unary_plus_typeof_helper
{
BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, (+typeof_::make<X>()))
typedef typename nested::type type;
};
-template<typename X> struct unary_minus_typeof_helper
+template<typename X> struct unary_minus_typeof_helper
{
BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, (-typeof_::make<X>()))
typedef typename nested::type type;
};
-template<typename X,typename Y> struct add_typeof_helper
+template<typename X,typename Y> struct add_typeof_helper
{
BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, (typeof_::make<X>()+typeof_::make<Y>()))
typedef typename nested::type type;
};
-template<typename X,typename Y> struct subtract_typeof_helper
+template<typename X,typename Y> struct subtract_typeof_helper
{
BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, (typeof_::make<X>()-typeof_::make<Y>()))
typedef typename nested::type type;
};
-template<typename X,typename Y> struct multiply_typeof_helper
+template<typename X,typename Y> struct multiply_typeof_helper
{
BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, (typeof_::make<X>()*typeof_::make<Y>()))
typedef typename nested::type type;
};
-template<typename X,typename Y> struct divide_typeof_helper
+template<typename X,typename Y> struct divide_typeof_helper
{
BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, (typeof_::make<X>()/typeof_::make<Y>()))
typedef typename nested::type type;
Modified: branches/units/autoprefix/boost/units/physical_dimensions.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/physical_dimensions.hpp (original)
+++ branches/units/autoprefix/boost/units/physical_dimensions.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
Modified: branches/units/autoprefix/boost/units/pow.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/pow.hpp (original)
+++ branches/units/autoprefix/boost/units/pow.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,14 +1,14 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
-// Copyright (C) 2010 Steven Watanabe
+// Copyright (C) 2008 Steven Watanabe
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_UNITS_POW_HPP
+#ifndef BOOST_UNITS_POW_HPP
#define BOOST_UNITS_POW_HPP
#include <boost/math_fwd.hpp>
@@ -18,10 +18,8 @@
#include <boost/units/static_rational.hpp>
#include <boost/units/detail/static_rational_power.hpp>
-///
-/// \file
+/// \file
/// \brief Raise values to exponents known at compile-time.
-///
namespace boost {
@@ -46,21 +44,21 @@
#ifndef BOOST_UNITS_DOXYGEN
/// raise @c T to a @c static_rational power.
-template<class T, long N,long D>
-struct power_typeof_helper<T, static_rational<N,D> >
-{
+template<class T, long N,long D>
+struct power_typeof_helper<T, static_rational<N,D> >
+{
typedef typename mpl::if_<boost::is_integral<T>, double, T>::type internal_type;
typedef detail::static_rational_power_impl<static_rational<N, D>, internal_type> impl;
- typedef typename impl::type type;
-
- static type value(const T& x)
+ typedef typename impl::type type;
+
+ static type value(const T& x)
{
return impl::call(x);
}
};
/// raise @c float to a @c static_rational power.
-template<long N,long D>
+template<long N,long D>
struct power_typeof_helper<float, static_rational<N,D> >
{
// N.B. pathscale doesn't accept inheritance for some reason.
@@ -93,7 +91,7 @@
#ifndef BOOST_UNITS_DOXYGEN
/// take @c static_rational root of an @c T
-template<class T, long N,long D>
+template<class T, long N,long D>
struct root_typeof_helper<T,static_rational<N,D> >
{
// N.B. pathscale doesn't accept inheritance for some reason.
Modified: branches/units/autoprefix/boost/units/quantity.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/quantity.hpp (original)
+++ branches/units/autoprefix/boost/units/quantity.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,12 +11,6 @@
#ifndef BOOST_UNITS_QUANTITY_HPP
#define BOOST_UNITS_QUANTITY_HPP
-///
-/// \file
-/// \brief unit class assingment and conversions.
-/// \details
-///
-
#include <algorithm>
#include <boost/config.hpp>
@@ -78,7 +72,7 @@
template<>
struct is_non_narrowing_conversion<long double, double> : mpl::false_ {};
-// msvc 7.1 needs extra disambiguation.
+// msvc 7.1 needs extra disambiguation
template<class T, class U>
struct disable_if_is_same
{
@@ -89,36 +83,36 @@
struct disable_if_is_same<T, T> {};
}
-
-/// Quantity of Unit class and conversions permitted.
+
+/// class declaration
template<class Unit,class Y = double>
class quantity
{
- // Base units are not the same as units.
+ // base units are not the same as units.
BOOST_MPL_ASSERT_NOT((detail::is_base_unit<Unit>));
enum { force_instantiation_of_unit = sizeof(Unit) };
typedef void (quantity::*unspecified_null_pointer_constant_type)(int*******);
public:
typedef quantity<Unit,Y> this_type;
-
+
typedef Y value_type;
typedef Unit unit_type;
-
- quantity() : val_()
- {
+
+ quantity() : val_()
+ {
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
- quantity(unspecified_null_pointer_constant_type) : val_()
- {
+ quantity(unspecified_null_pointer_constant_type) : val_()
+ {
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
-
- quantity(const this_type& source) : val_(source.val_)
+
+ quantity(const this_type& source) : val_(source.val_)
{
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
-
+
// Need to make sure that the destructor of
// Unit which contains the checking is instantiated,
// on sun.
@@ -127,66 +121,66 @@
unit_type force_unit_instantiation;
}
#endif
-
+
//~quantity() { }
-
- this_type& operator=(const this_type& source)
- {
- val_ = source.val_;
-
- return *this;
+
+ this_type& operator=(const this_type& source)
+ {
+ val_ = source.val_;
+
+ return *this;
}
#ifndef BOOST_NO_SFINAE
- /// implicit conversion between value types is allowed if allowed for value types themselves.
+ /// implicit conversion between value types is allowed if allowed for value types themselves
template<class YY>
quantity(const quantity<Unit,YY>& source,
typename boost::enable_if<detail::is_non_narrowing_conversion<YY, Y> >::type* = 0) :
val_(source.value())
- {
+ {
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
- /// implicit conversion between value types is not allowed if not allowed for value types themselves.
+ /// implicit conversion between value types is not allowed if not allowed for value types themselves
template<class YY>
explicit quantity(const quantity<Unit,YY>& source,
typename boost::disable_if<detail::is_non_narrowing_conversion<YY, Y> >::type* = 0) :
val_(static_cast<Y>(source.value()))
- {
+ {
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
#else
- /// implicit conversion between value types is allowed if allowed for value types themselves.
+ /// implicit conversion between value types is allowed if allowed for value types themselves
template<class YY>
quantity(const quantity<Unit,YY>& source) :
val_(source.value())
- {
+ {
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
BOOST_STATIC_ASSERT((boost::is_convertible<YY, Y>::value == true));
}
#endif
-
- /// implicit assignment between value types is allowed if allowed for value types themselves.
+
+ /// implicit assignment between value types is allowed if allowed for value types themselves
template<class YY>
this_type& operator=(const quantity<Unit,YY>& source)
{
BOOST_STATIC_ASSERT((boost::is_convertible<YY, Y>::value == true));
*this = this_type(source);
-
+
return *this;
}
#ifndef BOOST_NO_SFINAE
- /// explicit conversion between different unit systems is allowed if implicit conversion is disallowed.
- template<class Unit2,class YY>
+ /// explicit conversion between different unit systems is allowed if implicit conversion is disallowed
+ template<class Unit2,class YY>
explicit
- quantity(const quantity<Unit2,YY>& source,
+ quantity(const quantity<Unit2,YY>& source,
typename boost::disable_if<
mpl::and_<
//is_implicitly_convertible should be undefined when the
@@ -202,9 +196,9 @@
BOOST_STATIC_ASSERT((boost::is_convertible<YY,Y>::value == true));
}
- /// implicit conversion between different unit systems is allowed if each fundamental dimension is implicitly convertible.
- template<class Unit2,class YY>
- quantity(const quantity<Unit2,YY>& source,
+ /// implicit conversion between different unit systems is allowed if each fundamental dimension is implicitly convertible
+ template<class Unit2,class YY>
+ quantity(const quantity<Unit2,YY>& source,
typename boost::enable_if<
mpl::and_<
typename is_implicitly_convertible<Unit2,Unit>::type,
@@ -220,9 +214,9 @@
#else
- /// without SFINAE we can't distinguish between explicit and implicit conversions so
+ /// without SFINAE we can't distinguish between explicit and implicit conversions so
/// the conversion is always explicit
- template<class Unit2,class YY>
+ template<class Unit2,class YY>
explicit quantity(const quantity<Unit2,YY>& source)
: val_(conversion_helper<quantity<Unit2,YY>,this_type>::convert(source).value())
{
@@ -231,22 +225,22 @@
}
#endif
-
- /// implicit assignment between different unit systems is allowed if each fundamental dimension is implicitly convertible.
+
+ /// implicit assignment between different unit systems is allowed if each fundamental dimension is implicitly convertible
template<class Unit2,class YY>
this_type& operator=(const quantity<Unit2,YY>& source)
{
-
+
BOOST_STATIC_ASSERT((is_implicitly_convertible<Unit2,unit_type>::value == true));
BOOST_STATIC_ASSERT((boost::is_convertible<YY,Y>::value == true));
-
+
*this = this_type(source);
-
+
return *this;
}
const value_type& value() const { return val_; } ///< constant accessor to value
-
+
///< can add a quantity of the same type if add_typeof_helper<value_type,value_type>::type is convertible to value_type
template<class Unit2, class YY>
this_type& operator+=(const quantity<Unit2, YY>& source)
@@ -254,7 +248,7 @@
BOOST_STATIC_ASSERT((boost::is_same<typename add_typeof_helper<Unit, Unit2>::type, Unit>::value));
val_ += source.value();
return *this;
- }
+ }
///< can subtract a quantity of the same type if subtract_typeof_helper<value_type,value_type>::type is convertible to value_type
template<class Unit2, class YY>
@@ -263,7 +257,7 @@
BOOST_STATIC_ASSERT((boost::is_same<typename subtract_typeof_helper<Unit, Unit2>::type, Unit>::value));
val_ -= source.value();
return *this;
- }
+ }
template<class Unit2, class YY>
this_type& operator*=(const quantity<Unit2, YY>& source)
@@ -271,8 +265,8 @@
BOOST_STATIC_ASSERT((boost::is_same<typename multiply_typeof_helper<Unit, Unit2>::type, Unit>::value));
val_ *= source.value();
return *this;
- }
-
+ }
+
template<class Unit2, class YY>
this_type& operator/=(const quantity<Unit2, YY>& source)
{
@@ -285,19 +279,18 @@
this_type& operator*=(const value_type& source) { val_ *= source; return *this; }
///< can divide a quantity by a scalar value_type if divide_typeof_helper<value_type,value_type>::type is convertible to value_type
this_type& operator/=(const value_type& source) { val_ /= source; return *this; }
-
+
/// Construct quantity directly from @c value_type (potentially dangerous).
static this_type from_value(const value_type& val) { return this_type(val, 0); }
protected:
explicit quantity(const value_type& val, int) : val_(val) { }
-
+
private:
value_type val_;
};
-/// Quantity of dimensionless quantities and conversion permitted.
-/// Specialization for dimensionless quantities. Implicit conversions between
+/// Specialization for dimensionless quantities. Implicit conversions between
/// unit systems are allowed because all dimensionless quantities are equivalent.
/// Implicit construction and assignment from and conversion to @c value_type is
/// also allowed.
@@ -306,37 +299,37 @@
{
public:
typedef quantity<unit<dimensionless_type,System>,Y> this_type;
-
+
typedef Y value_type;
typedef System system_type;
typedef dimensionless_type dimension_type;
typedef unit<dimension_type,system_type> unit_type;
-
- quantity() : val_()
+
+ quantity() : val_()
{
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
-
+
/// construction from raw @c value_type is allowed
- quantity(value_type val) : val_(val)
+ quantity(value_type val) : val_(val)
{
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
- }
-
- quantity(const this_type& source) : val_(source.val_)
+ }
+
+ quantity(const this_type& source) : val_(source.val_)
{
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
-
+
//~quantity() { }
-
- this_type& operator=(const this_type& source)
- {
- val_ = source.val_;
-
- return *this;
+
+ this_type& operator=(const this_type& source)
+ {
+ val_ = source.val_;
+
+ return *this;
}
-
+
#ifndef BOOST_NO_SFINAE
/// implicit conversion between value types is allowed if allowed for value types themselves
@@ -344,7 +337,7 @@
quantity(const quantity<unit<dimension_type,system_type>,YY>& source,
typename boost::enable_if<detail::is_non_narrowing_conversion<YY, Y> >::type* = 0) :
val_(source.value())
- {
+ {
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
@@ -353,7 +346,7 @@
explicit quantity(const quantity<unit<dimension_type,system_type>,YY>& source,
typename boost::disable_if<detail::is_non_narrowing_conversion<YY, Y> >::type* = 0) :
val_(static_cast<Y>(source.value()))
- {
+ {
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
@@ -363,13 +356,13 @@
template<class YY>
quantity(const quantity<unit<dimension_type,system_type>,YY>& source) :
val_(source.value())
- {
+ {
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
BOOST_STATIC_ASSERT((boost::is_convertible<YY, Y>::value == true));
}
#endif
-
+
/// implicit assignment between value types is allowed if allowed for value types themselves
template<class YY>
this_type& operator=(const quantity<unit<dimension_type,system_type>,YY>& source)
@@ -377,21 +370,21 @@
BOOST_STATIC_ASSERT((boost::is_convertible<YY,Y>::value == true));
*this = this_type(source);
-
+
return *this;
}
#if 1
/// implicit conversion between different unit systems is allowed
- template<class System2, class Y2>
+ template<class System2, class Y2>
quantity(const quantity<unit<dimensionless_type, System2>,Y2>& source,
#ifdef __SUNPRO_CC
typename boost::enable_if<
boost::mpl::and_<
detail::is_non_narrowing_conversion<Y2, Y>,
detail::is_dimensionless_system<System2>
- >
+ >
>::type* = 0
#else
typename boost::enable_if<detail::is_non_narrowing_conversion<Y2, Y> >::type* = 0,
@@ -399,20 +392,20 @@
typename boost::enable_if<detail::is_dimensionless_system<System2> >::type* = 0
#endif
) :
- val_(source.value())
+ val_(source.value())
{
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
/// implicit conversion between different unit systems is allowed
- template<class System2, class Y2>
+ template<class System2, class Y2>
explicit quantity(const quantity<unit<dimensionless_type, System2>,Y2>& source,
#ifdef __SUNPRO_CC
typename boost::enable_if<
boost::mpl::and_<
boost::mpl::not_<detail::is_non_narrowing_conversion<Y2, Y> >,
detail::is_dimensionless_system<System2>
- >
+ >
>::type* = 0
#else
typename boost::disable_if<detail::is_non_narrowing_conversion<Y2, Y> >::type* = 0,
@@ -420,7 +413,7 @@
typename boost::enable_if<detail::is_dimensionless_system<System2> >::type* = 0
#endif
) :
- val_(static_cast<Y>(source.value()))
+ val_(static_cast<Y>(source.value()))
{
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
@@ -428,9 +421,9 @@
#else
/// implicit conversion between different unit systems is allowed
- template<class System2, class Y2>
+ template<class System2, class Y2>
quantity(const quantity<unit<dimensionless_type,homogeneous_system<System2> >,Y2>& source) :
- val_(source.value())
+ val_(source.value())
{
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
BOOST_STATIC_ASSERT((boost::is_convertible<Y2, Y>::value == true));
@@ -440,14 +433,14 @@
/// conversion between different unit systems is explicit when
/// the units are not equivalent.
- template<class System2, class Y2>
+ template<class System2, class Y2>
explicit quantity(const quantity<unit<dimensionless_type, System2>,Y2>& source,
typename boost::disable_if<detail::is_dimensionless_system<System2> >::type* = 0) :
- val_(conversion_helper<quantity<unit<dimensionless_type, System2>,Y2>, this_type>::convert(source).value())
+ val_(conversion_helper<quantity<unit<dimensionless_type, System2>,Y2>, this_type>::convert(source).value())
{
BOOST_UNITS_CHECK_LAYOUT_COMPATIBILITY(this_type, Y);
}
-
+
#ifndef __SUNPRO_CC
/// implicit assignment between different unit systems is allowed
@@ -455,28 +448,28 @@
this_type& operator=(const quantity<BOOST_UNITS_DIMENSIONLESS_UNIT(System2),Y>& source)
{
*this = this_type(source);
-
+
return *this;
}
-
+
#endif
-
+
/// implicit conversion to @c value_type is allowed
operator value_type() const { return val_; }
-
+
const value_type& value() const { return val_; } ///< constant accessor to value
-
+
///< can add a quantity of the same type if add_typeof_helper<value_type,value_type>::type is convertible to value_type
- this_type& operator+=(const this_type& source) { val_ += source.val_; return *this; }
-
+ this_type& operator+=(const this_type& source) { val_ += source.val_; return *this; }
+
///< can subtract a quantity of the same type if subtract_typeof_helper<value_type,value_type>::type is convertible to value_type
- this_type& operator-=(const this_type& source) { val_ -= source.val_; return *this; }
-
+ this_type& operator-=(const this_type& source) { val_ -= source.val_; return *this; }
+
///< can multiply a quantity by a scalar value_type if multiply_typeof_helper<value_type,value_type>::type is convertible to value_type
- this_type& operator*=(const value_type& val) { val_ *= val; return *this; }
+ this_type& operator*=(const value_type& val) { val_ *= val; return *this; }
///< can divide a quantity by a scalar value_type if divide_typeof_helper<value_type,value_type>::type is convertible to value_type
- this_type& operator/=(const value_type& val) { val_ /= val; return *this; }
+ this_type& operator/=(const value_type& val) { val_ /= val; return *this; }
/// Construct quantity directly from @c value_type.
static this_type from_value(const value_type& val) { return this_type(val); }
@@ -519,7 +512,7 @@
struct quantity_cast_helper<Y,quantity<Unit,X> >
{
typedef Y type;
-
+
type operator()(quantity<Unit,X>& source) { return const_cast<X&>(source.value()); }
};
@@ -528,7 +521,7 @@
struct quantity_cast_helper<Y,const quantity<Unit,X> >
{
typedef Y type;
-
+
type operator()(const quantity<Unit,X>& source) { return source.value(); }
};
@@ -536,22 +529,22 @@
/// quantity_cast provides mutating access to underlying quantity value_type
template<class X,class Y>
-inline
+inline
X
quantity_cast(Y& source)
{
detail::quantity_cast_helper<X,Y> qch;
-
+
return qch(source);
}
template<class X,class Y>
-inline
+inline
X
quantity_cast(const Y& source)
{
detail::quantity_cast_helper<X,const Y> qch;
-
+
return qch(source);
}
@@ -827,30 +820,30 @@
/// specialize power typeof helper
/// INTERNAL ONLY
-template<class Unit,long N,long D,class Y>
-struct power_typeof_helper< quantity<Unit,Y>,static_rational<N,D> >
-{
+template<class Unit,long N,long D,class Y>
+struct power_typeof_helper< quantity<Unit,Y>,static_rational<N,D> >
+{
typedef typename power_typeof_helper<Y,static_rational<N,D> >::type value_type;
typedef typename power_typeof_helper<Unit,static_rational<N,D> >::type unit_type;
- typedef quantity<unit_type,value_type> type;
-
- static type value(const quantity<Unit,Y>& x)
- {
+ typedef quantity<unit_type,value_type> type;
+
+ static type value(const quantity<Unit,Y>& x)
+ {
return type::from_value(power_typeof_helper<Y,static_rational<N,D> >::value(x.value()));
}
};
/// specialize root typeof helper
/// INTERNAL ONLY
-template<class Unit,long N,long D,class Y>
-struct root_typeof_helper< quantity<Unit,Y>,static_rational<N,D> >
-{
+template<class Unit,long N,long D,class Y>
+struct root_typeof_helper< quantity<Unit,Y>,static_rational<N,D> >
+{
typedef typename root_typeof_helper<Y,static_rational<N,D> >::type value_type;
typedef typename root_typeof_helper<Unit,static_rational<N,D> >::type unit_type;
typedef quantity<unit_type,value_type> type;
-
- static type value(const quantity<Unit,Y>& x)
- {
+
+ static type value(const quantity<Unit,Y>& x)
+ {
return type::from_value(root_typeof_helper<Y,static_rational<N,D> >::value(x.value()));
}
};
@@ -865,7 +858,7 @@
operator*(const unit<Dim,System>&,const Y& rhs)
{
typedef typename multiply_typeof_helper< unit<Dim,System>,Y >::type type;
-
+
return type::from_value(rhs);
}
@@ -878,7 +871,7 @@
operator/(const unit<Dim,System>&,const Y& rhs)
{
typedef typename divide_typeof_helper<unit<Dim,System>,Y>::type type;
-
+
return type::from_value(Y(1)/rhs);
}
@@ -891,7 +884,7 @@
operator*(const Y& lhs,const unit<Dim,System>&)
{
typedef typename multiply_typeof_helper< Y,unit<Dim,System> >::type type;
-
+
return type::from_value(lhs);
}
@@ -904,7 +897,7 @@
operator/(const Y& lhs,const unit<Dim,System>&)
{
typedef typename divide_typeof_helper< Y,unit<Dim,System> >::type type;
-
+
return type::from_value(lhs);
}
@@ -917,7 +910,7 @@
//operator*(const quantity<Unit,X>& lhs,const Y& rhs)
//{
// typedef typename multiply_typeof_helper< quantity<Unit,X>,Y >::type type;
-//
+//
// return type::from_value(lhs.value()*rhs);
//}
//
@@ -930,7 +923,7 @@
//operator*(const X& lhs,const quantity<Unit,Y>& rhs)
//{
// typedef typename multiply_typeof_helper< X,quantity<Unit,Y> >::type type;
-//
+//
// return type::from_value(lhs*rhs.value());
//}
@@ -942,7 +935,7 @@
operator*(const quantity<Unit,X>& lhs,const X& rhs)
{
typedef typename multiply_typeof_helper< quantity<Unit,X>,X >::type type;
-
+
return type::from_value(lhs.value()*rhs);
}
@@ -954,7 +947,7 @@
operator*(const X& lhs,const quantity<Unit,X>& rhs)
{
typedef typename multiply_typeof_helper< X,quantity<Unit,X> >::type type;
-
+
return type::from_value(lhs*rhs.value());
}
@@ -967,7 +960,7 @@
//operator/(const quantity<Unit,X>& lhs,const Y& rhs)
//{
// typedef typename divide_typeof_helper< quantity<Unit,X>,Y >::type type;
-//
+//
// return type::from_value(lhs.value()/rhs);
//}
//
@@ -980,7 +973,7 @@
//operator/(const X& lhs,const quantity<Unit,Y>& rhs)
//{
// typedef typename divide_typeof_helper< X,quantity<Unit,Y> >::type type;
-//
+//
// return type::from_value(lhs/rhs.value());
//}
@@ -992,7 +985,7 @@
operator/(const quantity<Unit,X>& lhs,const X& rhs)
{
typedef typename divide_typeof_helper< quantity<Unit,X>,X >::type type;
-
+
return type::from_value(lhs.value()/rhs);
}
@@ -1004,7 +997,7 @@
operator/(const X& lhs,const quantity<Unit,X>& rhs)
{
typedef typename divide_typeof_helper< X,quantity<Unit,X> >::type type;
-
+
return type::from_value(lhs/rhs.value());
}
@@ -1018,7 +1011,7 @@
operator*(const unit<Dim1,System1>&,const quantity<Unit2,Y>& rhs)
{
typedef typename multiply_typeof_helper< unit<Dim1,System1>,quantity<Unit2,Y> >::type type;
-
+
return type::from_value(rhs.value());
}
@@ -1032,7 +1025,7 @@
operator/(const unit<Dim1,System1>&,const quantity<Unit2,Y>& rhs)
{
typedef typename divide_typeof_helper< unit<Dim1,System1>,quantity<Unit2,Y> >::type type;
-
+
return type::from_value(Y(1)/rhs.value());
}
@@ -1046,7 +1039,7 @@
operator*(const quantity<Unit1,Y>& lhs,const unit<Dim2,System2>&)
{
typedef typename multiply_typeof_helper< quantity<Unit1,Y>,unit<Dim2,System2> >::type type;
-
+
return type::from_value(lhs.value());
}
@@ -1060,7 +1053,7 @@
operator/(const quantity<Unit1,Y>& lhs,const unit<Dim2,System2>&)
{
typedef typename divide_typeof_helper< quantity<Unit1,Y>,unit<Dim2,System2> >::type type;
-
+
return type::from_value(lhs.value());
}
@@ -1068,9 +1061,9 @@
template<class Unit,class Y>
typename unary_plus_typeof_helper< quantity<Unit,Y> >::type
operator+(const quantity<Unit,Y>& val)
-{
+{
typedef typename unary_plus_typeof_helper< quantity<Unit,Y> >::type type;
-
+
return type::from_value(+val.value());
}
@@ -1078,9 +1071,9 @@
template<class Unit,class Y>
typename unary_minus_typeof_helper< quantity<Unit,Y> >::type
operator-(const quantity<Unit,Y>& val)
-{
+{
typedef typename unary_minus_typeof_helper< quantity<Unit,Y> >::type type;
-
+
return type::from_value(-val.value());
}
@@ -1095,7 +1088,7 @@
const quantity<Unit2,Y>& rhs)
{
typedef typename add_typeof_helper< quantity<Unit1,X>,quantity<Unit2,Y> >::type type;
-
+
return type::from_value(lhs.value()+rhs.value());
}
@@ -1110,7 +1103,7 @@
const quantity<Unit2,Y>& rhs)
{
typedef typename subtract_typeof_helper< quantity<Unit1,X>,quantity<Unit2,Y> >::type type;
-
+
return type::from_value(lhs.value()-rhs.value());
}
@@ -1126,7 +1119,7 @@
{
typedef typename multiply_typeof_helper< quantity<Unit1,X>,
quantity<Unit2,Y> >::type type;
-
+
return type::from_value(lhs.value()*rhs.value());
}
@@ -1142,7 +1135,7 @@
{
typedef typename divide_typeof_helper< quantity<Unit1,X>,
quantity<Unit2,Y> >::type type;
-
+
return type::from_value(lhs.value()/rhs.value());
}
@@ -1151,7 +1144,7 @@
class X,
class Y>
inline
-bool
+bool
operator==(const quantity<Unit,X>& val1,
const quantity<Unit,Y>& val2)
{
@@ -1163,7 +1156,7 @@
class X,
class Y>
inline
-bool
+bool
operator!=(const quantity<Unit,X>& val1,
const quantity<Unit,Y>& val2)
{
@@ -1175,7 +1168,7 @@
class X,
class Y>
inline
-bool
+bool
operator<(const quantity<Unit,X>& val1,
const quantity<Unit,Y>& val2)
{
@@ -1187,7 +1180,7 @@
class X,
class Y>
inline
-bool
+bool
operator<=(const quantity<Unit,X>& val1,
const quantity<Unit,Y>& val2)
{
@@ -1199,7 +1192,7 @@
class X,
class Y>
inline
-bool
+bool
operator>(const quantity<Unit,X>& val1,
const quantity<Unit,Y>& val2)
{
@@ -1211,7 +1204,7 @@
class X,
class Y>
inline
-bool
+bool
operator>=(const quantity<Unit,X>& val1,
const quantity<Unit,Y>& val2)
{
Modified: branches/units/autoprefix/boost/units/reduce_unit.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/reduce_unit.hpp (original)
+++ branches/units/autoprefix/boost/units/reduce_unit.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,10 +11,8 @@
#ifndef BOOST_UNITS_REDUCE_UNIT_HPP_INCLUDED
#define BOOST_UNITS_REDUCE_UNIT_HPP_INCLUDED
-///
/// \file
/// \brief Returns a unique type for every unit.
-///
namespace boost {
namespace units {
Modified: branches/units/autoprefix/boost/units/scale.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/scale.hpp (original)
+++ branches/units/autoprefix/boost/units/scale.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -15,7 +15,6 @@
/// \file
/// \brief 10^3 Engineering & 2^10 binary scaling factors for autoprefixing.
/// \details
-/// \author Steven Watanabe
///
#include <string>
@@ -33,7 +32,7 @@
template<class S, class Scale>
struct scaled_base_unit;
-/// scale class representing a scaling factor such as 10^3
+/// class representing a scaling factor such as 10^3
/// The exponent must be a static rational.
template<long Base, class Exponent>
struct scale
Modified: branches/units/autoprefix/boost/units/scaled_base_unit.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/scaled_base_unit.hpp (original)
+++ branches/units/autoprefix/boost/units/scaled_base_unit.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,12 +11,6 @@
#ifndef BOOST_UNITS_SCALED_BASE_UNIT_HPP_INCLUDED
#define BOOST_UNITS_SCALED_BASE_UNIT_HPP_INCLUDED
-///
-/// \file
-/// \brief Scaled base unit.
-/// \details INTERNAL ONLY.
-///
-
#include <string>
#include <boost/mpl/bool.hpp>
Modified: branches/units/autoprefix/boost/units/static_constant.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/static_constant.hpp (original)
+++ branches/units/autoprefix/boost/units/static_constant.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,15 +11,10 @@
#ifndef BOOST_UNITS_STATIC_CONSTANT_HPP
#define BOOST_UNITS_STATIC_CONSTANT_HPP
-///
-/// \file
-/// \brief Macro for static constants with auto type deduction
-/// \details A convenience macro that allows definition of static
-/// constants in headers in an ODR-safe way.
-///
-
#include <boost/units/config.hpp>
+/// A convenience macro that allows definition of static
+/// constants in headers in an ODR-safe way.
#define BOOST_UNITS_STATIC_CONSTANT(name, type) \
template<bool b> \
struct name##_instance_t \
@@ -35,8 +30,8 @@
template<bool b> \
const type name##_instance_t<b>::instance
-/// A convenience macro for static constants with auto
-/// type deduction.
+/// A convenience macro for static constants with auto
+/// type deduction.
#if BOOST_UNITS_HAS_TYPEOF
#if BOOST_UNITS_HAS_BOOST_TYPEOF
Modified: branches/units/autoprefix/boost/units/static_rational.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/static_rational.hpp (original)
+++ branches/units/autoprefix/boost/units/static_rational.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -47,8 +47,7 @@
};
// Compile time rational number.
-
-/*! \details
+/**
This is an implementation of a compile time rational number, where @c static_rational<N,D> represents
a rational number with numerator @c N and denominator @c D. Because of the potential for ambiguity arising
from multiple equivalent values of @c static_rational (e.g. @c static_rational<6,2>==static_rational<3>),
Modified: branches/units/autoprefix/boost/units/systems/si/codata/electromagnetic_constants.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/systems/si/codata/electromagnetic_constants.hpp (original)
+++ branches/units/autoprefix/boost/units/systems/si/codata/electromagnetic_constants.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -35,10 +35,10 @@
namespace boost {
-namespace units {
+namespace units {
namespace si {
-
+
namespace constants {
namespace codata {
@@ -63,7 +63,7 @@
} // namespace codata
-} // namespace constants
+} // namespace constants
} // namespace si
Modified: branches/units/autoprefix/boost/units/unit.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/unit.hpp (original)
+++ branches/units/autoprefix/boost/units/unit.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -11,12 +11,6 @@
#ifndef BOOST_UNITS_UNIT_HPP
#define BOOST_UNITS_UNIT_HPP
-///
-/// \file
-/// \brief unit classes and functions.
-/// \details unit representing a model-dependent unit with no associated value for dimensional analysis.
-///
-
#include <boost/static_assert.hpp>
#include <boost/mpl/bool.hpp>
#include <boost/mpl/assert.hpp>
@@ -34,24 +28,26 @@
namespace boost {
-namespace units { //! \namespace boost::units::detail \brief unit classes and functions implementation details (not recommended for normal use).
+namespace units {
+
+/// class representing a model-dependent unit with no associated value
+/// (e.g. meters, Kelvin, feet, etc...)
template<class Dim,class System, class Enable>
class unit
-{ /// \brief unit representing a model-dependent unit with no associated value.
- /// \details (for example: meters, Kelvin, feet, etc...). Can be used for dimensional analysis.
+{
public:
typedef unit<Dim, System> unit_type;
typedef unit<Dim,System> this_type;
- typedef Dim dimension_type;
+ typedef Dim dimension_type;
typedef System system_type;
-
+
unit() { }
unit(const this_type&) { }
- //~unit() { }
-
+ //~unit() { }
+
this_type& operator=(const this_type&) { }
-
+
// sun will ignore errors resulting from templates
// instantiated in the return type of a function.
// Make sure that we get an error anyway by putting.
@@ -98,7 +94,7 @@
};
/// INTERNAL ONLY
-template<class S1,class S2>
+template<class S1,class S2>
struct is_implicitly_convertible :
boost::is_same<typename reduce_unit<S1>::type, typename reduce_unit<S2>::type>
{ };
@@ -304,25 +300,25 @@
};
/// raise unit to a @c static_rational power
-template<class Dim,class System,long N,long D>
-struct power_typeof_helper<unit<Dim,System>,static_rational<N,D> >
-{
- typedef unit<typename static_power<Dim,static_rational<N,D> >::type,typename static_power<System, static_rational<N,D> >::type> type;
-
- static type value(const unit<Dim,System>&)
- {
+template<class Dim,class System,long N,long D>
+struct power_typeof_helper<unit<Dim,System>,static_rational<N,D> >
+{
+ typedef unit<typename static_power<Dim,static_rational<N,D> >::type,typename static_power<System, static_rational<N,D> >::type> type;
+
+ static type value(const unit<Dim,System>&)
+ {
return type();
}
};
/// take the @c static_rational root of a unit
-template<class Dim,class System,long N,long D>
-struct root_typeof_helper<unit<Dim,System>,static_rational<N,D> >
-{
- typedef unit<typename static_root<Dim,static_rational<N,D> >::type,typename static_root<System, static_rational<N,D> >::type> type;
-
- static type value(const unit<Dim,System>&)
- {
+template<class Dim,class System,long N,long D>
+struct root_typeof_helper<unit<Dim,System>,static_rational<N,D> >
+{
+ typedef unit<typename static_root<Dim,static_rational<N,D> >::type,typename static_root<System, static_rational<N,D> >::type> type;
+
+ static type value(const unit<Dim,System>&)
+ {
return type();
}
};
@@ -331,9 +327,9 @@
template<class Dim,class System>
typename unary_plus_typeof_helper< unit<Dim,System> >::type
operator+(const unit<Dim,System>&)
-{
+{
typedef typename unary_plus_typeof_helper< unit<Dim,System> >::type type;
-
+
return type();
}
@@ -341,9 +337,9 @@
template<class Dim,class System>
typename unary_minus_typeof_helper< unit<Dim,System> >::type
operator-(const unit<Dim,System>&)
-{
+{
typedef typename unary_minus_typeof_helper< unit<Dim,System> >::type type;
-
+
return type();
}
@@ -357,11 +353,11 @@
operator+(const unit<Dim1,System1>&,const unit<Dim2,System2>&)
{
BOOST_STATIC_ASSERT((boost::is_same<System1,System2>::value == true));
-
+
typedef System1 system_type;
typedef typename add_typeof_helper< unit<Dim1,system_type>,
unit<Dim2,system_type> >::type type;
-
+
return type();
}
@@ -375,11 +371,11 @@
operator-(const unit<Dim1,System1>&,const unit<Dim2,System2>&)
{
BOOST_STATIC_ASSERT((boost::is_same<System1,System2>::value == true));
-
+
typedef System1 system_type;
typedef typename subtract_typeof_helper< unit<Dim1,system_type>,
unit<Dim2,system_type> >::type type;
-
+
return type();
}
@@ -394,7 +390,7 @@
{
typedef typename multiply_typeof_helper< unit<Dim1,System1>,
unit<Dim2,System2> >::type type;
-
+
return type();
}
@@ -409,7 +405,7 @@
{
typedef typename divide_typeof_helper< unit<Dim1,System1>,
unit<Dim2,System2> >::type type;
-
+
return type();
}
@@ -419,7 +415,7 @@
class System1,
class System2>
inline
-bool
+bool
operator==(const unit<Dim1,System1>&,const unit<Dim2,System2>&)
{
return boost::is_same<typename reduce_unit<unit<Dim1,System1> >::type, typename reduce_unit<unit<Dim2,System2> >::type>::value;
@@ -431,7 +427,7 @@
class System1,
class System2>
inline
-bool
+bool
operator!=(const unit<Dim1,System1>&,const unit<Dim2,System2>&)
{
return !boost::is_same<typename reduce_unit<unit<Dim1,System1> >::type, typename reduce_unit<unit<Dim2,System2> >::type>::value;
Modified: branches/units/autoprefix/boost/units/units_fwd.hpp
==============================================================================
--- branches/units/autoprefix/boost/units/units_fwd.hpp (original)
+++ branches/units/autoprefix/boost/units/units_fwd.hpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -15,18 +15,15 @@
/// \file
/// \brief Forward declarations of library components.
/// \details Forward declarations of units library - dimensions, systems, quantity and string components.
-/// \author Steven Watanabe
///
#ifndef BOOST_UNITS_DOXYGEN
#include <string>
-namespace boost
-{ //! \namespace boost \brief www.Boost.org.
+namespace boost {
-namespace units
-{ //! \namespace boost::units \brief Boost.Units library.
+namespace units {
template<typename T,typename V> struct dim;
template<typename T> struct is_dim;
Modified: branches/units/autoprefix/libs/units/doc/units.qbk
==============================================================================
--- branches/units/autoprefix/libs/units/doc/units.qbk (original)
+++ branches/units/autoprefix/libs/units/doc/units.qbk 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -72,20 +72,20 @@
[section:Introduction Introduction]
-The Boost.Units library is a C++ implementation of dimensional analysis in a general
+The Boost.Units library is a C++ implementation of dimensional analysis in a general
and extensible manner, treating it as a generic compile-time metaprogramming problem. With appropriate
compiler optimization, no runtime execution cost is introduced, facilitating the use of this library to
provide dimension checking in performance-critical code. Support for units
-and quantities (defined as a unit and associated value) for arbitrary unit system models and arbitrary
-value types is provided, as is a fine-grained general facility for unit conversions. Complete SI and CGS unit
-systems are provided, along with systems for
-angles measured in degrees, radians, gradians, and revolutions and
-systems for temperatures measured in Kelvin, degrees Celsius and degrees Fahrenheit.
+and quantities (defined as a unit and associated value) for arbitrary unit system models and arbitrary
+value types is provided, as is a fine-grained general facility for unit conversions. Complete SI and CGS unit
+systems are provided, along with systems for
+angles measured in degrees, radians, gradians, and revolutions and
+systems for temperatures measured in Kelvin, degrees Celsius and degrees Fahrenheit.
The library architecture has been designed with flexibility and extensibility in mind; demonstrations of the ease
of adding new units and unit conversions are provided in the examples.
In order to enable complex compile-time dimensional analysis calculations with no runtime overhead,
-Boost.Units relies heavily on the [___boost_mpl] (MPL) and on template metaprogramming techniques, and is, as a consequence,
+Boost.Units relies heavily on the [___boost_mpl] (MPL) and on template metaprogramming techniques, and is, as a consequence,
fairly demanding of compiler compliance to ISO standards. At present, it has been successfully
compiled and tested on the following compilers/platforms :
@@ -94,7 +94,7 @@
# g++ 3.4.4, 4.2.3, and 4.3.0 on Windows XP
# Microsoft Visual C++ 7.1, 8.0, and 9.0 on Windows XP
# Comeau 4.3.10.1 beta2 on Windows XP
-# Metrowerks CodeWarrior 9.2 on Windows XP.
+# Metrowerks CodeWarrior 9.2 on Windows XP.
# Sun CC 5.9 on Solaris and Linux
The following compilers/platforms are known *not* to work :
@@ -112,9 +112,9 @@
Before discussing the basics of the library, we first define a few terms that will be used frequently
in the following :
-* *Base dimension* : A base dimension is loosely defined as a measurable entity of interest; in conventional
+* *Base dimension* : A base dimension is loosely defined as a measurable entity of interest; in conventional
dimensional analysis, base dimensions include length (\[L\]), mass (\[M\]), time (\[T\]), etc... but there is
- no specific restriction on what base dimensions can be used. Base dimensions are essentially a tag type and
+ no specific restriction on what base dimensions can be used. Base dimensions are essentially a tag type and
provide no dimensional analysis functionality themselves.
* *Dimension* : A collection of zero or more base dimensions, each
potentially raised to a different rational power.
@@ -125,20 +125,20 @@
Much like base dimensions, base units are a tag type used solely to define units and do not support dimensional
analysis algebra.
* *Unit* : A set of base units raised to rational exponents, e.g. m^1, kg^1, m^1/s^2.
-* *System* : A unit system is a collection of base units representing all the measurable entities of interest for a
- specific problem. For example, the SI unit system defines seven base units : length (\[L\]) in meters,
- mass (\[M\]) in kilograms, time (\[T\]) in seconds, current (\[I\]) in amperes, temperature (\[theta\]) in kelvin,
- amount (\[N\]) in moles, and luminous intensity (\[J\]) in candelas. All measurable entities within the SI system can
+* *System* : A unit system is a collection of base units representing all the measurable entities of interest for a
+ specific problem. For example, the SI unit system defines seven base units : length (\[L\]) in meters,
+ mass (\[M\]) in kilograms, time (\[T\]) in seconds, current (\[I\]) in amperes, temperature (\[theta\]) in kelvin,
+ amount (\[N\]) in moles, and luminous intensity (\[J\]) in candelas. All measurable entities within the SI system can
be represented as products of various integer or rational powers of these seven base units.
-* *Quantity* : A quantity represents a concrete amount of a unit. Thus, while the meter is the base
+* *Quantity* : A quantity represents a concrete amount of a unit. Thus, while the meter is the base
unit of length in the SI system, 5.5 meters is a quantity of length in that system.
-To begin, we present two short tutorials. [@../../libs/units/tutorial/tutorial_1.cpp Tutorial1] demonstrates the use of
-[@http://en.wikipedia.org/wiki/SI_units SI] units. After including the appropriate system headers
-and the headers for the various SI units we will need (all SI units can be included with
-[headerref boost/units/systems/si.hpp]) and for quantity I/O ([headerref boost/units/io.hpp]), we define
-a function that computes the work, in joules, done by exerting a force in newtons over a specified distance in meters
-and outputs the result to `std::cout`. The [___quantity] class accepts a second template parameter as its value type;
+To begin, we present two short tutorials. [@../../libs/units/tutorial/tutorial_1.cpp Tutorial1] demonstrates the use of
+[@http://en.wikipedia.org/wiki/SI_units SI] units. After including the appropriate system headers
+and the headers for the various SI units we will need (all SI units can be included with
+[headerref boost/units/systems/si.hpp]) and for quantity I/O ([headerref boost/units/io.hpp]), we define
+a function that computes the work, in joules, done by exerting a force in newtons over a specified distance in meters
+and outputs the result to `std::cout`. The [___quantity] class accepts a second template parameter as its value type;
this parameter defaults to
`double` if not otherwise specified. To demonstrate the ease of using user-defined types in dimensional
calculations, we also present code for computing the complex impedance using `std::complex<double>`
@@ -154,7 +154,7 @@
While this library attempts to make simple dimensional computations easy to code, it is in no way
tied to any particular unit system (SI or otherwise). Instead, it provides a highly flexible compile-time
-system for dimensional analysis, supporting arbitrary collections of base dimensions, rational
+system for dimensional analysis, supporting arbitrary collections of base dimensions, rational
powers of units, and explicit quantity conversions. It accomplishes all of this via template metaprogramming techniques.
With modern optimizing compilers, this results in zero runtime overhead for quantity computations relative to the
same code without unit checking.
@@ -163,61 +163,61 @@
[section:Dimensional_Analysis Dimensional Analysis]
-The concept of
-[@http://en.wikipedia.org/wiki/Dimensional_analysis dimensional analysis]
-is normally presented early on in introductory physics and engineering classes as a means of determining the
+The concept of
+[@http://en.wikipedia.org/wiki/Dimensional_analysis dimensional analysis]
+is normally presented early on in introductory physics and engineering classes as a means of determining the
correctness of an equation or computation by propagating the physical measurement
[@http://en.wikipedia.org/wiki/Units_of_measurement units]
-of various quantities through the equation along with their numerical values. There are a number of standard
-unit systems in common use, the most prominent of which is the
-[@http://en.wikipedia.org/wiki/SI_units Systeme International]
-(also known as SI or MKS (meter-kilogram-second), which was a metric predecessor to the SI system named
-for three of the base units on which the system is based). The SI
-is the only official international standard unit system and is widely utilized in science and engineering.
+of various quantities through the equation along with their numerical values. There are a number of standard
+unit systems in common use, the most prominent of which is the
+[@http://en.wikipedia.org/wiki/SI_units Systeme International]
+(also known as SI or MKS (meter-kilogram-second), which was a metric predecessor to the SI system named
+for three of the base units on which the system is based). The SI
+is the only official international standard unit system and is widely utilized in science and engineering.
Other common systems include the [@http://en.wikipedia.org/wiki/Cgs_units CGS]
-(centimeter-gram-second) system and the
+(centimeter-gram-second) system and the
[@http://en.wikipedia.org/wiki/English_units English]
-system still in use in some problem domains in the United States and elsewhere. In physics,
-there also exist a number of other systems that are in common use in specialized subdisciplines. These are
-collectively referred to as [@http://en.wikipedia.org/wiki/Natural_units natural units]. When
-quantities representing different measurables are combined, dimensional analysis provides the means of
-assessing the consistency of the resulting calculation. For example, the sum of two lengths is also a length,
+system still in use in some problem domains in the United States and elsewhere. In physics,
+there also exist a number of other systems that are in common use in specialized subdisciplines. These are
+collectively referred to as [@http://en.wikipedia.org/wiki/Natural_units natural units]. When
+quantities representing different measurables are combined, dimensional analysis provides the means of
+assessing the consistency of the resulting calculation. For example, the sum of two lengths is also a length,
while the product of two lengths is an area, and the sum of a length and an area is undefined. The fact that the
-arguments to many functions (such as exp, log, etc...) must be dimensionless quantities can be easily demonstrated by
-examining their series expansions in the context of dimensional analysis. This library facilitates the enforcement
+arguments to many functions (such as exp, log, etc...) must be dimensionless quantities can be easily demonstrated by
+examining their series expansions in the context of dimensional analysis. This library facilitates the enforcement
of this type of restriction in code involving dimensioned quantities where appropriate.
-In the following discussion we view dimensional analysis as an abstraction in which an arbitrary set of
-[@http://en.wikipedia.org/wiki/Fundamental_units units] obey the rules of a specific algebra.
-We will refer to a pair of a base dimension and a rational exponent as a *fundamental dimension*,
+In the following discussion we view dimensional analysis as an abstraction in which an arbitrary set of
+[@http://en.wikipedia.org/wiki/Fundamental_units units] obey the rules of a specific algebra.
+We will refer to a pair of a base dimension and a rational exponent as a *fundamental dimension*,
and a list composed of an arbitrary number of fundamental dimensions as a *composite dimension* or, simply,
*dimension*. In particular, given a set of [$../../libs/units/images/form_0.png] fundamental dimensions
denoted by [$../../libs/units/images/form_1.png] and a set of [$../../libs/units/images/form_0.png]
rational exponents [$../../libs/units/images/form_2.png], any possible (composite) dimension can be written
-as [$../../libs/units/images/form_3.png].
+as [$../../libs/units/images/form_3.png].
Composite dimensions obey the algebraic rules for dimensional analysis. In particular, for any scalar value,
-[$../../libs/units/images/form_4.png],
+[$../../libs/units/images/form_4.png],
and composite dimensions [$../../libs/units/images/form_5.png]
-and [$../../libs/units/images/form_6.png], where
+and [$../../libs/units/images/form_6.png], where
[$../../libs/units/images/form_7.png], we have:
[$../../libs/units/images/form_8.png]
-Users of a dimensional analysis library should be able to specify an arbitrary list of base dimensions to
-produce a composite dimension. This potentially includes repeated tags. For example,
-it should be possible to express energy as [$../../libs/units/images/form_9.png], [$../../libs/units/images/form_10.png],
-[$../../libs/units/images/form_11.png], or any other permutation of mass, length, and time having aggregate exponents of
+Users of a dimensional analysis library should be able to specify an arbitrary list of base dimensions to
+produce a composite dimension. This potentially includes repeated tags. For example,
+it should be possible to express energy as [$../../libs/units/images/form_9.png], [$../../libs/units/images/form_10.png],
+[$../../libs/units/images/form_11.png], or any other permutation of mass, length, and time having aggregate exponents of
1, 2, and -2, respectively.
-In order to be able to perform computations on arbitrary sets of dimensions,
-all composite dimensions must be reducible to an unambiguous final composite dimension, which we will refer to as a
+In order to be able to perform computations on arbitrary sets of dimensions,
+all composite dimensions must be reducible to an unambiguous final composite dimension, which we will refer to as a
*reduced dimension*, for which
# fundamental dimensions are consistently ordered
-# dimensions with zero exponent are elided. Note that reduced dimensions never have more than
+# dimensions with zero exponent are elided. Note that reduced dimensions never have more than
[$../../libs/units/images/form_0.png] base dimensions, one for each distinct fundamental dimension, but may have fewer.
-In our implementation, base dimensions are associated with tag types. As we will ultimately
+In our implementation, base dimensions are associated with tag types. As we will ultimately
represent composite dimensions as typelists, we must provide some mechanism for sorting
base dimension tags in order to make it possible to convert an arbitrary composite dimension
into a reduced dimension. For this purpose, we assign a unique integer to each base dimension.
@@ -233,9 +233,9 @@
[test_system_snippet_1]
It is important to note that the choice of order is completely arbitrary as long as each tag has a unique enumerable
-value; non-unique ordinals are flagged as errors at compile-time. Negative ordinals are reserved for use by the library.
+value; non-unique ordinals are flagged as errors at compile-time. Negative ordinals are reserved for use by the library.
To define composite dimensions corresponding to the base dimensions, we
-simply create MPL-conformant typelists of fundamental dimensions by using the [___dim] class to encapsulate pairs of base dimensions
+simply create MPL-conformant typelists of fundamental dimensions by using the [___dim] class to encapsulate pairs of base dimensions
and [___static_rational] exponents. The [___make_dimension_list] class acts as a wrapper to ensure
that the resulting type is in the form of a reduced dimension:
@@ -288,9 +288,9 @@
template<class Dim,class System> class unit;
In addition to supporting the compile-time dimensional analysis operations, the +, -, *, and / runtime operators are provided
-for [___unit] variables. Because the dimension associated with powers and roots must be computed at compile-time, it is not
-possible to provide overloads for `std::pow` that function correctly for [___unit]s. These operations are supported through
-free functions [___pow] and [___root] that are templated on integer and [___static_rational] values and can take as an argument
+for [___unit] variables. Because the dimension associated with powers and roots must be computed at compile-time, it is not
+possible to provide overloads for `std::pow` that function correctly for [___unit]s. These operations are supported through
+free functions [___pow] and [___root] that are templated on integer and [___static_rational] values and can take as an argument
any type for which the utility classes [___power_typeof_helper] and [___root_typeof_helper] have been defined.
[section Base Units]
@@ -301,27 +301,27 @@
Again negative ordinals are reserved.
-As an example, in the following we will implement a subset of the SI unit system based on the fundamental dimensions
+As an example, in the following we will implement a subset of the SI unit system based on the fundamental dimensions
given above, demonstrating all steps necessary for a completely functional system. First, we simply define a unit system
that includes type definitions for commonly used units:
[test_system_snippet_6]
-The macro [___BOOST_UNITS_STATIC_CONSTANT] is provided in [headerref boost/units/static_constant.hpp]
-to facilitate ODR- and thread-safe constant definition in header files. We then define some constants for the supported units
+The macro [___BOOST_UNITS_STATIC_CONSTANT] is provided in [headerref boost/units/static_constant.hpp]
+to facilitate ODR- and thread-safe constant definition in header files. We then define some constants for the supported units
to simplify variable definitions:
[test_system_snippet_7]
-If support for textual output of units is desired, we can also specialize the [___base_unit_info] class for each fundamental
+If support for textual output of units is desired, we can also specialize the [___base_unit_info] class for each fundamental
dimension tag:
[test_system_snippet_8]
and similarly for `kilogram_base_unit` and `second_base_unit`. A future version of the library will provide a more flexible system
-allowing for internationalization through a facet/locale-type mechanism.
-The `name()` and `symbol()` methods of [___base_unit_info] provide full and short names for the base unit. With these definitions,
-we have the rudimentary beginnings of our unit system, which can be used to determine reduced dimensions for arbitrary
+allowing for internationalization through a facet/locale-type mechanism.
+The `name()` and `symbol()` methods of [___base_unit_info] provide full and short names for the base unit. With these definitions,
+we have the rudimentary beginnings of our unit system, which can be used to determine reduced dimensions for arbitrary
unit calculations.
[endsect] [/section Base Units]
@@ -424,7 +424,7 @@
[section:Quantities Quantities]
A *quantity* is defined as a value of an arbitrary value type that is associated with a specific unit. For example,
-while meter is a unit, 3.0 meters is a quantity. Quantities obey two separate algebras: the native algebra for their
+while meter is a unit, 3.0 meters is a quantity. Quantities obey two separate algebras: the native algebra for their
value type, and the dimensional analysis algebra for the associated unit. In addition, algebraic operations are defined
between units and quantities to simplify the definition of quantities; it is effectively equivalent to algebra with
a unit-valued quantity.
@@ -435,19 +435,19 @@
This class is templated on both unit type (`Unit`) and value type (`Y`), with the latter defaulting to double-precision
floating point if not otherwise specified. The value type must have a normal copy constructor and copy
-assignment operator. Operators +, -, *, and / are provided for algebraic operations between
+assignment operator. Operators +, -, *, and / are provided for algebraic operations between
scalars and units, scalars and quantities, units and quantities, and between quantities. In addition, integral and
-rational powers and roots can be computed using the [___pow]<R> and [___root]<R> functions. Finally,
-the standard set of boolean comparison operators ( `==, !=, <, <=, >, and >=` ) are provided to allow
+rational powers and roots can be computed using the [___pow]<R> and [___root]<R> functions. Finally,
+the standard set of boolean comparison operators ( `==, !=, <, <=, >, and >=` ) are provided to allow
comparison of quantities from the same unit system. All operators simply delegate to the
corresponding operator of the value type if the units permit.
[section:Heterogeneous_Operators Heterogeneous Operators]
-For most common value types, the result type of arithmetic operators is the same as the value type itself. For example,
-the sum of two double precision floating point numbers is another double precision floating point number. However, there
-are instances where this is not the case. A simple example is given by the [@http://en.wikipedia.org/wiki/Natural_number
-natural numbers] where the operator arithmetic obeys the following rules (using the standard notation for
+For most common value types, the result type of arithmetic operators is the same as the value type itself. For example,
+the sum of two double precision floating point numbers is another double precision floating point number. However, there
+are instances where this is not the case. A simple example is given by the [@http://en.wikipedia.org/wiki/Natural_number
+natural numbers] where the operator arithmetic obeys the following rules (using the standard notation for
[@http://en.wikipedia.org/wiki/Number number systems]):
* [$../../libs/units/images/form_12.png]
@@ -455,7 +455,7 @@
* [$../../libs/units/images/form_14.png]
* [$../../libs/units/images/form_15.png]
-This library is designed to support arbitrary value type algebra for addition, subtraction, multiplication, division, and
+This library is designed to support arbitrary value type algebra for addition, subtraction, multiplication, division, and
rational powers and roots. It uses Boost.Typeof to deduce the result of these operators. For compilers that
support `typeof`, the appropriate value type will be automatically deduced. For compilers that do not provide
language support for `typeof` it is necessary to register all the types used. For the case of natural numbers,
@@ -469,11 +469,11 @@
[section:Conversions Conversions]
-Conversion is only meaningful for quantities as it implies the presence of at
+Conversion is only meaningful for quantities as it implies the presence of at
least a multiplicative scale factor and, possibly, and affine linear offset.
Macros for simplifying the definition of conversions between units can be found in
[headerref boost/units/conversion.hpp] and [headerref boost/units/absolute.hpp]
-(for affine conversions with offsets).
+(for affine conversions with offsets).
The macro [___BOOST_UNITS_DEFINE_CONVERSION_FACTOR] specifies a scale
factor for conversion from the first unit type to the second. The
@@ -514,8 +514,8 @@
This library is designed to emphasize safety above convenience when performing operations with dimensioned quantities.
Specifically, construction of quantities is required to fully specify both value and unit. Direct construction from a scalar value
-is prohibited (though the static member function [___from_value] is provided to enable
-this functionality where it is necessary. In addition, a [___quantity_cast] to a reference allows direct access to the
+is prohibited (though the static member function [___from_value] is provided to enable
+this functionality where it is necessary. In addition, a [___quantity_cast] to a reference allows direct access to the
underlying value of a [___quantity] variable. An explicit constructor is provided to enable conversion between
dimensionally compatible quantities in different unit systems. Implicit conversions between unit systems are
allowed only when the reduced units are identical, allowing, for example, trivial conversions between
@@ -523,7 +523,7 @@
unintentional unit system mismatches to be caught at compile time and preventing potential loss of precision and
performance overhead from unintended conversions. Assignment follows the same rules.
An exception is made for quantities for which the unit reduces to dimensionless; in this case, implicit conversion
-to the underlying value type is allowed via class template specialization. Quantities of different value types are implicitly
+to the underlying value type is allowed via class template specialization. Quantities of different value types are implicitly
convertible only if the value types are themselves implicitly convertible. The [___quantity] class also defines
a `value()` member for directly accessing the underlying value.
@@ -533,17 +533,17 @@
* assignment between `quantity<Unit,Y>` and `quantity<Unit,Z>` is allowed if `Y` and `Z` are implicitly convertible.
* explicit conversion between `quantity<Unit1,Y>` and `quantity<Unit2,Z>` is allowed if `Unit1` and `Unit2` have the same dimensions
and if `Y` and `Z` are implicitly convertible.
-* implicit conversion between `quantity<Unit1,Y>` and `quantity<Unit2,Z>` is allowed if `Unit1`
+* implicit conversion between `quantity<Unit1,Y>` and `quantity<Unit2,Z>` is allowed if `Unit1`
reduces to exactly the same combination of base units as `Unit2` and if `Y` and `Z` are convertible.
* assignment between `quantity<Unit1,Y>` and `quantity<Unit2,Z>` is allowed under the same
conditions as implicit conversion.
-* `quantity<Unit,Y>` can be directly constructed from a value of type `Y` using the static member function [___from_value]. Doing so,
+* `quantity<Unit,Y>` can be directly constructed from a value of type `Y` using the static member function [___from_value]. Doing so,
naturally, bypasses any type-checking of the newly assigned value, so this method should be used only when absolutely necessary.
Of course, any time implicit conversion is allowed, an explicit conversion is
also legal.
-Because dimensionless quantities have no associated units, they behave as normal scalars, and allow implicit conversion to and from
+Because dimensionless quantities have no associated units, they behave as normal scalars, and allow implicit conversion to and from
the underlying value type or types that are convertible to/from that value type.
[endsect]
@@ -568,20 +568,16 @@
outputting (with symbol demangling, implemented in
[@boost:/boost/units/detail/utility.hpp utility.hpp])
-[/ was [headerref boost/units/detail/utility.hpp] but this file is not included in Doxygen input.]
-
[dimension_output]
[endsect]
[section:UnitExample Unit Example]
-([@../../example/unit.cpp unit.cpp])
-
-This example demonstrates the use of the simple but functional unit system implemented in
-[@http://www.boost.org/doc/libs/1_42_0/libs/units/example/test_system.hpp test_system.hpp]
+([@../../libs/units/example/unit.cpp unit.cpp])
-[/ was [headerref libs/units/example/test_system.hpp] but this file is not included in Doxygen input.]
+This example demonstrates the use of the simple but functional unit system implemented in
+[@boost:/libs/units/example/test_system.hpp test_system.hpp]
[import ../example/unit.cpp]
@@ -607,13 +603,13 @@
[quantity_output_double]
-As a further demonstration of the flexibility of the system, we replace the `double` value type
+As a further demonstration of the flexibility of the system, we replace the `double` value type
with a `std::complex<double>` value type (ignoring the question of the meaningfulness of
complex lengths and energies) :
[quantity_snippet_2]
-and find that the code functions exactly as expected with no additional work, delegating operations
+and find that the code functions exactly as expected with no additional work, delegating operations
to `std::complex<double>` and performing the appropriate dimensional analysis :
[quantity_output_complex]
@@ -633,7 +629,7 @@
[kitchen_sink_snippet_1]
-the various algebraic operations between scalars, units, and quantities give
+the various algebraic operations between scalars, units, and quantities give
[kitchen_sink_output_1]
@@ -691,7 +687,7 @@
[kitchen_sink_output_10]
Trigonometric and inverse trigonometric functions can be implemented for any unit system
-that provides an angular base dimension. For radians, these functions are found in
+that provides an angular base dimension. For radians, these functions are found in
[headerref boost/units/cmath.hpp] These behave as one expects, with trigonometric functions
taking an angular quantity and returning a dimensionless quantity, while the inverse trigonometric functions
take a dimensionless quantity and return an angular quantity :
@@ -716,7 +712,7 @@
User-defined value types that support the appropriate arithmetic operations are automatically supported
as quantity value types. The operators that are supported by default for quantity value types are unary plus, unary minus,
-addition, subtraction, multiplication, division, equal-to, not-equal-to, less-than, less-or-equal-to,
+addition, subtraction, multiplication, division, equal-to, not-equal-to, less-than, less-or-equal-to,
greater-than, and greater-or-equal-to. Support for rational powers and roots can be added by overloading
the [___power_typeof_helper] and [___root_typeof_helper] classes. Here we implement a user-defined `measurement`
class that models a numerical measurement with an associated measurement error and the appropriate algebra and
@@ -750,7 +746,7 @@
[conversion_snippet_1]
-illustrates implicit conversion of quantities of different value types where implicit conversion
+illustrates implicit conversion of quantities of different value types where implicit conversion
of the value types themselves is allowed. N.B. The conversion from double to int is treated
as an explicit conversion because there is no way to emulate the exact behavior of the built-in
conversion. Explicit constructors allow conversions for two cases:
@@ -782,7 +778,7 @@
([@../../libs/units/example/quaternion.cpp quaternion.cpp])
This example demonstrates the use of `boost::math::quaternion` as a value type for [___quantity] and the converse.
-For the first case, we first define specializations of [___power_typeof_helper] and [___root_typeof_helper] for
+For the first case, we first define specializations of [___power_typeof_helper] and [___root_typeof_helper] for
powers and roots, respectively:
[import ../example/quaternion.cpp]
@@ -797,7 +793,7 @@
so that all operations that are defined in the `quaternion` class behave correctly. If rational
powers were defined for this class, it would be possible to compute rational powers and roots with
-no additional changes.
+no additional changes.
[quaternion_output_1]
@@ -805,11 +801,11 @@
[quaternion_snippet_2]
-Here, the unary plus and minus and addition and subtraction operators function correctly. Unfortunately,
-the multiplication and division operations fail because `quaternion` implements them in terms of the `*=` and
-`/=` operators, respectively, which are incapable of representing the heterogeneous unit algebra needed for
-quantities (an identical problem
-occurs with `std::complex<T>`, for the same reason). In order to compute rational powers and roots, we need to
+Here, the unary plus and minus and addition and subtraction operators function correctly. Unfortunately,
+the multiplication and division operations fail because `quaternion` implements them in terms of the `*=` and
+`/=` operators, respectively, which are incapable of representing the heterogeneous unit algebra needed for
+quantities (an identical problem
+occurs with `std::complex<T>`, for the same reason). In order to compute rational powers and roots, we need to
specialize [___power_typeof_helper] and [___root_typeof_helper] as follows:
[quaternion_class_snippet_2a]
@@ -826,11 +822,11 @@
([@../../libs/units/example/complex.cpp complex.cpp])
-This example demonstrates how to implement a replacement `complex` class that functions correctly both as a
-quantity value type and as a quantity container class, including heterogeneous multiplication and division
+This example demonstrates how to implement a replacement `complex` class that functions correctly both as a
+quantity value type and as a quantity container class, including heterogeneous multiplication and division
operations and rational powers and roots. Naturally, heterogeneous operations are only supported on
compilers that implement `typeof`. The primary differences are that binary operations are not implemented
-using the `op=` operators and use the utility classes [___add_typeof_helper], [___subtract_typeof_helper],
+using the `op=` operators and use the utility classes [___add_typeof_helper], [___subtract_typeof_helper],
[___multiply_typeof_helper], and [___divide_typeof_helper]. In addition, [___power_typeof_helper] and
[___root_typeof_helper] are defined for both cases :
@@ -840,13 +836,13 @@
With this replacement `complex` class, we can declare a complex variable :
-[complex_snippet_1]
+[complex_snippet_1]
to get the correct behavior for all cases supported by [___quantity] with a `complex` value type :
[complex_output_1]
-and, similarly, `complex` with a [___quantity] value type
+and, similarly, `complex` with a [___quantity] value type
[complex_snippet_2]
@@ -860,9 +856,9 @@
([@../../libs/units/example/performance.cpp performance.cpp])
-This example provides an ad hoc performance test to verify that zero runtime overhead
-is incurred when using [___quantity] in place of `double`. Note that performance
-optimization and testing is not trivial, so some care must be taken in profiling. It
+This example provides an ad hoc performance test to verify that zero runtime overhead
+is incurred when using [___quantity] in place of `double`. Note that performance
+optimization and testing is not trivial, so some care must be taken in profiling. It
is also critical to have a compiler capable of optimizing the many template instantiations
and inline calls effectively to achieve maximal performance. Zero overhead for this test
has been verified using gcc 4.0.1, and icc 9.0, 10.0, and 10.1 on Mac OS 10.4 and 10.5, and
@@ -876,7 +872,7 @@
[import ../example/radar_beam_height.cpp]
-This example demonstrates the implementation of two non-SI units of length, the
+This example demonstrates the implementation of two non-SI units of length, the
nautical mile :
[radar_beam_height_class_snippet_1]
@@ -886,8 +882,8 @@
[radar_beam_height_class_snippet_2]
These units include conversions between themselves and the meter. Three functions
-for computing radar beam height from radar range and the local earth radius are
-defined. The first takes arguments in one system and returns a value in the same
+for computing radar beam height from radar range and the local earth radius are
+defined. The first takes arguments in one system and returns a value in the same
system :
[radar_beam_height_function_snippet_1]
@@ -898,7 +894,7 @@
[radar_beam_height_function_snippet_2]
Finally, the third function is an empirical approximation that is only valid for
-radar ranges specified in nautical miles, returning beam height in feet. This
+radar ranges specified in nautical miles, returning beam height in feet. This
function uses the heterogeneous unit of nautical miles per square root of feet to
ensure dimensional correctness :
@@ -946,10 +942,10 @@
[import ../example/temperature.cpp]
-This example demonstrates using of absolute temperatures and relative temperature differences in Fahrenheit
+This example demonstrates using of absolute temperatures and relative temperature differences in Fahrenheit
and converting between these and the Kelvin temperature scale. This issue touches on some surprisingly deep mathematical
concepts (see [@http://en.wikipedia.org/wiki/Affine_space Wikipedia] for a basic review), but for our purposes here, we
-will simply observe that it is important to be able to differentiate between an absolute temperature measurement and a
+will simply observe that it is important to be able to differentiate between an absolute temperature measurement and a
measurement of temperature difference. This is accomplished by using the [___absolute] wrapper class.
First we define a system using the predefined fahrenheit base unit:
@@ -998,23 +994,23 @@
[import ../example/composite_output.cpp]
If a unit has a special name and/or symbol, the free functions `name_string` and
-`symbol_string` can be overloaded directly.
+`symbol_string` can be overloaded directly.
[composite_output_snippet_1]
-In this case, any unit that reduces
-to the overloaded unit will be output with the replacement symbol.
+In this case, any unit that reduces
+to the overloaded unit will be output with the replacement symbol.
-Special names and symbols for the SI and CGS unit systems are found in
-[headerref boost/units/systems/si/io.hpp] and [headerref boost/units/systems/cgs/io.hpp],
+Special names and symbols for the SI and CGS unit systems are found in
+[headerref boost/units/systems/si/io.hpp] and [headerref boost/units/systems/cgs/io.hpp],
respectively. If these headers are not included, the output will simply follow
-default rules using the appropriate fundamental dimensions.
-Note that neither of these functions is defined for quantities
+default rules using the appropriate fundamental dimensions.
+Note that neither of these functions is defined for quantities
because doing so would require making assumptions on how the corresponding value
type should be formatted.
Three `ostream` formatters, `symbol_format`, `name_format`, and `typename_format`
-are provided for convenience. These select the textual representation of units
+are provided for convenience. These select the textual representation of units
provided by `symbol_string` or `name_string` in the first two cases, while the
latter returns a demangled typename for debugging purposes. Formatting of scaled
unit is also done correctly.
@@ -1071,7 +1067,7 @@
[section:Utilities Utilities]
Relatively complete SI and CGS unit systems are provided in [headerref boost/units/systems/si.hpp] and
-[headerref boost/units/systems/cgs.hpp], respectively.
+[headerref boost/units/systems/cgs.hpp], respectively.
[section:Metaprogramming_Classes Metaprogramming Classes]
@@ -1124,7 +1120,7 @@
template<class System> struct is_dimensionless< unit<dimensionless_type,System> >;
template<class System> struct is_dimensionless_unit< unit<dimensionless_type,System> >;
template<class System,class Y> struct is_dimensionless< quantity<unit<dimensionless_type,System>,Y> >;
- template<class System,class Y> struct is_dimensionless_quantity< quantity<unit<dimensionless_type,System>,Y> >;
+ template<class System,class Y> struct is_dimensionless_quantity< quantity<unit<dimensionless_type,System>,Y> >;
[endsect]
@@ -1162,9 +1158,9 @@
[section:Installation Installation]
-The core header files are located in `boost/units`. Unit system headers are
+The core header files are located in `boost/units`. Unit system headers are
located in `<boost/units/systems>`. There are no source files for the library
-itself - the library is header-only. Example programs demonstrating various aspects of the library can be found in
+itself - the library is header-only. Example programs demonstrating various aspects of the library can be found in
`boost/libs/units/example`. Programs for unit testing are provided in `boost/libs/units/test`.
[endsect]
@@ -1172,24 +1168,24 @@
[section:FAQ FAQ]
[section:Distinguishing_Quantities_With_Same_Units
-How does one distinguish between quantities that are physically different but have the same units (such as
+How does one distinguish between quantities that are physically different but have the same units (such as
energy and torque)?]
-Because Boost.Units includes plane and solid angle units in the SI system, torque and energy
-are, in fact, distinguishable (see [@http://en.wikipedia.org/wiki/SI_units torque]).
+Because Boost.Units includes plane and solid angle units in the SI system, torque and energy
+are, in fact, distinguishable (see [@http://en.wikipedia.org/wiki/SI_units torque]).
In addition, energy is a true
[@http://mathworld.wolfram.com/Scalar.html scalar] quantity, while torque, despite
-having the same units as energy if plane angle is not included, is in fact a
-[@http://mathworld.wolfram.com/Pseudovector.html pseudovector]. Thus, a value type representing pseudovectors
-and encapsulating their algebra could also be implemented.
+having the same units as energy if plane angle is not included, is in fact a
+[@http://mathworld.wolfram.com/Pseudovector.html pseudovector]. Thus, a value type representing pseudovectors
+and encapsulating their algebra could also be implemented.
There are,
however, a few SI units that are dimensionally indistinguishable within the SI system. These
include the [@http://en.wikipedia.org/wiki/Becquerel becquerel], which has units identical to
frequency (Hz), and the [@http://en.wikipedia.org/wiki/Sievert sievert], which is degenerate
-with the [@http://en.wikipedia.org/wiki/Gray_%28unit%29 gray]. In cases such as this,
+with the [@http://en.wikipedia.org/wiki/Gray_%28unit%29 gray]. In cases such as this,
the proper way to treat this difference is to recognize that expanding the set of base dimensions
-can provide disambiguation. For example, adding a base dimension for radioactive decays would
+can provide disambiguation. For example, adding a base dimension for radioactive decays would
allow the becquerel to be written as decays/second, differentiating it from the signature of hertz,
which is simply 1/second.
@@ -1197,8 +1193,8 @@
[section:Angle_Are_Units Angles are treated as units]
-If you don't like this, you can just ignore the angle units and
-go on your merry way (periodically screwing up when a routine wants degrees and you give it
+If you don't like this, you can just ignore the angle units and
+go on your merry way (periodically screwing up when a routine wants degrees and you give it
radians instead...)
[endsect]
@@ -1225,35 +1221,35 @@
is zero, which should be handled by the default constructor. In addition,
consider the search and replace problem allowing this poses:
- quantity<si::length> q(1.0);
-
+ quantity<si::length> q(1.0);
+
Here, the intent is clear - we want a length of one in the SI system, which is one meter. However,
imagine some well-intentioned coder attempting to reuse this code, but to have it perform the
calculations in the CGS unit system instead. After searching for `si::` and replacing it with `cgs::` ,
we have:
- quantity<cgs::length> q(1.0);
-
+ quantity<cgs::length> q(1.0);
+
Unfortunately, the meaning of this statement has suddenly changed from one meter to one centimeter. In
contrast, as implemented, we begin with:
- quantity<si::length> q(1.0*si::meter);
-
+ quantity<si::length> q(1.0*si::meter);
+
and, after search and replace:
- quantity<cgs::length> q(1.0*cgs::meter);
-
+ quantity<cgs::length> q(1.0*cgs::meter);
+
which gives us an error. Even if the code has a @using namespace boost::units::si; declaration, the latter
is still safe, with:
- using namespace boost::units::si;
- quantity<length> q(1.0*meter);
-
+ using namespace boost::units::si;
+ quantity<length> q(1.0*meter);
+
going to
- using namespace boost::units::cgs;
- quantity<length> q(1.0*meter);
-
+ using namespace boost::units::cgs;
+ quantity<length> q(1.0*meter);
+
The latter will involve an explicit conversion from meters to centimeters, but the value remains correct.
[endsect]
@@ -1269,7 +1265,7 @@
[section:Acknowledgements Acknowledgements]
-Matthias C. Schabel would like to acknowledge the Department of Defense for its support of this work under
+Matthias C. Schabel would like to acknowledge the Department of Defense for its support of this work under
the Prostate Cancer Research Program New Investigator Award W81XWH-04-1-0042 and the National Institutes of Health for their
support of this work under the NIBIB Mentored Quantitative Research Development Award K25EB005077.
@@ -1278,22 +1274,22 @@
Thanks to:
-* Paul Bristow,
-* Michael Fawcett,
-* Ben FrantzDale,
+* Paul Bristow,
+* Michael Fawcett,
+* Ben FrantzDale,
* Ron Garcia,
* David Greene,
* Peder Holt,
-* Janek Kozicki,
+* Janek Kozicki,
* Andy Little,
* Kevin Lynch,
* Torsten Maehne
* Noah Roberts,
* Andrey Semashev,
* David Walthall,
-* Deane Yang,
+* Deane Yang,
-and all the members of the Boost mailing list who provided their input into
+and all the members of the Boost mailing list who provided their input into
the design and implementation of this library.
[endsect] [/section:Acknowledgements Acknowledgements]
@@ -1304,7 +1300,7 @@
* testing on other compilers and operating systems
* performance testing on various architectures
-* tutorials
+* tutorials
[endsect]
@@ -1353,21 +1349,21 @@
* changed template order in `unit` so dimension precedes unit system
* added `homogeneous_system<S>` for unit systems
-* incorporated changes to [headerref boost/units/dimension.hpp] (compile-time sorting by predicate),
- [headerref boost/units/conversion.hpp] (thread-safe implementation of quantity conversions),
+* incorporated changes to [headerref boost/units/dimension.hpp] (compile-time sorting by predicate),
+ [headerref boost/units/conversion.hpp] (thread-safe implementation of quantity conversions),
and [headerref boost/units/io.hpp] (now works with any `std::basic_ostream`) by SW
* added abstract units in [headerref boost/units/systems/abstract.hpp] to allow abstract dimensional
analysis
-* new example demonstrating implementation of code based on requirements from
+* new example demonstrating implementation of code based on requirements from
Michael Fawcett ([@../../libs/units/example/radar_beam_height.cpp radar_beam_height.cpp])
0.6.1 (February 13, 2007) :
-* added metafunctions to test if a type is
+* added metafunctions to test if a type is
* a valid dimension list (`is_dimension_list<D>`)
* a unit (`is_unit<T>` and `is_unit_of_system<U,System>`)
- * a quantity (`is_quantity<T>` and `is_quantity_of_system<Q,System>`)
-* quantity conversion factor is now computed at compile time
+ * a quantity (`is_quantity<T>` and `is_quantity_of_system<Q,System>`)
+* quantity conversion factor is now computed at compile time
* static constants now avoid ODR problems
* unit_example_14.cpp now uses Boost.Timer
* numerous minor fixes suggested by SW
@@ -1379,12 +1375,12 @@
0.5.8 (February 7, 2007) :
-* fixed `#include` in [headerref boost/units/systems/si/base.hpp] (thanks to Michael Fawcett and
+* fixed `#include` in [headerref boost/units/systems/si/base.hpp] (thanks to Michael Fawcett and
Steven Watanabe)
* removed references to obsolete `base_type` in [___unit_info] (thanks to Michael Fawcett)
-* moved functions in [headerref boost/units/cmath.hpp] into `boost::units` namespace
+* moved functions in [headerref boost/units/cmath.hpp] into `boost::units` namespace
(thanks to Steven Watanabe)
-* fixed `#include` guards to be consistently named `BOOST_UNITS_XXX` (thanks to Steven
+* fixed `#include` guards to be consistently named `BOOST_UNITS_XXX` (thanks to Steven
Watanabe)
0.5.7 (February 5, 2007) :
@@ -1399,7 +1395,7 @@
`scale` and `scaled_value` classes (thanks to Kevin Lynch)
* split SI units into separate header files to minimize the "kitchen sink" include problem
(thanks to Janek Kozicki)
-* added convenience classes for declaring fundamental dimensions and composite dimensions
+* added convenience classes for declaring fundamental dimensions and composite dimensions
with integral powers (`fundamental_dimension` and `composite_dimension` respectively)
0.5.5 (January 18, 2007) :
@@ -1410,7 +1406,7 @@
* added `quantity_cast` for three cases (thanks to Andrey Semashev):
* constructing `quantity` from raw `value_type`
* casting from one `value_type` to another
- * casting from one `unit` to another (where conversion is allowed)
+ * casting from one `unit` to another (where conversion is allowed)
* added` metre` and `metres` and related constants to the SI system for the convenience of
our Commonwealth friends...
@@ -1418,7 +1414,7 @@
* completely reimplemented unit conversion to allow for arbitrary unit conversions
between systems
-* strict quantity construction is default; quantities can be constructed from bare values
+* strict quantity construction is default; quantities can be constructed from bare values
by using static member `from_value`
0.5.3 (December 12, 2006) :
@@ -1430,7 +1426,7 @@
0.5.2 (December 4, 2006) :
-* added `<cmath>` wrappers in the `std` namespace for functions that can support quantities
+* added `<cmath>` wrappers in the `std` namespace for functions that can support quantities
0.5.1 (November 3, 2006) :
@@ -1448,13 +1444,13 @@
and `quantity<complex<Y>,Unit>` as an example
* investigate using Boost.Typeof for compilers that do not support `typeof`
-0.4 (October 13, 2006) :
+0.4 (October 13, 2006) :
* `pow<R>` and `root<R>` improved for user-defined types
* added unary + and unary - operators
* added new example of interfacing with `boost::math::quaternion`
* added optional preprocessor switch to enable implicit unit conversions
- (`BOOST_UNITS_ENABLE_IMPLICIT_UNIT_CONVERSIONS`)
+ (`BOOST_UNITS_ENABLE_IMPLICIT_UNIT_CONVERSIONS`)
0.3 (September 6, 2006) :
Modified: branches/units/autoprefix/libs/units/example/complex.cpp
==============================================================================
--- branches/units/autoprefix/libs/units/example/complex.cpp (original)
+++ branches/units/autoprefix/libs/units/example/complex.cpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -8,9 +8,9 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-/**
+/**
\file
-
+
\brief complex.cpp
\details
@@ -65,29 +65,29 @@
namespace units {
-/// replacement complex class
+/// replacement complex class
template<class T>
class complex
{
public:
typedef complex<T> this_type;
-
+
complex(const T& r = 0,const T& i = 0) : r_(r),i_(i) { }
complex(const this_type& source) : r_(source.r_),i_(source.i_) { }
-
+
this_type& operator=(const this_type& source)
{
if (this == &source) return *this;
-
+
r_ = source.r_;
i_ = source.i_;
-
+
return *this;
}
-
+
T& real() { return r_; }
T& imag() { return i_; }
-
+
const T& real() const { return r_; }
const T& imag() const { return i_; }
@@ -96,53 +96,53 @@
r_ += val;
return *this;
}
-
+
this_type& operator-=(const T& val)
{
r_ -= val;
return *this;
}
-
+
this_type& operator*=(const T& val)
{
r_ *= val;
i_ *= val;
return *this;
}
-
+
this_type& operator/=(const T& val)
{
r_ /= val;
i_ /= val;
return *this;
}
-
+
this_type& operator+=(const this_type& source)
{
r_ += source.r_;
i_ += source.i_;
return *this;
}
-
+
this_type& operator-=(const this_type& source)
{
r_ -= source.r_;
i_ -= source.i_;
return *this;
}
-
+
this_type& operator*=(const this_type& source)
{
*this = *this * source;
return *this;
}
-
+
this_type& operator/=(const this_type& source)
{
*this = *this / source;
return *this;
}
-
+
private:
T r_,i_;
};
@@ -168,7 +168,7 @@
operator+(const complex<X>& x)
{
typedef typename unary_plus_typeof_helper<X>::type type;
-
+
return complex<type>(x.real(),x.imag());
}
@@ -177,7 +177,7 @@
operator-(const complex<X>& x)
{
typedef typename unary_minus_typeof_helper<X>::type type;
-
+
return complex<type>(-x.real(),-x.imag());
}
@@ -186,7 +186,7 @@
operator+(const complex<X>& x,const complex<Y>& y)
{
typedef typename boost::units::add_typeof_helper<X,Y>::type type;
-
+
return complex<type>(x.real()+y.real(),x.imag()+y.imag());
}
@@ -195,7 +195,7 @@
operator-(const complex<X>& x,const complex<Y>& y)
{
typedef typename boost::units::subtract_typeof_helper<X,Y>::type type;
-
+
return complex<type>(x.real()-y.real(),x.imag()-y.imag());
}
@@ -204,23 +204,23 @@
operator*(const complex<X>& x,const complex<Y>& y)
{
typedef typename boost::units::multiply_typeof_helper<X,Y>::type type;
-
+
return complex<type>(x.real()*y.real() - x.imag()*y.imag(),
x.real()*y.imag() + x.imag()*y.real());
// fully correct implementation has more complex return type
//
// typedef typename boost::units::multiply_typeof_helper<X,Y>::type xy_type;
-//
+//
// typedef typename boost::units::add_typeof_helper<
// xy_type,xy_type>::type xy_plus_xy_type;
// typedef typename
// boost::units::subtract_typeof_helper<xy_type,xy_type>::type
// xy_minus_xy_type;
-//
+//
// BOOST_STATIC_ASSERT((boost::is_same<xy_plus_xy_type,
// xy_minus_xy_type>::value == true));
-//
+//
// return complex<xy_plus_xy_type>(x.real()*y.real()-x.imag()*y.imag(),
// x.real()*y.imag()+x.imag()*y.real());
}
@@ -236,7 +236,7 @@
(y.real()*y.real()+y.imag()*y.imag()),
(x.imag()*y.real()-x.real()*y.imag())/
(y.real()*y.real()+y.imag()*y.imag()));
-
+
// fully correct implementation has more complex return type
//
// typedef typename boost::units::multiply_typeof_helper<X,Y>::type xy_type;
@@ -263,13 +263,13 @@
}
template<class Y>
-complex<Y>
+complex<Y>
pow(const complex<Y>& x,const Y& y)
{
std::complex<Y> tmp(x.real(),x.imag());
-
+
tmp = std::pow(tmp,y);
-
+
return complex<Y>(tmp.real(),tmp.imag());
}
@@ -282,80 +282,80 @@
}
/// specialize power typeof helper for complex<Y>
-template<class Y,long N,long D>
-struct power_typeof_helper<complex<Y>,static_rational<N,D> >
-{
+template<class Y,long N,long D>
+struct power_typeof_helper<complex<Y>,static_rational<N,D> >
+{
typedef complex<
typename power_typeof_helper<Y,static_rational<N,D> >::type
- > type;
-
- static type value(const complex<Y>& x)
- {
+ > type;
+
+ static type value(const complex<Y>& x)
+ {
const static_rational<N,D> rat;
const Y m = Y(rat.numerator())/Y(rat.denominator());
-
+
return boost::units::pow(x,m);
}
};
/// specialize root typeof helper for complex<Y>
-template<class Y,long N,long D>
-struct root_typeof_helper<complex<Y>,static_rational<N,D> >
-{
+template<class Y,long N,long D>
+struct root_typeof_helper<complex<Y>,static_rational<N,D> >
+{
typedef complex<
typename root_typeof_helper<Y,static_rational<N,D> >::type
- > type;
-
- static type value(const complex<Y>& x)
- {
+ > type;
+
+ static type value(const complex<Y>& x)
+ {
const static_rational<N,D> rat;
const Y m = Y(rat.denominator())/Y(rat.numerator());
-
+
return boost::units::pow(x,m);
}
};
/// specialize power typeof helper for complex<quantity<Unit,Y> >
-template<class Y,class Unit,long N,long D>
+template<class Y,class Unit,long N,long D>
struct power_typeof_helper<complex<quantity<Unit,Y> >,static_rational<N,D> >
-{
+{
typedef typename
power_typeof_helper<Y,static_rational<N,D> >::type value_type;
typedef typename
power_typeof_helper<Unit,static_rational<N,D> >::type unit_type;
typedef quantity<unit_type,value_type> quantity_type;
- typedef complex<quantity_type> type;
-
- static type value(const complex<quantity<Unit,Y> >& x)
- {
+ typedef complex<quantity_type> type;
+
+ static type value(const complex<quantity<Unit,Y> >& x)
+ {
const complex<value_type> tmp =
pow<static_rational<N,D> >(complex<Y>(x.real().value(),
x.imag().value()));
-
+
return type(quantity_type::from_value(tmp.real()),
quantity_type::from_value(tmp.imag()));
}
};
/// specialize root typeof helper for complex<quantity<Unit,Y> >
-template<class Y,class Unit,long N,long D>
+template<class Y,class Unit,long N,long D>
struct root_typeof_helper<complex<quantity<Unit,Y> >,static_rational<N,D> >
-{
+{
typedef typename
root_typeof_helper<Y,static_rational<N,D> >::type value_type;
typedef typename
root_typeof_helper<Unit,static_rational<N,D> >::type unit_type;
typedef quantity<unit_type,value_type> quantity_type;
- typedef complex<quantity_type> type;
-
- static type value(const complex<quantity<Unit,Y> >& x)
- {
+ typedef complex<quantity_type> type;
+
+ static type value(const complex<quantity<Unit,Y> >& x)
+ {
const complex<value_type> tmp =
root<static_rational<N,D> >(complex<Y>(x.real().value(),
x.imag().value()));
-
+
return type(quantity_type::from_value(tmp.real()),
quantity_type::from_value(tmp.imag()));
}
@@ -371,14 +371,14 @@
using namespace boost::math;
using namespace boost::units;
using namespace boost::units::test;
-
+
{
//[complex_snippet_1
typedef quantity<length,complex<double> > length_dimension;
-
+
length_dimension L(complex<double>(2.0,1.0)*meters);
//]
-
+
std::cout << "+L = " << +L << std::endl
<< "-L = " << -L << std::endl
<< "L+L = " << L+L << std::endl
@@ -391,14 +391,14 @@
<< "(3/2)vL = " << root< static_rational<3,2> >(L) << std::endl
<< std::endl;
}
-
+
{
//[complex_snippet_2
typedef complex<quantity<length> > length_dimension;
-
+
length_dimension L(2.0*meters,1.0*meters);
//]
-
+
std::cout << "+L = " << +L << std::endl
<< "-L = " << -L << std::endl
<< "L+L = " << L+L << std::endl
Modified: branches/units/autoprefix/libs/units/example/composite_output.cpp
==============================================================================
--- branches/units/autoprefix/libs/units/example/composite_output.cpp (original)
+++ branches/units/autoprefix/libs/units/example/composite_output.cpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -8,9 +8,9 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-/**
+/**
\file
-
+
\brief composite_output.cpp
\details An example of textual representations of units.
@@ -80,14 +80,14 @@
}
-int main()
+int main()
{
using namespace boost::units;
using boost::units::cgs::centimeter;
using boost::units::cgs::gram;
using boost::units::cgs::second;
using boost::units::cgs::dyne;
-
+
//[composite_output_snippet_2]
std::cout << 2.0 * dyne << std::endl
<< symbol_format << 2.0 * dyne << std::endl
@@ -111,6 +111,6 @@
<< symbol_format << si::nano*gram*centimeter/second << std::endl
<< name_format << si::nano*gram*centimeter/second << std::endl;
//]
-
+
return 0;
}
Modified: branches/units/autoprefix/libs/units/example/conversion.cpp
==============================================================================
--- branches/units/autoprefix/libs/units/example/conversion.cpp (original)
+++ branches/units/autoprefix/libs/units/example/conversion.cpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -8,9 +8,9 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-/**
+/**
\file
-
+
\brief conversion.cpp
\details
@@ -65,21 +65,21 @@
quantity<si::length> L1 = quantity<si::length,int>(int(2.5)*si::meters);
quantity<si::length,int> L2(quantity<si::length,double>(2.5*si::meters));
//]
-
+
//[conversion_snippet_3
quantity<si::length,int> L3 = static_cast<quantity<si::length,int> >(L1);
//]
-
+
//[conversion_snippet_4
quantity<cgs::length> L4 = static_cast<quantity<cgs::length> >(L1);
//]
-
+
quantity<si::length,int> L5(4*si::meters),
L6(5*si::meters);
quantity<cgs::length> L7(L1);
-
+
swap(L5,L6);
-
+
std::cout << "L1 = " << L1 << std::endl
<< "L2 = " << L2 << std::endl
<< "L3 = " << L3 << std::endl
@@ -89,32 +89,32 @@
<< "L7 = " << L7 << std::endl
<< std::endl;
}
-
+
// test explicit unit system conversion
{
//[conversion_snippet_5
- quantity<si::volume> vs(1.0*pow<3>(si::meter));
+ quantity<si::volume> vs(1.0*pow<3>(si::meter));
quantity<cgs::volume> vc(vs);
quantity<si::volume> vs2(vc);
-
- quantity<si::energy> es(1.0*si::joule);
+
+ quantity<si::energy> es(1.0*si::joule);
quantity<cgs::energy> ec(es);
quantity<si::energy> es2(ec);
-
- quantity<si::velocity> v1 = 2.0*si::meters/si::second,
+
+ quantity<si::velocity> v1 = 2.0*si::meters/si::second,
v2(2.0*cgs::centimeters/cgs::second);
//]
-
+
std::cout << "volume (m^3) = " << vs << std::endl
<< "volume (cm^3) = " << vc << std::endl
<< "volume (m^3) = " << vs2 << std::endl
<< std::endl;
-
+
std::cout << "energy (joules) = " << es << std::endl
<< "energy (ergs) = " << ec << std::endl
<< "energy (joules) = " << es2 << std::endl
<< std::endl;
-
+
std::cout << "velocity (2 m/s) = " << v1 << std::endl
<< "velocity (2 cm/s) = " << v2 << std::endl
<< std::endl;
Modified: branches/units/autoprefix/libs/units/example/conversion_factor.cpp
==============================================================================
--- branches/units/autoprefix/libs/units/example/conversion_factor.cpp (original)
+++ branches/units/autoprefix/libs/units/example/conversion_factor.cpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -8,9 +8,9 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-/**
+/**
\file
-
+
\brief conversion_factor.cpp
\details An example of using conversion_factor.
@@ -49,7 +49,7 @@
using namespace boost::units;
//[conversion_factor_snippet_1
-
+
double dyne_to_newton =
conversion_factor(cgs::dyne,si::newton);
std::cout << dyne_to_newton << std::endl;
@@ -69,7 +69,7 @@
double acceleration_conversion =
conversion_factor(cgs::gal,si::meter_per_second_squared);
std::cout << acceleration_conversion << std::endl;
-
+
//]
return 0;
Modified: branches/units/autoprefix/libs/units/example/dimension.cpp
==============================================================================
--- branches/units/autoprefix/libs/units/example/dimension.cpp (original)
+++ branches/units/autoprefix/libs/units/example/dimension.cpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -1,4 +1,4 @@
-// Boost.Units - A C++ library for zero-overhead dimensional analysis and
+// Boost.Units - A C++ library for zero-overhead dimensional analysis and
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
@@ -8,9 +8,9 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-/**
+/**
\file
-
+
\brief dimension.cpp
\details
@@ -44,7 +44,7 @@
namespace mpl = boost::mpl;
int main(void)
-{
+{
using namespace boost::units;
BOOST_MPL_ASSERT((boost::is_same<
@@ -61,7 +61,7 @@
dim<mass_base_dimension, static_rational<1L, 1L> >
>::type
>));
- BOOST_MPL_ASSERT((boost::is_same<energy_dimension,
+ BOOST_MPL_ASSERT((boost::is_same<energy_dimension,
mpl::push_front<
mpl::push_front<
mpl::push_front<
@@ -69,7 +69,7 @@
dim<time_base_dimension, static_rational<-2L, 1L> > >::type,
dim<mass_base_dimension, static_rational<1L, 1L> > >::type,
dim<length_base_dimension, static_rational<2L, 1L> > >::type>));
-
+
std::cout << "length_dimension = "
<< simplify_typename(length_dimension()) << std::endl
<< "mass_dimension = "
@@ -78,7 +78,7 @@
<< simplify_typename(time_dimension()) << std::endl
<< "energy_dimension = "
<< simplify_typename(energy_dimension()) << std::endl;
-
+
//[dimension_snippet_1
typedef mpl::times<length_dimension,mass_dimension>::type LM_type;
typedef mpl::divides<length_dimension,time_dimension>::type L_T_type;
@@ -87,31 +87,31 @@
static_rational<2>
>::type V_type;
//]
-
- BOOST_MPL_ASSERT((boost::is_same<LM_type,
+
+ BOOST_MPL_ASSERT((boost::is_same<LM_type,
mpl::push_front<
mpl::push_front<
dimensionless_type,
dim<mass_base_dimension, static_rational<1L, 1L> > >::type,
dim<length_base_dimension, static_rational<1L, 1L> > >::type>));
- BOOST_MPL_ASSERT((boost::is_same<L_T_type,
+ BOOST_MPL_ASSERT((boost::is_same<L_T_type,
mpl::push_front<
mpl::push_front<
dimensionless_type,
dim<time_base_dimension, static_rational<-1L, 1L> > >::type,
dim<length_base_dimension, static_rational<1L, 1L> > >::type>));
- BOOST_MPL_ASSERT((boost::is_same<V_type,
+ BOOST_MPL_ASSERT((boost::is_same<V_type,
mpl::push_front<
mpl::push_front<
dimensionless_type,
dim<time_base_dimension, static_rational<-1L, 1L> > >::type,
dim<length_base_dimension, static_rational<1L, 1L> > >::type>));
-
+
std::cout << "LM_type = " << simplify_typename(LM_type()) << std::endl
<< "L_T_type = " << simplify_typename(L_T_type()) << std::endl
<< "V_type = " << simplify_typename(V_type()) << std::endl;
-
+
return 0;
}
Modified: branches/units/autoprefix/libs/units/example/tutorial.cpp
==============================================================================
--- branches/units/autoprefix/libs/units/example/tutorial.cpp (original)
+++ branches/units/autoprefix/libs/units/example/tutorial.cpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -2,13 +2,13 @@
// unit/quantity manipulation and conversion
//
// Copyright (C) 2003-2008 Matthias Christian Schabel
-// Copyright (C) 2010 Steven Watanabe
+// Copyright (C) 2008 Steven Watanabe
//
// Distributed under the Boost Software License, Version 1.0. (See
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-/*!
+/**
\file tutorial.cpp
\brief Basic tutorial using SI units.
Modified: branches/units/autoprefix/libs/units/test/test_output.cpp
==============================================================================
--- branches/units/autoprefix/libs/units/test/test_output.cpp (original)
+++ branches/units/autoprefix/libs/units/test/test_output.cpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -429,4 +429,4 @@
#define FORMATTERS << boost::units::symbol_format << boost::units::engineering_prefix << boost::units::binary_prefix
BOOST_UNITS_TEST_OUTPUT(2048 * byte_base_unit::unit_type(), "2 Kib");
#undef FORMATTERS
-}
\ No newline at end of file
+}
Modified: branches/units/autoprefix/libs/units/test/test_unscale.cpp
==============================================================================
--- branches/units/autoprefix/libs/units/test/test_unscale.cpp (original)
+++ branches/units/autoprefix/libs/units/test/test_unscale.cpp 2010-03-17 12:38:49 EDT (Wed, 17 Mar 2010)
@@ -8,9 +8,9 @@
// accompanying file LICENSE_1_0.txt or copy at
// http://www.boost.org/LICENSE_1_0.txt)
-/**
+/**
\file
-
+
\brief test_unscale.cpp
\details
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