[Boost-commit] svn:boost r59049 - sandbox/numeric_bindings/libs/numeric/bindings/atlas

Subject: [Boost-commit] svn:boost r59049 - sandbox/numeric_bindings/libs/numeric/bindings/atlas
From: rutger_at_[hidden]
Date: 2010-01-15 10:11:57

Author: rutger
Date: 2010-01-15 10:11:56 EST (Fri, 15 Jan 2010)
New Revision: 59049
URL: http://svn.boost.org/trac/boost/changeset/59049

Log:
ublas_cvct now passes regression

Text files modified: 
   sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cvct.cc |    38 +++++++++++++++++++-------------------  
   1 files changed, 19 insertions(+), 19 deletions(-)

Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cvct.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cvct.cc	(original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_cvct.cc	2010-01-15 10:11:56 EST (Fri, 15 Jan 2010)
@@ -8,11 +8,11 @@
 //#define BOOST_NUMERIC_BINDINGS_POOR_MANS_TRAITS 
 //#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
 
-#include <boost/numeric/bindings/traits/ublas_vector.hpp>
-#include <boost/numeric/bindings/atlas/cblas1.hpp>
+#include <boost/numeric/bindings/ublas/vector.hpp>
+#include <boost/numeric/bindings/blas/level1.hpp>
 #include "utils.h" 
 
-namespace atlas = boost::numeric::bindings::atlas;
+namespace blas = boost::numeric::bindings::blas;
 namespace ublas = boost::numeric::ublas;
 
 using std::cout;
@@ -37,48 +37,48 @@
   init_v (v, times_plus<cmplx_t> (cmplx_t (1, -1), cmplx_t (0, .1))); 
   print_v (v, "v"); 
 
-  atlas::scal (2.0, v); 
+  blas::scal (2.0, v); 
   print_v (v, "2.0 v"); 
 
-  atlas::scal (cmplx_t (-1, 0), v); 
+  blas::scal (cmplx_t (-1, 0), v); 
   print_v (v, "(-1, 0) v"); 
 
-  atlas::scal (cmplx_t (0, 1), v);
+  blas::scal (cmplx_t (0, 1), v);
   print_v (v, "(0, 1) v"); 
 
-  atlas::set (cmplx_t (1, -1), v); 
+  blas::set (cmplx_t (1, -1), v); 
   print_v (v, "v"); 
   vct_t v1 (n); 
-  atlas::set (cmplx_t (0, -1), v1); 
+  blas::set (cmplx_t (0, -1), v1); 
   print_v (v1, "v1"); 
 
   cout << endl; 
-  cout << "v^T v1 = " << atlas::dot (v, v1) << " == "
-    << atlas::dotu (v, v1) << " == "
+  cout << "v^T v1 = " << blas::dotc (v, v1) << " == "
+    << blas::dotu (v, v1) << " == "
     << inner_prod (v, v1) << endl; 
-  cout << "v^T v = " << atlas::dot (v, v) << " == "
-    << atlas::dotu (v, v) << " == "
+  cout << "v^T v = " << blas::dotc (v, v) << " == "
+    << blas::dotu (v, v) << " == "
     << inner_prod (v, v) << endl; 
-  cout << "v1^T v1 = " << atlas::dot (v1, v1) << " == "
-    << atlas::dotu (v1, v1) << " == "
+  cout << "v1^T v1 = " << blas::dotc (v1, v1) << " == "
+    << blas::dotu (v1, v1) << " == "
     << inner_prod (v1, v1) << endl; 
 
   cout << endl; 
-  cout << "v^H v1 = " << atlas::dotc (v, v1) << " == "
+  cout << "v^H v1 = " << blas::dotc (v, v1) << " == "
     << inner_prod (conj (v), v1) << " == "
     << inner_prod (v1, conj (v)) << " != "
     << inner_prod (v, conj (v1)) << endl; 
-  cout << "v^H v = " << atlas::dotc (v, v) << " == "
+  cout << "v^H v = " << blas::dotc (v, v) << " == "
     << inner_prod (conj (v), v) << " == "
     << inner_prod (v, conj (v)) << endl; 
-  cout << "v1^H v1 = " << atlas::dotc (v1, v1) << " == "
+  cout << "v1^H v1 = " << blas::dotc (v1, v1) << " == "
     << inner_prod (conj (v1), v1) << " == "
     << inner_prod (v1, conj (v1)) << endl; 
 
   
   cout << endl;
-  cout << "||v||_1 = " << atlas::asum (v) << endl; 
-  cout << "||v||_2 = " << atlas::nrm2 (v) << " == "
+  cout << "||v||_1 = " << blas::asum (v) << endl; 
+  cout << "||v||_2 = " << blas::nrm2 (v) << " == "
     << norm_2 (v) << endl; 
   
   cout << endl;