[Boost-commit] svn:boost r58548 - in sandbox/numeric_bindings: boost/numeric/bindings/traits libs/numeric/bindings/blas/test

Subject: [Boost-commit] svn:boost r58548 - in sandbox/numeric_bindings: boost/numeric/bindings/traits libs/numeric/bindings/blas/test
From: thomas.klimpel_at_[hidden]
Date: 2009-12-28 12:36:03

Author: klimpel
Date: 2009-12-28 12:36:02 EST (Mon, 28 Dec 2009)
New Revision: 58548
URL: http://svn.boost.org/trac/boost/changeset/58548

Log:
Continue of regression tests update
Text files modified: 
   sandbox/numeric_bindings/boost/numeric/bindings/traits/transpose.hpp     |     2 +-                                      
   sandbox/numeric_bindings/boost/numeric/bindings/traits/ublas_vector.hpp  |     5 +++++                                   
   sandbox/numeric_bindings/libs/numeric/bindings/blas/test/ublas_slice.cpp |    16 +++++++++++++---                        
   sandbox/numeric_bindings/libs/numeric/bindings/blas/test/vector2.cpp     |     3 ++-                                     
   4 files changed, 21 insertions(+), 5 deletions(-)

Modified: sandbox/numeric_bindings/boost/numeric/bindings/traits/transpose.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/traits/transpose.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/traits/transpose.hpp	2009-12-28 12:36:02 EST (Mon, 28 Dec 2009)
@@ -10,7 +10,7 @@
 #define BOOST_BINDINGS_TRANSPOSE_HPP
 
 #include <boost/numeric/bindings/traits/matrix_traits.hpp>
-#include <boost/numeric/bindings/traits/is_decorated.hpp>
+//#include <boost/numeric/bindings/traits/is_decorated.hpp>
 
 namespace boost { namespace numeric { namespace bindings { namespace traits {
 

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-28 12:36:02 EST (Mon, 28 Dec 2009)
@@ -25,6 +25,11 @@
 
 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 >:

Modified: sandbox/numeric_bindings/libs/numeric/bindings/blas/test/ublas_slice.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/blas/test/ublas_slice.cpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/blas/test/ublas_slice.cpp	2009-12-28 12:36:02 EST (Mon, 28 Dec 2009)
@@ -11,7 +11,9 @@
 #include <boost/numeric/ublas/matrix.hpp>
 #include <boost/numeric/ublas/matrix_proxy.hpp>
 #include <boost/numeric/ublas/vector.hpp>
-#include <boost/numeric/bindings/blas/blas.hpp>
+#include <boost/numeric/bindings/blas/level3/gemm.hpp>
+#include <boost/numeric/bindings/blas/level1/axpy.hpp>
+#include <boost/numeric/bindings/traits/transpose.hpp>
 #include <boost/numeric/bindings/traits/ublas_matrix.hpp>
 #include <boost/numeric/bindings/traits/ublas_vector.hpp>
 #include <boost/numeric/bindings/traits/ublas_vector2.hpp>
@@ -88,7 +90,11 @@
                 std::cout << "B=" << b << std::endl;
                 
                 boost::numeric::ublas::bounded_matrix<double, 4, 4, boost::numeric::ublas::column_major> c;
-		boost::numeric::bindings::blas::gemm(a, b, c);
+		//boost::numeric::bindings::blas::gemm(a, b, c);
+		boost::numeric::bindings::blas::gemm(
+			boost::numeric::bindings::traits::NO_TRANSPOSE,
+			boost::numeric::bindings::traits::NO_TRANSPOSE,
+			1.0, a, b, 0.0, c);
                 std::cout << "C=" << c << std::endl;
         }
         
@@ -119,7 +125,11 @@
                 boost::numeric::ublas::matrix_range<
                         boost::numeric::ublas::bounded_matrix<double, 4, 4, boost::numeric::ublas::column_major>
 		> c2 = boost::numeric::ublas::subrange(c, 0, 3, 0, 3);
-		boost::numeric::bindings::blas::gemm(a2, b2, c2);
+		//boost::numeric::bindings::blas::gemm(a2, b2, c2);
+		boost::numeric::bindings::blas::gemm(
+			boost::numeric::bindings::traits::NO_TRANSPOSE,
+			boost::numeric::bindings::traits::NO_TRANSPOSE,
+			1.0, a2, b2, 0.0, c2);
                 std::cout << "C2=" << c2 << std::endl;
                 std::cout << "C=" << c << std::endl;
         }

Modified: sandbox/numeric_bindings/libs/numeric/bindings/blas/test/vector2.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/blas/test/vector2.cpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/blas/test/vector2.cpp	2009-12-28 12:36:02 EST (Mon, 28 Dec 2009)
@@ -11,7 +11,8 @@
 #include <boost/numeric/ublas/matrix_proxy.hpp>
 #include <boost/numeric/ublas/vector.hpp>
 #include <boost/numeric/ublas/vector_proxy.hpp>
-#include <boost/numeric/bindings/blas/blas.hpp>
+#include <boost/numeric/bindings/blas/level3/gemm.hpp>
+#include <boost/numeric/bindings/traits/transpose.hpp>
 #include <boost/numeric/bindings/traits/c_array.hpp>
 #include <boost/numeric/bindings/traits/c_array2.hpp>
 #include <boost/numeric/bindings/traits/dense_traits.hpp>