[Boost-commit] svn:boost r58560 - sandbox/numeric_bindings/boost/numeric/bindings/traits

Subject: [Boost-commit] svn:boost r58560 - sandbox/numeric_bindings/boost/numeric/bindings/traits
From: thomas.klimpel_at_[hidden]
Date: 2009-12-29 09:14:33

Author: klimpel
Date: 2009-12-29 09:14:33 EST (Tue, 29 Dec 2009)
New Revision: 58560
URL: http://svn.boost.org/trac/boost/changeset/58560

Log:
Continue of regression tests update
- the atlas, mumps and umfpack regression tests should now pass again
Added:
   sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_storage.hpp   (contents, props changed)
Text files modified: 
   sandbox/numeric_bindings/boost/numeric/bindings/traits/boost_array.hpp  |     9 +++++++++                               
   sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_matrix.hpp |     1 +                                       
   sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_sparse.hpp |     1 +                                       
   sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_vector.hpp |    11 +----------                             
   4 files changed, 12 insertions(+), 10 deletions(-)

Modified: sandbox/numeric_bindings/boost/numeric/bindings/traits/boost_array.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/traits/boost_array.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/traits/boost_array.hpp	2009-12-29 09:14:33 EST (Tue, 29 Dec 2009)
@@ -21,6 +21,15 @@
 #include <boost/numeric/bindings/traits/vector_traits.hpp>
 #include <boost/array.hpp>
 
+namespace boost { namespace numeric { namespace bindings { namespace traits {
+
+   // boost::array
+  template <typename T, std::size_t N, typename V>
+  struct vector_detail_traits< boost::array< T, N>, V >:
+  public default_vector_traits< V, T > {};
+
+}}}}
+
 #else
 
 #error with your compiler boost::array<> cannot be used in bindings

Modified: sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_matrix.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_matrix.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_matrix.hpp	2009-12-29 09:14:33 EST (Tue, 29 Dec 2009)
@@ -15,6 +15,7 @@
 #define BOOST_NUMERIC_BINDINGS_TRAITS_UBLAS_MATRIX_H
 
 #include <boost/numeric/bindings/traits/traits.hpp>
+#include <boost/numeric/bindings/traits/ublas_storage.hpp>
 
 #ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS 
 

Modified: sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_sparse.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_sparse.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_sparse.hpp	2009-12-29 09:14:33 EST (Tue, 29 Dec 2009)
@@ -19,6 +19,7 @@
 #  include <boost/numeric/ublas/matrix_sparse.hpp> 
 #endif 
 #include <boost/numeric/bindings/traits/sparse_traits.hpp>
+#include <boost/numeric/bindings/traits/ublas_storage.hpp>
 #include <boost/numeric/bindings/traits/detail/ublas_ordering.hpp>
 #include <algorithm>
 

Added: sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_storage.hpp
==============================================================================
--- (empty file)
+++ sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_storage.hpp	2009-12-29 09:14:33 EST (Tue, 29 Dec 2009)
@@ -0,0 +1,32 @@
+//
+// Copyright (c) 2009 by Rutger ter Borg and Thomas Klimpel
+//
+// 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_NUMERIC_BINDINGS_TRAITS_UBLAS_STORAGE_HPP
+#define BOOST_NUMERIC_BINDINGS_TRAITS_UBLAS_STORAGE_HPP
+
+#include <boost/numeric/bindings/traits/vector_traits.hpp>
+
+#ifndef BOOST_UBLAS_HAVE_BINDINGS
+#  include <boost/numeric/ublas/storage.hpp>
+#endif
+
+namespace boost { namespace numeric { namespace bindings { namespace traits {
+
+   // ublas::bounded array
+  template <typename T, std::size_t N, typename V>
+  struct vector_detail_traits< ublas::bounded_array< T, N>, V >:
+  public default_vector_traits< V, T > {};
+
+   // ublas::unbounded array
+  template< typename T, typename Allocator, typename V >
+  struct vector_detail_traits< ublas::unbounded_array< T, Allocator >, V >:
+  public default_vector_traits< V, T > {};
+
+}}}}
+
+#endif

Modified: sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_vector.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_vector.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_vector.hpp	2009-12-29 09:14:33 EST (Tue, 29 Dec 2009)
@@ -15,6 +15,7 @@
 #define BOOST_NUMERIC_BINDINGS_TRAITS_UBLAS_VECTOR_H
 
 #include <boost/numeric/bindings/traits/vector_traits.hpp>
+#include <boost/numeric/bindings/traits/ublas_storage.hpp>
 
 #ifndef BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS
 
@@ -25,16 +26,6 @@
 
 namespace boost { namespace numeric { namespace bindings { namespace traits {
 
-   // ublas::bounded array
-  template <typename T, std::size_t N, typename V>
-  struct vector_detail_traits< ublas::bounded_array< T, N>, V >:
-  public default_vector_traits< V, T > {};
-
-   // ublas::unbounded array
-  template< typename T, typename Allocator, typename V >
-  struct vector_detail_traits< ublas::unbounded_array< T, Allocator >, V >:
-  public default_vector_traits< V, T > {};
-
   // ublas::vector<>
   template <typename T, typename ArrT, typename V>
   struct vector_detail_traits< boost::numeric::ublas::vector<T, ArrT>, V >