aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/basicstuff.cpp
diff options
context:
space:
mode:
authorGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2008-03-12 17:17:36 +0000
committerGravatar Benoit Jacob <jacob.benoit.1@gmail.com>2008-03-12 17:17:36 +0000
commit2ee68a074efc1163358fb3b51fb4b23e83a05f97 (patch)
tree48df581770a55f8eb9f632aee54c777816478b64 /test/basicstuff.cpp
parent01572b9f54e769a7d1bb3d5073c264a5fbc7ce42 (diff)
generalized ei_traits<>.
Finally the importing macro is named EIGEN_BASIC_PUBLIC_INTERFACE because it does not only import the ei_traits, it also makes the base class a friend, etc.
Diffstat (limited to 'test/basicstuff.cpp')
-rw-r--r--test/basicstuff.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/basicstuff.cpp b/test/basicstuff.cpp
index bd009eb0b..5e79ec21c 100644
--- a/test/basicstuff.cpp
+++ b/test/basicstuff.cpp
@@ -29,7 +29,7 @@ namespace Eigen {
template<typename MatrixType> void basicStuff(const MatrixType& m)
{
typedef typename MatrixType::Scalar Scalar;
- typedef Matrix<Scalar, MatrixType::Traits::RowsAtCompileTime, 1> VectorType;
+ typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType;
int rows = m.rows();
int cols = m.cols();
@@ -40,9 +40,9 @@ template<typename MatrixType> void basicStuff(const MatrixType& m)
m2 = MatrixType::random(rows, cols),
m3(rows, cols),
mzero = MatrixType::zero(rows, cols),
- identity = Matrix<Scalar, MatrixType::Traits::RowsAtCompileTime, MatrixType::Traits::RowsAtCompileTime>
+ identity = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
::identity(rows, rows),
- square = Matrix<Scalar, MatrixType::Traits::RowsAtCompileTime, MatrixType::Traits::RowsAtCompileTime>
+ square = Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime>
::random(rows, rows);
VectorType v1 = VectorType::random(rows),
v2 = VectorType::random(rows),
@@ -74,13 +74,13 @@ template<typename MatrixType> void basicStuff(const MatrixType& m)
// now test copying a row-vector into a (column-)vector and conversely.
square.col(r) = square.row(r).eval();
- Matrix<Scalar, 1, MatrixType::Traits::RowsAtCompileTime> rv(rows);
- Matrix<Scalar, MatrixType::Traits::RowsAtCompileTime, 1> cv(rows);
+ Matrix<Scalar, 1, MatrixType::RowsAtCompileTime> rv(rows);
+ Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> cv(rows);
rv = square.col(r);
cv = square.row(r);
VERIFY_IS_APPROX(rv, cv.transpose());
- if(cols!=1 && rows!=1 && MatrixType::Traits::SizeAtCompileTime!=Dynamic)
+ if(cols!=1 && rows!=1 && MatrixType::SizeAtCompileTime!=Dynamic)
{
VERIFY_RAISES_ASSERT(m1 = (m2.block(0,0, rows-1, cols-1)));
}