|
|
Boost-Commit : |
From: boost_at_[hidden]
Date: 2007-08-14 20:12:26
Author: matthiasschabel
Date: 2007-08-14 20:12:25 EDT (Tue, 14 Aug 2007)
New Revision: 38668
URL: http://svn.boost.org/trac/boost/changeset/38668
Log:
not needed in library headers anymore
Removed:
sandbox/units/boost/units/measurement.hpp
Deleted: sandbox/units/boost/units/measurement.hpp
==============================================================================
--- sandbox/units/boost/units/measurement.hpp 2007-08-14 20:12:25 EDT (Tue, 14 Aug 2007)
+++ (empty file)
@@ -1,334 +0,0 @@
-// mcs::units - A C++ library for zero-overhead dimensional analysis and
-// unit/quantity manipulation and conversion
-//
-// Copyright (C) 2003-2007 Matthias Christian Schabel
-// Copyright (C) 2007 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_MEASUREMENT_HPP
-#define BOOST_UNITS_MEASUREMENT_HPP
-
-#include <cmath>
-#include <cstdlib>
-#include <iomanip>
-#include <iostream>
-
-#include <boost/units/static_rational.hpp>
-
-namespace boost {
-
-namespace units {
-
-namespace sqr_namespace {
-
-template<class Y>
-Y sqr(Y val)
-{ return val*val; }
-
-} // namespace
-
-using sqr_namespace::sqr;
-
-template<class Y>
-class measurement
-{
- public:
- typedef measurement<Y> this_type;
- typedef Y value_type;
-
- measurement(const value_type& val = value_type(),
- const value_type& err = value_type()) :
- value_(val),
- uncertainty_(std::abs(err))
- { }
-
- measurement(const this_type& source) :
- value_(source.value_),
- uncertainty_(source.uncertainty_)
- { }
-
- //~measurement() { }
-
- this_type& operator=(const this_type& source)
- {
- if (this == &source) return *this;
-
- value_ = source.value_;
- uncertainty_ = source.uncertainty_;
-
- return *this;
- }
-
- operator value_type() const { return value_; }
-
- value_type value() const { return value_; }
- value_type uncertainty() const { return uncertainty_; }
-
- this_type& operator+=(const value_type& val)
- {
- value_ += val;
- return *this;
- }
-
- this_type& operator-=(const value_type& val)
- {
- value_ -= val;
- return *this;
- }
-
- this_type& operator*=(const value_type& val)
- {
- value_ *= val;
- uncertainty_ *= val;
- return *this;
- }
-
- this_type& operator/=(const value_type& val)
- {
- value_ /= val;
- uncertainty_ /= val;
- return *this;
- }
-
- this_type& operator+=(const this_type& /*source*/);
- this_type& operator-=(const this_type& /*source*/);
- this_type& operator*=(const this_type& /*source*/);
- this_type& operator/=(const this_type& /*source*/);
-
- private:
- value_type value_,
- uncertainty_;
-};
-
-}
-
-}
-
-#if BOOST_UNITS_HAS_BOOST_TYPEOF
-
-BOOST_TYPEOF_REGISTER_TEMPLATE(boost::units::measurement, 1)
-
-#endif
-
-namespace boost {
-
-namespace units {
-
-template<class Y>
-inline
-measurement<Y>&
-measurement<Y>::operator+=(const this_type& source)
-{
- uncertainty_ = std::sqrt(sqr(uncertainty_)+sqr(source.uncertainty_));
- value_ += source.value_;
-
- return *this;
-}
-
-template<class Y>
-inline
-measurement<Y>&
-measurement<Y>::operator-=(const this_type& source)
-{
- uncertainty_ = std::sqrt(sqr(uncertainty_)+sqr(source.uncertainty_));
- value_ -= source.value_;
-
- return *this;
-}
-
-template<class Y>
-inline
-measurement<Y>&
-measurement<Y>::operator*=(const this_type& source)
-{
- uncertainty_ = (value_*source.value_)*
- std::sqrt(sqr(uncertainty_/value_)+
- sqr(source.uncertainty_/source.value_));
- value_ *= source.value_;
-
- return *this;
-}
-
-template<class Y>
-inline
-measurement<Y>&
-measurement<Y>::operator/=(const this_type& source)
-{
- uncertainty_ = (value_/source.value_)*
- std::sqrt(sqr(uncertainty_/value_)+
- sqr(source.uncertainty_/source.value_));
- value_ /= source.value_;
-
- return *this;
-}
-
-// value_type op measurement
-template<class Y>
-inline
-measurement<Y>
-operator+(Y lhs,const measurement<Y>& rhs)
-{
- return (measurement<Y>(lhs,Y(0))+=rhs);
-}
-
-template<class Y>
-inline
-measurement<Y>
-operator-(Y lhs,const measurement<Y>& rhs)
-{
- return (measurement<Y>(lhs,Y(0))-=rhs);
-}
-
-template<class Y>
-inline
-measurement<Y>
-operator*(Y lhs,const measurement<Y>& rhs)
-{
- return (measurement<Y>(lhs,Y(0))*=rhs);
-}
-
-template<class Y>
-inline
-measurement<Y>
-operator/(Y lhs,const measurement<Y>& rhs)
-{
- return (measurement<Y>(lhs,Y(0))/=rhs);
-}
-
-// measurement op value_type
-template<class Y>
-inline
-measurement<Y>
-operator+(const measurement<Y>& lhs,Y rhs)
-{
- return (measurement<Y>(lhs)+=measurement<Y>(rhs,Y(0)));
-}
-
-template<class Y>
-inline
-measurement<Y>
-operator-(const measurement<Y>& lhs,Y rhs)
-{
- return (measurement<Y>(lhs)-=measurement<Y>(rhs,Y(0)));
-}
-
-template<class Y>
-inline
-measurement<Y>
-operator*(const measurement<Y>& lhs,Y rhs)
-{
- return (measurement<Y>(lhs)*=measurement<Y>(rhs,Y(0)));
-}
-
-template<class Y>
-inline
-measurement<Y>
-operator/(const measurement<Y>& lhs,Y rhs)
-{
- return (measurement<Y>(lhs)/=measurement<Y>(rhs,Y(0)));
-}
-
-// measurement op measurement
-template<class Y>
-inline
-measurement<Y>
-operator+(const measurement<Y>& lhs,const measurement<Y>& rhs)
-{
- return (measurement<Y>(lhs)+=rhs);
-}
-
-template<class Y>
-inline
-measurement<Y>
-operator-(const measurement<Y>& lhs,const measurement<Y>& rhs)
-{
- return (measurement<Y>(lhs)-=rhs);
-}
-
-template<class Y>
-inline
-measurement<Y>
-operator*(const measurement<Y>& lhs,const measurement<Y>& rhs)
-{
- return (measurement<Y>(lhs)*=rhs);
-}
-
-template<class Y>
-inline
-measurement<Y>
-operator/(const measurement<Y>& lhs,const measurement<Y>& rhs)
-{
- return (measurement<Y>(lhs)/=rhs);
-}
-
-/// specialize power typeof helper
-template<class Y,long N,long D>
-struct power_dimof_helper<measurement<Y>,static_rational<N,D> >
-{
- typedef measurement<typename power_dimof_helper<Y,static_rational<N,D> >::type> type;
-
- static type value(const measurement<Y>& x)
- {
- const static_rational<N,D> rat;
-
- const Y m = Y(rat.numerator())/Y(rat.denominator()),
- newval = std::pow(x.value(),m),
- err = newval*std::sqrt(std::pow(m*x.uncertainty()/x.value(),2));
-
- return type(newval,err);
- }
-};
-
-/// specialize root typeof helper
-template<class Y,long N,long D>
-struct root_typeof_helper<measurement<Y>,static_rational<N,D> >
-{
- typedef measurement<typename root_typeof_helper<Y,static_rational<N,D> >::type> type;
-
- static type value(const measurement<Y>& x)
- {
- const static_rational<N,D> rat;
-
- const Y m = Y(rat.denominator())/Y(rat.numerator()),
- newval = std::pow(x.value(),m),
- err = newval*std::sqrt(std::pow(m*x.uncertainty()/x.value(),2));
-
- return type(newval,err);
- }
-};
-
-// stream output
-template<class Y>
-inline
-std::ostream& operator<<(std::ostream& os,const measurement<Y>& val)
-{
- os << val.value();
-
- if (val.uncertainty() > Y(0))
- os << "(+/-" << val.uncertainty() << ")";
-
-// os << std::setprecision(13)
-// << std::setw(21)
-// << std::scientific
-// << val.value();
-//
-// if (val.uncertainty() > Y(0))
-// os << " (rel. unc. = "
-// << std::setprecision(1)
-// << std::setw(7)
-// << std::scientific
-// << std::abs(val.uncertainty()/val.value()) << ")";
-// else
-// os << " (exact)";
-
- return os;
-}
-
-} // namespace units
-
-} // namespace boost
-
-#endif // BOOST_UNITS_MEASUREMENT_HPP
\ No newline at end of file
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