[Boost-commit] svn:boost r58667 - in sandbox/numeric_bindings: boost/numeric/bindings libs/numeric/bindings/tools libs/numeric/bindings/tools/templates

Subject: [Boost-commit] svn:boost r58667 - in sandbox/numeric_bindings: boost/numeric/bindings libs/numeric/bindings/tools libs/numeric/bindings/tools/templates
From: rutger_at_[hidden]
Date: 2010-01-04 04:36:54

Author: rutger
Date: 2010-01-04 04:36:53 EST (Mon, 04 Jan 2010)
New Revision: 58667
URL: http://svn.boost.org/trac/boost/changeset/58667

Log:
bugfixes to size, lapack generator

Text files modified: 
   sandbox/numeric_bindings/boost/numeric/bindings/size.hpp                  |     4 ++--                                    
   sandbox/numeric_bindings/boost/numeric/bindings/trans.hpp                 |     2 ++                                      
   sandbox/numeric_bindings/boost/numeric/bindings/ublas.hpp                 |     5 +++--                                   
   sandbox/numeric_bindings/libs/numeric/bindings/tools/lapack_generator.py  |     4 ++--                                    
   sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp |     4 ++--                                    
   5 files changed, 11 insertions(+), 8 deletions(-)

Modified: sandbox/numeric_bindings/boost/numeric/bindings/size.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/size.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/size.hpp	2010-01-04 04:36:53 EST (Mon, 04 Jan 2010)
@@ -141,13 +141,13 @@
 template< typename T, typename Tag >
 inline typename result_of::size_row_op< const T, Tag >::type
 size_row_op( const T& t, Tag ) {
-    return result_of::size_row_op< const T, Tag >::type( t );
+    return size( t, typename index_trans< tag::index<1>, Tag >::type() );
 }
 
 template< typename T, typename Tag >
 inline typename result_of::size_row_op< const T, Tag >::type
 size_column_op( const T& t, Tag ) {
-    return result_of::size_column_op< const T, Tag >::type( t );
+    return size( t, typename index_trans< tag::index<2>, Tag >::type() );
 }
 
 } // namespace bindings

Modified: sandbox/numeric_bindings/boost/numeric/bindings/trans.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/trans.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/trans.hpp	2010-01-04 04:36:53 EST (Mon, 04 Jan 2010)
@@ -14,10 +14,12 @@
 #include <boost/mpl/max.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/numeric/bindings/begin.hpp>
+#include <boost/numeric/bindings/end.hpp>
 #include <boost/numeric/bindings/rank.hpp>
 #include <boost/numeric/bindings/size.hpp>
 #include <boost/numeric/bindings/tag.hpp>
 #include <boost/numeric/bindings/value.hpp>
+#include <boost/ref.hpp>
 
 namespace boost {
 namespace numeric {

Modified: sandbox/numeric_bindings/boost/numeric/bindings/ublas.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/ublas.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/ublas.hpp	2010-01-04 04:36:53 EST (Mon, 04 Jan 2010)
@@ -9,11 +9,12 @@
 #ifndef BOOST_NUMERIC_BINDINGS_UBLAS_HPP
 #define BOOST_NUMERIC_BINDINGS_UBLAS_HPP
 
-#include <boost/numeric/bindings/ublas/compressed_vector.hpp>
-#include <boost/numeric/bindings/ublas/compressed_matrix.hpp>
+#include <boost/numeric/bindings/ublas/hermitian.hpp>
 #include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/ublas/matrix_sparse.hpp>
 #include <boost/numeric/bindings/ublas/symmetric.hpp>
 #include <boost/numeric/bindings/ublas/triangular.hpp>
 #include <boost/numeric/bindings/ublas/vector.hpp>
+#include <boost/numeric/bindings/ublas/vector_sparse.hpp>
 
 #endif

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/lapack_generator.py
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/lapack_generator.py	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/lapack_generator.py	2010-01-04 04:36:53 EST (Mon, 04 Jan 2010)
@@ -420,8 +420,8 @@
     if len( level1_map ) > 1:
       level1 = template_map[ 'level1_pre_header' ]
       includes += [ '#include <boost/utility/enable_if.hpp>' ]
-      includes += [ '#include <boost/numeric/bindings/traits/is_real.hpp>' ]
-      includes += [ '#include <boost/numeric/bindings/traits/is_complex.hpp>' ]
+      includes += [ '#include <boost/numeric/bindings/is_real.hpp>' ]
+      includes += [ '#include <boost/numeric/bindings/is_complex.hpp>' ]
 
     for value_type in level1_map.keys():
       if len( level1_map ) == 1:

Modified: sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/tools/templates/lapack.hpp	2010-01-04 04:36:53 EST (Mon, 04 Jan 2010)
@@ -181,9 +181,9 @@
     return info;
 }
 $TEMPLATE[setup_min_workspace]
-        traits::detail::array< $WORKSPACE_TYPE > tmp_$NAME( min_size_$NAME( $CALL_MIN_SIZE ) );
+        bindings::detail::array< $WORKSPACE_TYPE > tmp_$NAME( min_size_$NAME( $CALL_MIN_SIZE ) );
 $TEMPLATE[setup_opt_workspace]
-        traits::detail::array< $WORKSPACE_TYPE > tmp_$NAME( $TMP_SIZE );
+        bindings::detail::array< $WORKSPACE_TYPE > tmp_$NAME( $TMP_SIZE );
 $TEMPLATE[min_size_func]
     //
     // Static member function that returns the minimum size of