From 55227b1f636b03c321940035061360484ea05e66 Mon Sep 17 00:00:00 2001 From: Benoit Jacob Date: Wed, 26 Sep 2007 14:06:14 +0000 Subject: Deep refactoring. 1) Kill MatrixXpr class, instead let all class inherit a common EigenBase class 2) Kill MatrixBase/Matrix/Vector classes, instead introduce a single Matrix class, a MatrixStorage class, and typedefs to emulate vectors 3) Huge code cleanup, remove large preprocessor macros, sloccount drop to ~750 down from 1100. 4) Introduce compile-time-known sizes --- doc/tutorial.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'doc/tutorial.cpp') diff --git a/doc/tutorial.cpp b/doc/tutorial.cpp index 3b4489522..e37c245cc 100644 --- a/doc/tutorial.cpp +++ b/doc/tutorial.cpp @@ -5,18 +5,25 @@ using namespace Eigen; int main(int, char **) { - Matrix m; // 2x2 fixed-size matrix with uninitialized entries + Matrix m, n; // 2x2 fixed-size matrix with uninitialized entries m(0,0) = 1; m(0,1) = 2; m(1,0) = 3; m(1,1) = 4; + + n = m; + n = eval(n*n); + cout << n << endl; +#if 0 cout << "Here is a 2x2 matrix m:" << endl << m << endl; cout << "Let us now build a 4x4 matrix m2 by assembling together four 2x2 blocks." << endl; - MatrixX m2(4, 4); // dynamic matrix with initial size 4x4 and uninitialized entries + Matrix m2; // dynamic matrix with initial size 4x4 and uninitialized entries // notice how we are mixing fixed-size and dynamic-size types. cout << "In the top-left block, we put the matrix m shown above." << endl; m2.block(0,1,0,1) = m; + cout << "m2 is now " << endl << m2 << endl; + cout << "m2.block(0,1,0,1) has " << m2.block(0,1,0,1).rows() << " rows" << endl; cout << "In the bottom-left block, we put the matrix m*m, which is:" << endl << m*m << endl; m2.block(2,3,0,1) = m * m; cout << "In the top-right block, we put the matrix m+m, which is:" << endl << m+m << endl; @@ -47,5 +54,6 @@ int main(int, char **) m = m_save; m.alias() = m * m; cout << "And m is now:" << endl << m << endl << "as was expected." << endl; +#endif return 0; } -- cgit v1.2.3