|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r58927 - sandbox/numeric_bindings/libs/numeric/bindings/lapack/test
From: rutger_at_[hidden]
Date: 2010-01-12 06:06:43
Author: rutger
Date: 2010-01-12 06:06:43 EST (Tue, 12 Jan 2010)
New Revision: 58927
URL: http://svn.boost.org/trac/boost/changeset/58927
Log:
hegv/sygv regression is now passing
Text files modified:
sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hegv.cpp 2010-01-12 06:06:43 EST (Tue, 12 Jan 2010)
@@ -11,10 +11,10 @@
#include <boost/numeric/bindings/lapack/driver/hegv.hpp>
#include <boost/numeric/bindings/lapack/driver/sygv.hpp>
#include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/ublas/matrix_proxy.hpp>
#include <boost/numeric/bindings/ublas/hermitian.hpp>
#include <boost/numeric/bindings/ublas/vector.hpp>
-#include <boost/numeric/ublas/matrix_proxy.hpp>
-#include <boost/numeric/ublas/vector_proxy.hpp>
+#include <boost/numeric/bindings/ublas/vector_proxy.hpp>
#include <boost/numeric/ublas/io.hpp>
#include <boost/type_traits/is_complex.hpp>
#include <boost/mpl/if.hpp>
@@ -24,15 +24,15 @@
namespace ublas = boost::numeric::ublas;
namespace lapack = boost::numeric::bindings::lapack;
-namespace traits = boost::numeric::bindings::traits;
+namespace bindings = boost::numeric::bindings;
struct apply_real {
template< typename MatrixA, typename MatrixB, typename VectorW,
typename Workspace >
static inline integer_t hegv( const integer_t itype, const char jobz,
- const integer_t n, MatrixA& a, MatrixB& b, VectorW& w,
+ MatrixA& a, MatrixB& b, VectorW& w,
Workspace work ) {
- return lapack::sygv( itype, jobz, n, a, b, w, work );
+ return lapack::sygv( itype, jobz, a, b, w, work );
}
};
@@ -40,9 +40,9 @@
template< typename MatrixA, typename MatrixB, typename VectorW,
typename Workspace >
static inline integer_t hegv( const integer_t itype, const char jobz,
- const integer_t n, MatrixA& a, MatrixB& b, VectorW& w,
+ MatrixA& a, MatrixB& b, VectorW& w,
Workspace work ) {
- return lapack::hegv( itype, jobz, n, a, b, w, work );
+ return lapack::hegv( itype, jobz, a, b, w, work );
}
};
@@ -69,12 +69,12 @@
// Compute eigen decomposition.
hermitian_type h_a( a );
- apply_t::hegv( 1, 'V', bindings::size_column( h_a ), h_a, b, e1, workspace ) ;
+ apply_t::hegv( 1, 'V', h_a, b, e1, workspace ) ;
if (check_residual( a2, e1, a )) return 255 ;
hermitian_type h_a2( a2 );
- apply_t::hegv( 1, 'N', bindings::size_column( h_a2 ), h_a2 , b, e2, workspace ) ;
+ apply_t::hegv( 1, 'N', h_a2 , b, e2, workspace ) ;
if (norm_2( e1 - e2 ) > n * norm_2( e1 ) * std::numeric_limits< real_type >::epsilon()) return 255 ;
// Test for a matrix range
@@ -89,7 +89,7 @@
matrix_range b_r( b, r, r );
hermitian_range_type h_a_r( a_r );
- apply_t::hegv(1, 'V', bindings::size_column( h_a_r ), h_a_r, b_r, e_r, workspace );
+ apply_t::hegv(1, 'V', h_a_r, b_r, e_r, workspace );
matrix_range a2_r( a2, r, r );
if (check_residual( a2_r, e_r, a_r )) return 255 ;
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk