[Boost-commit] svn:boost r58663 - in sandbox/numeric_bindings/boost/numeric/bindings: . ublas ublas/detail

Subject: [Boost-commit] svn:boost r58663 - in sandbox/numeric_bindings/boost/numeric/bindings: . ublas ublas/detail
From: rutger_at_[hidden]
Date: 2010-01-04 03:17:05

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

Log:
added unit_triangular matrix, removed matrix_side

Text files modified: 
   sandbox/numeric_bindings/boost/numeric/bindings/diag_tag.hpp                |    18 ++----------------                      
   sandbox/numeric_bindings/boost/numeric/bindings/ublas/detail/convert_to.hpp |    16 ++++++++--------                        
   sandbox/numeric_bindings/boost/numeric/bindings/ublas/triangular.hpp        |     3 +--                                     
   3 files changed, 11 insertions(+), 26 deletions(-)

Modified: sandbox/numeric_bindings/boost/numeric/bindings/diag_tag.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/diag_tag.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/diag_tag.hpp	2010-01-04 03:17:04 EST (Mon, 04 Jan 2010)
@@ -20,25 +20,11 @@
 
 template< typename T >
 struct diag_tag_impl {
-};
-
-template<>
-struct diag_tag_impl< tag::upper > {
     typedef tag::non_unit type;
 };
 
 template<>
-struct diag_tag_impl< tag::lower > {
-    typedef tag::non_unit type;
-};
-
-template<>
-struct diag_tag_impl< tag::unit_upper > {
-    typedef tag::unit type;
-};
-
-template<>
-struct diag_tag_impl< tag::unit_lower > {
+struct diag_tag_impl< tag::unit_triangular > {
     typedef tag::unit type;
 };
 
@@ -49,7 +35,7 @@
 template< typename T >
 struct diag_tag {
     typedef typename detail::diag_tag_impl<
-        typename detail::property_at< T, tag::matrix_side >::type
+        typename detail::property_at< T, tag::matrix_type >::type
     >::type type;
 };
 

Modified: sandbox/numeric_bindings/boost/numeric/bindings/ublas/detail/convert_to.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/ublas/detail/convert_to.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/ublas/detail/convert_to.hpp	2010-01-04 03:17:04 EST (Mon, 04 Jan 2010)
@@ -29,23 +29,23 @@
 };
 
 template<>
-struct convert_to< tag::matrix_side, ublas::lower > {
-    typedef tag::lower type;
+struct convert_to< tag::matrix_type, ublas::lower > {
+    typedef tag::triangular type;
 };
 
 template<>
-struct convert_to< tag::matrix_side, ublas::upper > {
-    typedef tag::upper type;
+struct convert_to< tag::matrix_type, ublas::upper > {
+    typedef tag::triangular type;
 };
 
 template<>
-struct convert_to< tag::matrix_side, ublas::unit_lower > {
-    typedef tag::unit_lower type;
+struct convert_to< tag::matrix_type, ublas::unit_lower > {
+    typedef tag::unit_triangular type;
 };
 
 template<>
-struct convert_to< tag::matrix_side, ublas::unit_upper > {
-    typedef tag::unit_upper type;
+struct convert_to< tag::matrix_type, ublas::unit_upper > {
+    typedef tag::unit_triangular type;
 };
 
 template<>

Modified: sandbox/numeric_bindings/boost/numeric/bindings/ublas/triangular.hpp
==============================================================================
--- sandbox/numeric_bindings/boost/numeric/bindings/ublas/triangular.hpp	(original)
+++ sandbox/numeric_bindings/boost/numeric/bindings/ublas/triangular.hpp	2010-01-04 03:17:04 EST (Mon, 04 Jan 2010)
@@ -30,8 +30,7 @@
         mpl::pair< tag::entity, tag::matrix >,
         mpl::pair< tag::size_type<1>, std::ptrdiff_t >,
         mpl::pair< tag::size_type<2>, std::ptrdiff_t >,
-        mpl::pair< tag::matrix_type, tag::triangular >,
-        mpl::pair< tag::matrix_side, typename convert_to< tag::matrix_side, F1 >::type >,
+        mpl::pair< tag::matrix_type, typename convert_to< tag::matrix_type, F1 >::type >,
         mpl::pair< tag::data_structure, tag::triangular_array >,
         mpl::pair< tag::data_side, typename convert_to< tag::data_side, F1 >::type >,
         mpl::pair< tag::data_order, typename convert_to< tag::data_order, F2 >::type >