Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r52325 - in sandbox/numeric_adaptor: . boost boost/numeric_adaptor libs libs/numeric_adaptor libs/numeric_adaptor/test
From: bruno.lalande_at_[hidden]
Date: 2009-04-11 08:37:03

Author: bruno.lalande
Date: 2009-04-11 08:37:02 EDT (Sat, 11 Apr 2009)
New Revision: 52325
URL: http://svn.boost.org/trac/boost/changeset/52325

Log:
Restructured into more standard directories
Added:
   sandbox/numeric_adaptor/boost/
   sandbox/numeric_adaptor/boost/numeric_adaptor/
   sandbox/numeric_adaptor/boost/numeric_adaptor/gmp_policy.hpp (props changed)
      - copied unchanged from r52324, /sandbox/numeric_adaptor/gmp_policy.hpp
   sandbox/numeric_adaptor/boost/numeric_adaptor/ieee_policy.hpp (props changed)
      - copied unchanged from r52324, /sandbox/numeric_adaptor/ieee_policy.hpp
   sandbox/numeric_adaptor/boost/numeric_adaptor/numeric_adaptor.hpp (props changed)
      - copied unchanged from r52324, /sandbox/numeric_adaptor/numeric_adaptor.hpp
   sandbox/numeric_adaptor/libs/
   sandbox/numeric_adaptor/libs/numeric_adaptor/
   sandbox/numeric_adaptor/libs/numeric_adaptor/sample.cpp (contents, props changed)
      - copied, changed from r52324, /sandbox/numeric_adaptor/sample.cpp
   sandbox/numeric_adaptor/libs/numeric_adaptor/test/
Removed:
   sandbox/numeric_adaptor/gmp_policy.hpp
   sandbox/numeric_adaptor/ieee_policy.hpp
   sandbox/numeric_adaptor/numeric_adaptor.hpp
   sandbox/numeric_adaptor/sample.cpp
Text files modified:
   sandbox/numeric_adaptor/libs/numeric_adaptor/sample.cpp | 6 +++---
   1 files changed, 3 insertions(+), 3 deletions(-)

Deleted: sandbox/numeric_adaptor/gmp_policy.hpp
==============================================================================
--- sandbox/numeric_adaptor/gmp_policy.hpp 2009-04-11 08:37:02 EDT (Sat, 11 Apr 2009)
+++ (empty file)
@@ -1,80 +0,0 @@
-// Numeric Adaptor Library
-//
-// Copyright Barend Gehrels 2009, Geodan Holding B.V. Amsterdam, the Netherlands.
-// Copyright Bruno Lalande 2009
-// Use, modification and distribution is subject to 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 NUMERIC_ADAPTOR_GMP_POLICY_HPP_
-#define NUMERIC_ADAPTOR_GMP_POLICY_HPP_
-
-
-#include "gmp.h"
-
-
-struct gmp_policy
-{
- typedef mpf_t type;
-
- static inline void init(type& value)
- {
- mpf_init(value);
- }
-
- static inline void destruct(type& value)
- {
- mpf_clear(value);
- }
-
- template <typename CT>
- static inline void set(type& value, const CT& v)
- {
- mpf_set_d(value, v);
- }
-
- static inline void copy(const type& source, type& dest)
- {
- mpf_set(dest, source);
- }
-
- static inline void add(type& r, const type& a, const type& b)
- {
- mpf_add(r, a, b);
- }
-
- static inline void subtract(type& r, const type& a, const type& b)
- {
- mpf_sub(r, a, b);
- }
-
- static inline void multiply(type& r, const type& a, const type& b)
- {
- mpf_mul(r, a, b);
- }
-
- static inline void divide(type& r, const type& a, const type& b)
- {
- mpf_div(r, a, b);
- }
-
- static inline void sqrt(type& r, const type& a)
- {
- mpf_sqrt(r, a);
- }
-
- template <typename CT>
- static inline CT big_numeric_cast(const type& b)
- {
- return mpf_get_d(b);
- }
-
- static inline int compare(const type& a, const type& b)
- {
- return mpf_cmp(a, b);
- }
-};
-
-
-#endif

Deleted: sandbox/numeric_adaptor/ieee_policy.hpp
==============================================================================
--- sandbox/numeric_adaptor/ieee_policy.hpp 2009-04-11 08:37:02 EDT (Sat, 11 Apr 2009)
+++ (empty file)
@@ -1,51 +0,0 @@
-// Numeric Adaptor Library
-
-// Copyright Barend Gehrels 2009, Geodan Holding B.V. Amsterdam, the Netherlands.
-// Copyright Bruno Lalande 2009
-// Use, modification and distribution is subject to 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 NUMERIC_ADAPTOR_IEEE_POLICY_HPP_
-#define NUMERIC_ADAPTOR_IEEE_POLICY_HPP_
-
-
-#include <cmath>
-#include <boost/numeric/conversion/cast.hpp>
-
-
-template <typename T>
-struct ieee_policy
-{
- typedef T type;
-
- static inline void init(type& value) {}
- static inline void destruct(type& value) {}
-
- template <typename CT>
- static inline void set (type& value, const CT& v) { value = boost::numeric_cast<T>(v); }
-
- static inline void copy(const type& source, type& dest) { dest = source; }
-
- static inline void add(type& r, const type& a, const type& b) { r = a + b; }
- static inline void subtract(type& r, const type& a, const type& b) { r = a - b; }
- static inline void multiply(type& r, const type& a, const type& b) { r = a * b; }
- static inline void divide(type& r, const type& a, const type& b) { r = a / b; }
-
- static inline void sqrt(type& r, const type& a) { r = ::sqrt(a); }
-
- template <typename CT>
- static inline CT big_numeric_cast(const type& v)
- {
- return boost::numeric_cast<CT>(v);
- }
-
- static inline int compare(const type& a, const type& b)
- {
- return a < b ? -1 : a > b ? 1 : 0;
- }
-};
-
-
-#endif

Copied: sandbox/numeric_adaptor/libs/numeric_adaptor/sample.cpp (from r52324, /sandbox/numeric_adaptor/sample.cpp)
==============================================================================
--- /sandbox/numeric_adaptor/sample.cpp (original)
+++ sandbox/numeric_adaptor/libs/numeric_adaptor/sample.cpp 2009-04-11 08:37:02 EDT (Sat, 11 Apr 2009)
@@ -10,9 +10,9 @@
#include <iostream>
#include <iomanip>
#include <string>
-#include "numeric_adaptor.hpp"
-#include "ieee_policy.hpp"
-#include "gmp_policy.hpp"
+#include <boost/numeric_adaptor/numeric_adaptor.hpp>
+#include <boost/numeric_adaptor/ieee_policy.hpp>
+#include <boost/numeric_adaptor/gmp_policy.hpp>

template <typename T, typename NUM>

Deleted: sandbox/numeric_adaptor/numeric_adaptor.hpp
==============================================================================
--- sandbox/numeric_adaptor/numeric_adaptor.hpp 2009-04-11 08:37:02 EDT (Sat, 11 Apr 2009)
+++ (empty file)
@@ -1,145 +0,0 @@
-// Numeric Adaptor Library
-//
-// Copyright Barend Gehrels 2009, Geodan Holding B.V. Amsterdam, the Netherlands.
-// Copyright Bruno Lalande 2009
-// Use, modification and distribution is subject to 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 NUMERIC_ADAPTOR_NUMERIC_ADAPTOR_HPP_
-#define NUMERIC_ADAPTOR_NUMERIC_ADAPTOR_HPP_
-
-
-template <typename POLICY>
-struct numeric_adaptor
-{
- inline numeric_adaptor()
- {
- POLICY::init(value);
- }
-
- // Copy constructor
- inline numeric_adaptor(const numeric_adaptor<POLICY>& v)
- {
- POLICY::init(value);
- POLICY::copy(v.value, value);
- }
-
- // Constructor with a normal IEEE type
- template <typename T>
- inline numeric_adaptor(const T& v)
- {
- POLICY::init(value);
- POLICY::template set<T>(value, v);
- }
-
- virtual ~numeric_adaptor()
- {
- POLICY::destruct(value);
- }
-
- // Assignment from other value
- inline numeric_adaptor<POLICY> operator=(const numeric_adaptor<POLICY>& v)
- {
- POLICY::copy(v.value, this->value);
- return *this;
- }
-
- // Assignment from normal IEEE type
- template <typename T>
- inline numeric_adaptor<POLICY> operator=(const T& v)
- {
- POLICY::template set<T>(this->value, v);
- return *this;
- }
-
- // Cast to normal IEEE type
- template <typename T>
- inline operator T() const
- {
- return POLICY::template big_numeric_cast<T>(value);
- }
-
-
- // Comparisons
- inline bool operator<(const numeric_adaptor<POLICY>& other) const
- {
- return POLICY::compare(value, other.value) < 0;
- }
-
- inline bool operator>(const numeric_adaptor<POLICY>& other) const
- {
- return POLICY::compare(value, other.value) > 0;
- }
-
- inline bool operator==(const numeric_adaptor<POLICY>& other) const
- {
- return POLICY::compare(value, other.value) == 0;
- }
-
- // Operators
- friend inline numeric_adaptor<POLICY> operator+(
- const numeric_adaptor<POLICY>& a,
- const numeric_adaptor<POLICY>& b)
- {
- typename POLICY::type r;
- POLICY::init(r);
- POLICY::add(r, a.value, b.value);
- return numeric_adaptor<POLICY>(r, true);
- }
-
- friend inline numeric_adaptor<POLICY> operator*(
- const numeric_adaptor<POLICY>& a,
- const numeric_adaptor<POLICY>& b)
- {
- typename POLICY::type r;
- POLICY::init(r);
- POLICY::multiply(r, a.value, b.value);
- return numeric_adaptor<POLICY>(r, true);
- }
-
- friend inline numeric_adaptor<POLICY> operator-(
- const numeric_adaptor<POLICY>& a,
- const numeric_adaptor<POLICY>& b)
- {
- typename POLICY::type r;
- POLICY::init(r);
- POLICY::subtract(r, a.value, b.value);
- return numeric_adaptor<POLICY>(r, true);
- }
-
- friend inline numeric_adaptor<POLICY> operator/(
- const numeric_adaptor<POLICY>& a,
- const numeric_adaptor<POLICY>& b)
- {
- typename POLICY::type r;
- POLICY::init(r);
- POLICY::divide(r, a.value, b.value);
- return numeric_adaptor<POLICY>(r, true);
- }
-
- // Functions
- static inline numeric_adaptor<POLICY> sqrt(const numeric_adaptor<POLICY>& v)
- {
- typename POLICY::type r;
- POLICY::init(r);
- POLICY::sqrt(r, v.value);
- return numeric_adaptor<POLICY>(r, true);
- }
-
- private :
- typename POLICY::type value;
-
- // Constructor with a type. Bool (or any other signature changing parameter)
- // is necessary for cases where type == CT
- inline numeric_adaptor<POLICY>(const typename POLICY::type& v, bool)
- {
- POLICY::init(value);
- POLICY::copy(v, value);
- }
-
-};
-
-
-#endif

Deleted: sandbox/numeric_adaptor/sample.cpp
==============================================================================
--- sandbox/numeric_adaptor/sample.cpp 2009-04-11 08:37:02 EDT (Sat, 11 Apr 2009)
+++ (empty file)
@@ -1,81 +0,0 @@
-// Numeric Adaptor Library
-//
-// Copyright Barend Gehrels 2009, Geodan Holding B.V. Amsterdam, the Netherlands.
-// Copyright Bruno Lalande 2009
-// Use, modification and distribution is subject to 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)
-
-
-#include <iostream>
-#include <iomanip>
-#include <string>
-#include "numeric_adaptor.hpp"
-#include "ieee_policy.hpp"
-#include "gmp_policy.hpp"
-
-
-template <typename T, typename NUM>
-void sample(const std::string& header, T c1, T c2, T c4, T ta, T tb, T tc)
-{
- std::cout << std::endl << "---" << header << std::endl;
- NUM v1 = c1;
- NUM v2 = c2;
- NUM v3 = v1 + v2;
- std::cout << T(v3) << std::endl;
-
- NUM v4 = c4;
- NUM v5 = (v1 + v2) * v4;
- std::cout << T(v5) << std::endl;
- v5 = v1 + v2 * v4;
- std::cout << T(v5) << std::endl;
-
- NUM v6 = NUM::sqrt(v3);
- std::cout << T(v6) << std::endl;
-
- v6 = 4;
- std::cout << T(v6) << std::endl;
-
- v6 = v2;
- std::cout << T(v6) << std::endl;
- std::cout << std::endl;
-
- if (v1 > v2)
- {
- std::cout << "v1 > v2" << std::endl;
- }
- if (v1 < v2)
- {
- std::cout << "v1 < v2" << std::endl;
- }
- if (v1 == v2)
- {
- std::cout << "v1 == v2" << std::endl;
- }
-
- // Test Heron formule
- {
- NUM a = ta;
- NUM b = tb;
- NUM c = tc;
- NUM s((a + b + c) / NUM(2.0));
- NUM area = NUM::sqrt(s * (s - a) * (s - b) * (s - c));
- std::cout << "area: " << T(area) << std::endl;
- }
-
-}
-
-
-int main()
-{
- std::cout << std::setprecision(12);
- double a = 31622.77662;
- double b = 0.000023;
- double c = 31622.77661;
-
- sample<float, numeric_adaptor<ieee_policy<float> > >("use float, calculate with float", 2.0, 3.0, 5.0, a, b, c);
- sample<float, numeric_adaptor<ieee_policy<double> > >("use float, calculate with double", 2.0, 3.0, 5.0, a, b, c);
- sample<double, numeric_adaptor<ieee_policy<long double> > >("use double, calculate with long double", 2.0, 3.0, 5.0, a, b, c);
- sample<double, numeric_adaptor<gmp_policy> >("use double, calculate with gmp", 2.0, 3.0, 5.0, a, b, c);
- return 0;
-}

Date view	Thread view	Subject view	Author view

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