Subject: [Boost-commit] svn:boost r59044 - sandbox/numeric_bindings/libs/numeric/bindings/atlas
From: rutger_at_[hidden]
Date: 2010-01-15 09:21:36
Author: rutger
Date: 2010-01-15 09:21:35 EST (Fri, 15 Jan 2010)
New Revision: 59044
URL: http://svn.boost.org/trac/boost/changeset/59044
Log:
ublas_matr2ger now passes regression
Text files modified:
sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2ger.cc | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
Modified: sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2ger.cc
==============================================================================
--- sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2ger.cc (original)
+++ sandbox/numeric_bindings/libs/numeric/bindings/atlas/ublas_matr2ger.cc 2010-01-15 09:21:35 EST (Fri, 15 Jan 2010)
@@ -5,14 +5,14 @@
//#define BOOST_NO_FUNCTION_TEMPLATE_ORDERING
#include <iostream>
-#include <boost/numeric/bindings/atlas/cblas1.hpp>
-#include <boost/numeric/bindings/atlas/cblas2.hpp>
-#include <boost/numeric/bindings/traits/ublas_vector.hpp>
-#include <boost/numeric/bindings/traits/ublas_matrix.hpp>
+#include <boost/numeric/bindings/blas/level1.hpp>
+#include <boost/numeric/bindings/blas/level2.hpp>
+#include <boost/numeric/bindings/ublas/vector.hpp>
+#include <boost/numeric/bindings/ublas/matrix.hpp>
#include "utils.h"
namespace ublas = boost::numeric::ublas;
-namespace atlas = boost::numeric::bindings::atlas;
+namespace blas = boost::numeric::bindings::blas;
using std::cout;
using std::endl;
@@ -42,7 +42,7 @@
cout << endl;
// m += x y^T
- atlas::ger (vx, vy, rm);
+ blas::ger (1.0, vx, vy, rm);
print_m (rm, "m += x y^T");
cout << endl << endl;
@@ -50,15 +50,15 @@
print_m (rm, "m");
cout << endl;
- atlas::set (1., vx);
- atlas::set (1., vy);
+ blas::set (1., vx);
+ blas::set (1., vy);
print_v (vx, "vx");
cout << endl;
print_v (vy, "vy");
cout << endl;
// m += 2 x y^T
- atlas::ger (2., vx, vy, rm);
+ blas::ger (2., vx, vy, rm);
print_m (rm, "m += 2 x y^T");
cout << endl << endl;
@@ -70,7 +70,7 @@
cout << endl;
// m += x y^T
- atlas::ger (vx, vy, rm);
+ blas::ger ( 1.0, vx, vy, rm);
print_m (rm, "m += x y^T");
cout << endl << endl;
@@ -88,7 +88,7 @@
cout << endl;
// m += x y^T
- atlas::ger (vx, vy, cm);
+ blas::ger ( 1.0, vx, vy, cm);
print_m (cm, "m += x y^T");
cout << endl << endl;
@@ -96,15 +96,15 @@
print_m (cm, "m");
cout << endl;
- atlas::set (1., vx);
- atlas::set (1., vy);
+ blas::set (1., vx);
+ blas::set (1., vy);
print_v (vx, "vx");
cout << endl;
print_v (vy, "vy");
cout << endl;
// m += 2 x y^T
- atlas::ger (2., vx, vy, cm);
+ blas::ger (2., vx, vy, cm);
print_m (cm, "m += 2 x y^T");
cout << endl << endl;
@@ -116,7 +116,7 @@
cout << endl;
// m += x y^T
- atlas::ger (vx, vy, cm);
+ blas::ger (1.0, vx, vy, cm);
print_m (cm, "m += x y^T");
cout << endl << endl;