[Boost-commit] svn:boost r58959 - sandbox/numeric_bindings/libs/numeric/bindings/lapack/test

Subject: [Boost-commit] svn:boost r58959 - sandbox/numeric_bindings/libs/numeric/bindings/lapack/test
From: rutger_at_[hidden]
Date: 2010-01-13 04:01:41

Author: rutger
Date: 2010-01-13 04:01:39 EST (Wed, 13 Jan 2010)
New Revision: 58959
URL: http://svn.boost.org/trac/boost/changeset/58959

Log:
fixed 3 more lapack regressions 

Text files modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp |     2 +-                                      
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc   |    14 ++++++++------                          
   sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc   |    26 ++++++++++++++------------              
   3 files changed, 23 insertions(+), 19 deletions(-)

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_getrf_getrs1.cpp	2010-01-13 04:01:39 EST (Wed, 13 Jan 2010)
@@ -16,7 +16,7 @@
 
   boost::numeric::bindings::lapack::getrf( lu, ipiv ) ;
   matrix_type ia( lu );
-  boost::numeric::bindings::lapack::getrs( 'N', lu, ipiv, x ) ;
+  boost::numeric::bindings::lapack::getrs( lu, ipiv, x ) ;
   boost::numeric::bindings::lapack::getri( ia, ipiv ) ;
 
   std::cout << prod(a,x) - b << std::endl ; 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_hetrf_hetrs.cc	2010-01-13 04:01:39 EST (Wed, 13 Jan 2010)
@@ -12,13 +12,15 @@
 #include <boost/numeric/bindings/lapack/computational/hetrs.hpp>
 #include <boost/numeric/bindings/ublas/matrix.hpp>
 #include <boost/numeric/bindings/ublas/hermitian.hpp>
+#include <boost/numeric/bindings/ublas/matrix_proxy.hpp>
 #include <boost/numeric/bindings/std/vector.hpp>
-#include <boost/numeric/ublas/matrix_proxy.hpp>
+#include <boost/numeric/bindings/lower.hpp>
+#include <boost/numeric/bindings/upper.hpp>
 #include "utils.h"
 
 namespace ublas = boost::numeric::ublas;
 namespace lapack = boost::numeric::bindings::lapack;
-namespace traits = boost::numeric::bindings::traits;
+namespace bindings = boost::numeric::bindings;
 
 using std::size_t; 
 using std::cin;
@@ -77,7 +79,7 @@
 
   int ierr = lapack::hetrf (hcal, ipiv); 
   if (ierr == 0) {
-    lapack::hetrs (traits::matrix_uplo_tag(hcal), hcal, ipiv, cbl);
+    lapack::hetrs ( hcal, ipiv, cbl);
     print_m (cbl, "cxl"); 
   }
   else 
@@ -90,7 +92,7 @@
 
   ierr = lapack::hetrf (hcau, ipiv, lapack::workspace(cwork)); 
   if (ierr == 0) {
-    lapack::hetrs (traits::matrix_uplo_tag(hcau), hcau, ipiv, cbu); 
+    lapack::hetrs ( hcau, ipiv, cbu); 
     print_v (ipiv, "ipiv"); 
     cout << endl; 
     print_m (cbu, "cxu"); 
@@ -123,7 +125,7 @@
   cherml_t hcal2 (cal2);
   ierr = lapack::hetrf (hcal2, ipiv); 
   if (ierr == 0) {
-    lapack::hetrs ('L', cal2, ipiv, cbl2); 
+    lapack::hetrs ( bindings::lower( cal2 ), ipiv, cbl2); 
     print_m (cbl2, "cxl2"); 
   }
   else 
@@ -134,7 +136,7 @@
   chermu_t hcau2 (cau2);
   ierr = lapack::hetrf (hcau2, ipiv, lapack::workspace(cwork)); 
   if (ierr == 0) {
-    lapack::hetrs ('U', cau2, ipiv, cbu2); 
+    lapack::hetrs ( bindings::upper( cau2 ), ipiv, cbu2); 
     print_v (ipiv, "ipiv"); 
     cout << endl; 
     print_m (cbu2, "cxu"); 

Modified: sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/lapack/test/ublas_sytrf_sytrs.cc	2010-01-13 04:01:39 EST (Wed, 13 Jan 2010)
@@ -10,14 +10,16 @@
 #include <boost/numeric/bindings/lapack/computational/sytri.hpp>
 #include <boost/numeric/bindings/lapack/computational/sytrs.hpp>
 #include <boost/numeric/bindings/ublas/matrix.hpp>
+#include <boost/numeric/bindings/ublas/matrix_proxy.hpp>
 #include <boost/numeric/bindings/ublas/symmetric.hpp>
 #include <boost/numeric/bindings/std/vector.hpp>
-#include <boost/numeric/ublas/matrix_proxy.hpp>
+#include <boost/numeric/bindings/lower.hpp>
+#include <boost/numeric/bindings/upper.hpp>
 #include "utils.h"
 
 namespace ublas = boost::numeric::ublas;
 namespace lapack = boost::numeric::bindings::lapack;
-namespace traits = boost::numeric::bindings::traits;
+namespace bindings = boost::numeric::bindings;
 
 using std::size_t; 
 using std::cin;
@@ -101,9 +103,9 @@
   int err = lapack::sytrf (sal, ipiv);  
   if (err == 0) {
     symml_t isal (sal);
-    lapack::sytrs (traits::matrix_uplo_tag(sal), sal, ipiv, bl); 
+    lapack::sytrs ( sal, ipiv, bl); 
     print_m (bl, "xl"); 
-    lapack::sytri (traits::matrix_uplo_tag(isal), isal, ipiv);
+    lapack::sytri ( isal, ipiv);
     print_m (isal, "isal"); 
   } 
   cout << endl; 
@@ -111,9 +113,9 @@
   err = lapack::sytrf (sau, ipiv);  
   if (err == 0) {
     symmu_t isau (sau);
-    lapack::sytrs (traits::matrix_uplo_tag(sau), sau, ipiv, bu); 
+    lapack::sytrs ( sau, ipiv, bu); 
     print_m (bu, "xu"); 
-    lapack::sytri (traits::matrix_uplo_tag(isau), isau, ipiv);
+    lapack::sytri ( isau, ipiv);
     print_m (isau, "isau"); 
   } 
   else 
@@ -140,7 +142,7 @@
   symml_t sal1 (al1);
   err = lapack::sytrf (sal1, ipiv);
   if (err == 0) {
-    lapack::sytrs ('L', al1, ipiv, bl1); 
+    lapack::sytrs ( bindings::lower( al1 ), ipiv, bl1); 
     print_m (al1, "al1 factored"); 
     cout << endl; 
     print_v (ipiv, "ipiv"); 
@@ -168,7 +170,7 @@
   symmu_t sau1 (au1);
   err = lapack::sytrf (sau1, ipiv);
   if (err == 0) {
-    lapack::sytrs ('U', au1, ipiv, bu1); 
+    lapack::sytrs ( bindings::upper( au1 ), ipiv, bu1); 
     print_m (au1, "au1 factored"); 
     cout << endl; 
     print_v (ipiv, "ipiv"); 
@@ -214,9 +216,9 @@
   int ierr = lapack::sytrf (scal, ipiv); 
   if (ierr == 0) {
     csymml_t iscal (scal);
-    lapack::sytrs (traits::matrix_uplo_tag(scal), scal, ipiv, cbl); 
+    lapack::sytrs ( scal, ipiv, cbl); 
     print_m (cbl, "cxl"); 
-    lapack::sytri (traits::matrix_uplo_tag(iscal), iscal, ipiv);
+    lapack::sytri ( iscal, ipiv);
     print_m (iscal, "iscal"); 
   }
   else 
@@ -239,11 +241,11 @@
   ierr = lapack::sytrf (scau, ipiv);
   if (ierr == 0) {
     csymmu_t iscau (scau);
-    lapack::sytrs (traits::matrix_uplo_tag(scau), scau, ipiv, cbu); 
+    lapack::sytrs ( scau, ipiv, cbu); 
     print_v (ipiv, "ipiv"); 
     cout << endl; 
     print_m (cbu, "cxu"); 
-    lapack::sytri (traits::matrix_uplo_tag(iscau), iscau, ipiv);
+    lapack::sytri ( iscau, ipiv);
     print_m (iscau, "iscau"); 
   }
   else