comparison DEPENDENCIES/generic/include/boost/numeric/ublas/lu.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)

 
     template<class PM, class MV>
     BOOST_UBLAS_INLINE
     void swap_rows (const PM &pm, MV &mv, vector_tag) {
         typedef typename PM::size_type size_type;
-        typedef typename MV::value_type value_type;
 
         size_type size = pm.size ();
         for (size_type i = 0; i < size; ++ i) {
             if (i != pm (i))
                 std::swap (mv (i), mv (pm (i)));

     }
     template<class PM, class MV>
     BOOST_UBLAS_INLINE
     void swap_rows (const PM &pm, MV &mv, matrix_tag) {
         typedef typename PM::size_type size_type;
-        typedef typename MV::value_type value_type;
 
         size_type size = pm.size ();
         for (size_type i = 0; i < size; ++ i) {
             if (i != pm (i))
                 row (mv, i).swap (row (mv, pm (i)));

     }
 
     // LU factorization without pivoting
     template<class M>
     typename M::size_type lu_factorize (M &m) {
-        typedef M matrix_type;
+
         typedef typename M::size_type size_type;
         typedef typename M::value_type value_type;
 
 #if BOOST_UBLAS_TYPE_CHECK
+        typedef M matrix_type;
         matrix_type cm (m);
 #endif
         size_type singular = 0;
         size_type size1 = m.size1 ();
         size_type size2 = m.size2 ();

     }
 
     // LU factorization with partial pivoting
     template<class M, class PM>
     typename M::size_type lu_factorize (M &m, PM &pm) {
-        typedef M matrix_type;
         typedef typename M::size_type size_type;
         typedef typename M::value_type value_type;
 
 #if BOOST_UBLAS_TYPE_CHECK
+        typedef M matrix_type;
         matrix_type cm (m);
 #endif
         size_type singular = 0;
         size_type size1 = m.size1 ();
         size_type size2 = m.size2 ();

     }
 
     // LU substitution
     template<class M, class E>
     void lu_substitute (const M &m, vector_expression<E> &e) {
+#if BOOST_UBLAS_TYPE_CHECK
         typedef const M const_matrix_type;
         typedef vector<typename E::value_type> vector_type;
 
-#if BOOST_UBLAS_TYPE_CHECK
         vector_type cv1 (e);
 #endif
         inplace_solve (m, e, unit_lower_tag ());
 #if BOOST_UBLAS_TYPE_CHECK
         BOOST_UBLAS_CHECK (detail::expression_type_check (prod (triangular_adaptor<const_matrix_type, unit_lower> (m), e), cv1), internal_logic ());

         BOOST_UBLAS_CHECK (detail::expression_type_check (prod (triangular_adaptor<const_matrix_type, upper> (m), e), cv2), internal_logic ());
 #endif
     }
     template<class M, class E>
     void lu_substitute (const M &m, matrix_expression<E> &e) {
+#if BOOST_UBLAS_TYPE_CHECK
         typedef const M const_matrix_type;
         typedef matrix<typename E::value_type> matrix_type;
 
-#if BOOST_UBLAS_TYPE_CHECK
         matrix_type cm1 (e);
 #endif
         inplace_solve (m, e, unit_lower_tag ());
 #if BOOST_UBLAS_TYPE_CHECK
         BOOST_UBLAS_CHECK (detail::expression_type_check (prod (triangular_adaptor<const_matrix_type, unit_lower> (m), e), cm1), internal_logic ());

         swap_rows (pm, mv);
         lu_substitute (m, mv);
     }
     template<class E, class M>
     void lu_substitute (vector_expression<E> &e, const M &m) {
+#if BOOST_UBLAS_TYPE_CHECK
         typedef const M const_matrix_type;
         typedef vector<typename E::value_type> vector_type;
 
-#if BOOST_UBLAS_TYPE_CHECK
         vector_type cv1 (e);
 #endif
         inplace_solve (e, m, upper_tag ());
 #if BOOST_UBLAS_TYPE_CHECK
         BOOST_UBLAS_CHECK (detail::expression_type_check (prod (e, triangular_adaptor<const_matrix_type, upper> (m)), cv1), internal_logic ());

         BOOST_UBLAS_CHECK (detail::expression_type_check (prod (e, triangular_adaptor<const_matrix_type, unit_lower> (m)), cv2), internal_logic ());
 #endif
     }
     template<class E, class M>
     void lu_substitute (matrix_expression<E> &e, const M &m) {
+#if BOOST_UBLAS_TYPE_CHECK
         typedef const M const_matrix_type;
         typedef matrix<typename E::value_type> matrix_type;
 
-#if BOOST_UBLAS_TYPE_CHECK
         matrix_type cm1 (e);
 #endif
         inplace_solve (e, m, upper_tag ());
 #if BOOST_UBLAS_TYPE_CHECK
         BOOST_UBLAS_CHECK (detail::expression_type_check (prod (e, triangular_adaptor<const_matrix_type, upper> (m)), cm1), internal_logic ());