[Boost-commit] svn:boost r48516 - in sandbox/boost/numeric/bindings: mumps traits

From: karl.meerbergen_at_[hidden]
Date: 2008-09-01 11:55:57

Author: karlmeerbergen
Date: 2008-09-01 11:55:56 EDT (Mon, 01 Sep 2008)
New Revision: 48516
URL: http://svn.boost.org/trac/boost/changeset/48516

Log:
some corrections to previous commit

Text files modified: 
   sandbox/boost/numeric/bindings/mumps/mumps_driver_4_8_0.hpp |     8 ++++----                                
   sandbox/boost/numeric/bindings/traits/ublas_sparse.hpp      |    10 +++++-----                              
   sandbox/boost/numeric/bindings/traits/ublas_vector2.hpp     |    12 ++++++------                            
   3 files changed, 15 insertions(+), 15 deletions(-)

Modified: sandbox/boost/numeric/bindings/mumps/mumps_driver_4_8_0.hpp
==============================================================================
--- sandbox/boost/numeric/bindings/mumps/mumps_driver_4_8_0.hpp	(original)
+++ sandbox/boost/numeric/bindings/mumps/mumps_driver_4_8_0.hpp	2008-09-01 11:55:56 EDT (Mon, 01 Sep 2008)
@@ -9,10 +9,10 @@
 #ifndef BOOST_NUMERIC_BINDINGS_MUMPS_MUMPS_DRIVER_4_6_4_HPP
 #define BOOST_NUMERIC_BINDINGS_MUMPS_MUMPS_DRIVER_4_6_4_HPP
 
-#include <smumps_c.hpp>
-#include <cmumps_c.hpp>
-#include <dmumps_c.hpp>
-#include <4.6.4/zmumps_c.hpp>
+#include <smumps_c.h>
+#include <cmumps_c.h>
+#include <dmumps_c.h>
+#include <zmumps_c.h>
 #include <boost/numeric/bindings/traits/sparse_traits.hpp>
 #include <boost/numeric/bindings/traits/matrix_traits.hpp>
 #include <boost/numeric/bindings/traits/type_traits.hpp>

Modified: sandbox/boost/numeric/bindings/traits/ublas_sparse.hpp
==============================================================================
--- sandbox/boost/numeric/bindings/traits/ublas_sparse.hpp	(original)
+++ sandbox/boost/numeric/bindings/traits/ublas_sparse.hpp	2008-09-01 11:55:56 EDT (Mon, 01 Sep 2008)
@@ -67,7 +67,7 @@
     BOOST_STATIC_CONSTANT (std::size_t, index_base = IB);
 
     static index_pointer index1_storage (matrix_type& cm) {
-      //assert (cm.filled1() == layout_type::size1 (cm.size1(), cm.size2()) + 1);
+      //assert (cm.filled1() == layout_type::num_rows (cm.size1(), cm.size2()) + 1);
       return vector_traits<idx_array_t>::storage (cm.index1_data()); 
     }
     static index_pointer index2_storage (matrix_type& cm) {
@@ -77,8 +77,8 @@
       return vector_traits<val_array_t>::storage (cm.value_data()); 
     }
 
-    static std::ptrdiff_t size1 (matrix_type& cm) { return cm.size1(); } 
-    static std::ptrdiff_t size2 (matrix_type& cm) { return cm.size2(); }
+    static std::ptrdiff_t num_rows (matrix_type& cm) { return cm.size1(); } 
+    static std::ptrdiff_t num_columns (matrix_type& cm) { return cm.size2(); }
     static std::ptrdiff_t num_nonzeros (matrix_type& cm) { 
       return cm.nnz(); 
       // Joerg, this isn't very intuitive :o(
@@ -137,8 +137,8 @@
       return vector_traits<val_array_t>::storage (cm.value_data()); 
     }
 
-    static int size1 (matrix_type& cm) { return cm.size1(); } 
-    static int size2 (matrix_type& cm) { return cm.size2(); }
+    static int num_rows (matrix_type& cm) { return cm.size1(); } 
+    static int num_columns (matrix_type& cm) { return cm.size2(); }
     static int num_nonzeros (matrix_type& cm) { 
       return cm.nnz(); 
       // Joerg, this isn't very intuitive :o(

Modified: sandbox/boost/numeric/bindings/traits/ublas_vector2.hpp
==============================================================================
--- sandbox/boost/numeric/bindings/traits/ublas_vector2.hpp	(original)
+++ sandbox/boost/numeric/bindings/traits/ublas_vector2.hpp	2008-09-01 11:55:56 EDT (Mon, 01 Sep 2008)
@@ -56,8 +56,8 @@
       typedef typename detail::generate_const<V,ArrT>::type array_type;
       return vector_traits<array_type>::storage (v.data()); 
     }
-    static std::ptrdiff_t size1 (matrix_type& v) { return v.size(); } 
-    static std::ptrdiff_t size2 (matrix_type&) { return 1; }
+    static std::ptrdiff_t num_rows (matrix_type& v) { return v.size(); } 
+    static std::ptrdiff_t num_columns (matrix_type&) { return 1; }
     static std::ptrdiff_t storage_size (matrix_type& v) { return v.size(); }
     static std::ptrdiff_t leading_dimension (matrix_type& v) { return v.size(); }
   }; 
@@ -86,8 +86,8 @@
     static pointer storage (matrix_type& v) {
       return vector_traits<V>::storage (v); 
     }
-    static std::ptrdiff_t size1 (matrix_type& v) { return v.size(); } 
-    static std::ptrdiff_t size2 (matrix_type&) { return 1; }
+    static std::ptrdiff_t num_rows (matrix_type& v) { return v.size(); } 
+    static std::ptrdiff_t num_columns (matrix_type&) { return 1; }
     static std::ptrdiff_t storage_size (matrix_type& v) { return v.size(); }
     static std::ptrdiff_t leading_dimension (matrix_type& v) { return v.size(); }
   }; 
@@ -116,8 +116,8 @@
     typedef typename detail::generate_const<V,T>::type* pointer; 
 
     static pointer storage (matrix_type& v) { return v.data(); }
-    static std::ptrdiff_t size1 (matrix_type&) { return 1; } 
-    static std::ptrdiff_t size2 (matrix_type& v) { return v.size(); }
+    static std::ptrdiff_t num_rows (matrix_type&) { return 1; } 
+    static std::ptrdiff_t num_columns (matrix_type& v) { return v.size(); }
     static std::ptrdiff_t storage_size (matrix_type&) { return N; }
     static std::ptrdiff_t leading_dimension (matrix_type&) { return N; }
   };