diff options
author | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2015-05-01 22:10:41 +0200 |
---|---|---|
committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2015-05-01 22:10:41 +0200 |
commit | 28a4c92cbff88c75b932ce0d091ccaa2b6010724 (patch) | |
tree | 75eb0f8005954c5049f050e45bfcb2d8173c5671 /doc/snippets | |
parent | 173b34e9abd06202d3df8ba07686b874115956b7 (diff) |
bug #998: Started fixing doxygen warnings
Diffstat (limited to 'doc/snippets')
-rw-r--r-- | doc/snippets/MatrixBase_marked.cpp | 14 | ||||
-rw-r--r-- | doc/snippets/MatrixBase_part.cpp | 13 | ||||
-rw-r--r-- | doc/snippets/MatrixBase_triangularView.cpp (renamed from doc/snippets/MatrixBase_extract.cpp) | 12 | ||||
-rw-r--r-- | doc/snippets/Triangular_solve.cpp | 11 |
4 files changed, 15 insertions, 35 deletions
diff --git a/doc/snippets/MatrixBase_marked.cpp b/doc/snippets/MatrixBase_marked.cpp deleted file mode 100644 index f60712178..000000000 --- a/doc/snippets/MatrixBase_marked.cpp +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef _MSC_VER - #warning deprecated -#endif -/* -Matrix3d m = Matrix3d::Zero(); -m.part<Eigen::UpperTriangular>().setOnes(); -cout << "Here is the matrix m:" << endl << m << endl; -Matrix3d n = Matrix3d::Ones(); -n.part<Eigen::LowerTriangular>() *= 2; -cout << "Here is the matrix n:" << endl << n << endl; -cout << "And now here is m.inverse()*n, taking advantage of the fact that" - " m is upper-triangular:" << endl - << m.marked<Eigen::UpperTriangular>().solveTriangular(n); -*/
\ No newline at end of file diff --git a/doc/snippets/MatrixBase_part.cpp b/doc/snippets/MatrixBase_part.cpp deleted file mode 100644 index d3e7f482e..000000000 --- a/doc/snippets/MatrixBase_part.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _MSC_VER - #warning deprecated -#endif -/* -Matrix3d m = Matrix3d::Zero(); -m.part<Eigen::StrictlyUpperTriangular>().setOnes(); -cout << "Here is the matrix m:" << endl << m << endl; -cout << "And let us now compute m*m.adjoint() in a very optimized way" << endl - << "taking advantage of the symmetry." << endl; -Matrix3d n; -n.part<Eigen::SelfAdjoint>() = (m*m.adjoint()).lazy(); -cout << "The result is:" << endl << n << endl; -*/
\ No newline at end of file diff --git a/doc/snippets/MatrixBase_extract.cpp b/doc/snippets/MatrixBase_triangularView.cpp index c96220f72..03aa303f0 100644 --- a/doc/snippets/MatrixBase_extract.cpp +++ b/doc/snippets/MatrixBase_triangularView.cpp @@ -1,13 +1,9 @@ -#ifndef _MSC_VER - #warning deprecated -#endif -/* deprecated Matrix3i m = Matrix3i::Random(); cout << "Here is the matrix m:" << endl << m << endl; cout << "Here is the upper-triangular matrix extracted from m:" << endl - << m.part<Eigen::UpperTriangular>() << endl; + << Matrix3i(m.triangularView<Eigen::Upper>()) << endl; cout << "Here is the strictly-upper-triangular matrix extracted from m:" << endl - << m.part<Eigen::StrictlyUpperTriangular>() << endl; + << Matrix3i(m.triangularView<Eigen::StrictlyUpper>()) << endl; cout << "Here is the unit-lower-triangular matrix extracted from m:" << endl - << m.part<Eigen::UnitLowerTriangular>() << endl; -*/
\ No newline at end of file + << Matrix3i(m.triangularView<Eigen::UnitLower>()) << endl; +// FIXME need to implement output for triangularViews (Bug 885) diff --git a/doc/snippets/Triangular_solve.cpp b/doc/snippets/Triangular_solve.cpp new file mode 100644 index 000000000..548442467 --- /dev/null +++ b/doc/snippets/Triangular_solve.cpp @@ -0,0 +1,11 @@ +Matrix3d m = Matrix3d::Zero(); +m.triangularView<Eigen::Upper>().setOnes(); +cout << "Here is the matrix m:\n" << m << endl; +Matrix3d n = Matrix3d::Ones(); +n.triangularView<Eigen::Lower>() *= 2; +cout << "Here is the matrix n:\n" << n << endl; +cout << "And now here is m.inverse()*n, taking advantage of the fact that" + " m is upper-triangular:\n" + << m.triangularView<Eigen::Upper>().solve(n) << endl; +cout << "And this is n*m.inverse():\n" + << m.triangularView<Eigen::Upper>().solve<Eigen::OnTheRight>(n); |