aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/examples
diff options
context:
space:
mode:
Diffstat (limited to 'doc/examples')
-rw-r--r--doc/examples/class_Block.cpp4
-rw-r--r--doc/examples/class_Cast.cpp27
-rw-r--r--doc/examples/class_Column.cpp26
-rw-r--r--doc/examples/class_FixedBlock.cpp4
-rw-r--r--doc/examples/class_Row.cpp26
5 files changed, 4 insertions, 83 deletions
diff --git a/doc/examples/class_Block.cpp b/doc/examples/class_Block.cpp
index fd5ae816c..79cc314bf 100644
--- a/doc/examples/class_Block.cpp
+++ b/doc/examples/class_Block.cpp
@@ -6,14 +6,14 @@ template<typename Derived>
Eigen::Block<Derived>
topLeftCorner(MatrixBase<Derived>& m, int rows, int cols)
{
- return Eigen::Block<Derived>(m, 0, 0, rows, cols);
+ return Eigen::Block<Derived>(m.derived(), 0, 0, rows, cols);
}
template<typename Derived>
const Eigen::Block<Derived>
topLeftCorner(const MatrixBase<Derived>& m, int rows, int cols)
{
- return Eigen::Block<Derived>(m, 0, 0, rows, cols);
+ return Eigen::Block<Derived>(m.derived(), 0, 0, rows, cols);
}
int main(int, char**)
diff --git a/doc/examples/class_Cast.cpp b/doc/examples/class_Cast.cpp
deleted file mode 100644
index 7e752be1b..000000000
--- a/doc/examples/class_Cast.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <Eigen/Core>
-USING_PART_OF_NAMESPACE_EIGEN
-using namespace std;
-
-template<typename Derived>
-const Eigen::CwiseUnaryOp<
- Eigen::ei_scalar_cast_op<
- typename Eigen::ei_traits<typename Derived::Scalar>::FloatingPoint
- >, Derived
->
-castToFloatingPoint(const MatrixBase<Derived>& m)
-{
- return m.template cast<
- typename Eigen::ei_traits<
- typename Derived::Scalar
- >::FloatingPoint
- >();
-}
-
-int main(int, char**)
-{
- Matrix2i m = Matrix2i::random();
- cout << "Here's the matrix m. It has coefficients of type int."
- << endl << m << endl;
- cout << "Here's m/20:" << endl << castToFloatingPoint(m)/20 << endl;
- return 0;
-}
diff --git a/doc/examples/class_Column.cpp b/doc/examples/class_Column.cpp
deleted file mode 100644
index 1394324fa..000000000
--- a/doc/examples/class_Column.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <Eigen/Core>
-USING_PART_OF_NAMESPACE_EIGEN
-using namespace std;
-
-template<typename Derived>
-Eigen::Block<Derived,Derived::RowsAtCompileTime,1>
-firstColumn(MatrixBase<Derived>& m)
-{
- return typename Eigen::Block<Derived,Derived::RowsAtCompileTime,1>(m, 0);
-}
-
-template<typename Derived>
-const Eigen::Block<Derived,Derived::RowsAtCompileTime,1>
-firstColumn(const MatrixBase<Derived>& m)
-{
- return typename Eigen::Block<Derived,Derived::RowsAtCompileTime,1>(m, 0);
-}
-
-int main(int, char**)
-{
- Matrix4d m = Matrix4d::identity();
- cout << firstColumn(2*m) << endl; // calls the const version
- firstColumn(m) *= 5; // calls the non-const version
- cout << "Now the matrix m is:" << endl << m << endl;
- return 0;
-}
diff --git a/doc/examples/class_FixedBlock.cpp b/doc/examples/class_FixedBlock.cpp
index 644f420bd..e3e9532bc 100644
--- a/doc/examples/class_FixedBlock.cpp
+++ b/doc/examples/class_FixedBlock.cpp
@@ -6,14 +6,14 @@ template<typename Derived>
Eigen::Block<Derived, 2, 2>
topLeft2x2Corner(MatrixBase<Derived>& m)
{
- return Eigen::Block<Derived, 2, 2>(m, 0, 0);
+ return Eigen::Block<Derived, 2, 2>(m.derived(), 0, 0);
}
template<typename Derived>
const Eigen::Block<Derived, 2, 2>
topLeft2x2Corner(const MatrixBase<Derived>& m)
{
- return Eigen::Block<Derived, 2, 2>(m, 0, 0);
+ return Eigen::Block<Derived, 2, 2>(m.derived(), 0, 0);
}
int main(int, char**)
diff --git a/doc/examples/class_Row.cpp b/doc/examples/class_Row.cpp
deleted file mode 100644
index eed1dbdb4..000000000
--- a/doc/examples/class_Row.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-#include <Eigen/Core>
-USING_PART_OF_NAMESPACE_EIGEN
-using namespace std;
-
-template<typename Derived>
-Eigen::Block<Derived,1,Derived::ColsAtCompileTime>
-firstRow(MatrixBase<Derived>& m)
-{
- return Eigen::Block<Derived,1,Derived::ColsAtCompileTime>(m, 0);
-}
-
-template<typename Derived>
-const Eigen::Block<Derived,1,Derived::ColsAtCompileTime>
-firstRow(const MatrixBase<Derived>& m)
-{
- return Eigen::Block<Derived,1,Derived::ColsAtCompileTime>(m, 0);
-}
-
-int main(int, char**)
-{
- Matrix4d m = Matrix4d::identity();
- cout << firstRow(2*m) << endl; // calls the const version
- firstRow(m) *= 5; // calls the non-const version
- cout << "Now the matrix m is:" << endl << m << endl;
- return 0;
-}