From 7ea821d18e6b1294acf170b805c3c132c47f2f77 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Thu, 28 Aug 2008 21:44:56 +0000 Subject: spelling + some krazy directives --- .krazy | 1 + Eigen/src/Core/CacheFriendlyProduct.h | 2 +- Eigen/src/Core/GenericPacketMath.h | 2 +- Eigen/src/Core/IO.h | 4 ++-- Eigen/src/Core/SolveTriangular.h | 2 +- Eigen/src/Core/util/Constants.h | 2 +- Eigen/src/Core/util/Memory.h | 2 +- Eigen/src/Geometry/Quaternion.h | 2 +- Eigen/src/Geometry/Transform.h | 7 +++++++ Eigen/src/QR/Tridiagonalization.h | 4 ++-- Eigen/src/Sparse/HashMatrix.h | 2 +- Eigen/src/Sparse/SparseProduct.h | 4 ++-- disabled/ompbenchmark.cpp | 2 +- doc/examples/Tutorial_simple_example_fixed_size.cpp | 2 +- doc/snippets/.krazy | 1 + doc/snippets/MatrixBase_set.cpp | 2 +- doc/snippets/PartialRedux_maxCoeff.cpp | 2 +- doc/snippets/PartialRedux_minCoeff.cpp | 2 +- doc/snippets/PartialRedux_norm.cpp | 2 +- doc/snippets/PartialRedux_sum.cpp | 2 +- doc/snippets/Tutorial_commainit_01.cpp | 2 +- doc/snippets/Tutorial_commainit_02.cpp | 2 +- doc/tutorial.cpp | 2 +- test/geometry.cpp | 1 + 24 files changed, 33 insertions(+), 23 deletions(-) create mode 100644 .krazy create mode 100644 doc/snippets/.krazy diff --git a/.krazy b/.krazy new file mode 100644 index 000000000..cee8846bb --- /dev/null +++ b/.krazy @@ -0,0 +1 @@ +IGNORESUBS disabled,bench,build \ No newline at end of file diff --git a/Eigen/src/Core/CacheFriendlyProduct.h b/Eigen/src/Core/CacheFriendlyProduct.h index ff8314aa3..ac1114668 100644 --- a/Eigen/src/Core/CacheFriendlyProduct.h +++ b/Eigen/src/Core/CacheFriendlyProduct.h @@ -490,7 +490,7 @@ static EIGEN_DONT_INLINE void ei_cache_friendly_product_colmajor_times_vector( break; } } - } // end explit vectorization + } // end explicit vectorization /* process remaining coeffs (or all if there is no explicit vectorization) */ for (int j=alignedSize; j::solveTriangularInPlace(MatrixBase& other * Therefore, if \a other is not needed anymore, it is quite faster to call solveTriangularInPlace() * instead of solveTriangular(). * - * For users comming from BLAS, this function (and more specifically solveTriangularInPlace()) offer + * For users coming from BLAS, this function (and more specifically solveTriangularInPlace()) offer * all the operations supported by the \c *TRSV and \c *TRSM BLAS routines. * * \b Tips: to perform a \em "right-inverse-multiply" you can simply transpose the operation, e.g.: diff --git a/Eigen/src/Core/util/Constants.h b/Eigen/src/Core/util/Constants.h index 3090dad19..7aa626f95 100644 --- a/Eigen/src/Core/util/Constants.h +++ b/Eigen/src/Core/util/Constants.h @@ -181,7 +181,7 @@ enum DirectionType { Vertical, Horizontal }; enum ProductEvaluationMode { NormalProduct, CacheFriendlyProduct, DiagonalProduct, SparseProduct }; enum { - /** \internal Equivalent to a slice vectorization for fixed-size matrices having good alignement + /** \internal Equivalent to a slice vectorization for fixed-size matrices having good alignment * and good size */ InnerVectorization, /** \internal Vectorization path using a single loop plus scalar loops for the diff --git a/Eigen/src/Core/util/Memory.h b/Eigen/src/Core/util/Memory.h index 24ae4b509..fc99962e9 100644 --- a/Eigen/src/Core/util/Memory.h +++ b/Eigen/src/Core/util/Memory.h @@ -44,7 +44,7 @@ template struct ei_aligned_array T array[Size]; }; -/** \internal allocates \a size * sizeof(\a T) bytes with a 16 bytes based alignement */ +/** \internal allocates \a size * sizeof(\a T) bytes with a 16 bytes based alignment */ template inline T* ei_aligned_malloc(size_t size) { diff --git a/Eigen/src/Geometry/Quaternion.h b/Eigen/src/Geometry/Quaternion.h index a0d32bec8..483d4c0d7 100644 --- a/Eigen/src/Geometry/Quaternion.h +++ b/Eigen/src/Geometry/Quaternion.h @@ -322,7 +322,7 @@ inline Quaternion& Quaternion::setFromTwoVectors(const MatrixBas template inline Quaternion Quaternion::inverse() const { - // FIXME should this funtion be called multiplicativeInverse and conjugate() be called inverse() or opposite() ?? + // FIXME should this function be called multiplicativeInverse and conjugate() be called inverse() or opposite() ?? Scalar n2 = this->norm2(); if (n2 > 0) return Quaternion(conjugate().coeffs() / n2); diff --git a/Eigen/src/Geometry/Transform.h b/Eigen/src/Geometry/Transform.h index 9caaa2418..1d4efb7be 100644 --- a/Eigen/src/Geometry/Transform.h +++ b/Eigen/src/Geometry/Transform.h @@ -127,6 +127,13 @@ public: inline QMatrix toQMatrix(void) const; #endif + /** shortcut for m_matrix(row,col); + * \sa MatrixBase::operaror(int,int) const */ + Scalar operator() (int row, int col) const { return m_matrix(row,col); } + /** shortcut for m_matrix(row,col); + * \sa MatrixBase::operaror(int,int) */ + Scalar& operator() (int row, int col) { return m_matrix(row,col); } + /** \returns a read-only expression of the transformation matrix */ inline const MatrixType& matrix() const { return m_matrix; } /** \returns a writable expression of the transformation matrix */ diff --git a/Eigen/src/QR/Tridiagonalization.h b/Eigen/src/QR/Tridiagonalization.h index c0e70d08f..02d376c7a 100755 --- a/Eigen/src/QR/Tridiagonalization.h +++ b/Eigen/src/QR/Tridiagonalization.h @@ -263,7 +263,7 @@ void Tridiagonalization::_compute(MatrixType& matA, CoeffVectorType& /* end optimized selfadjoint - vector product */ /* Another interesting note: the above rank-2 update is much slower than the following hand written loop. - * After an analyse of the ASM, it seems GCC (4.2) generate poor code because of the Block. Moreover, + * After an analyze of the ASM, it seems GCC (4.2) generate poor code because of the Block. Moreover, * if we remove the specialization of Block for Matrix then it is even worse, much worse ! */ #ifdef EIGEN_NEVER_DEFINED for (int j1=i+1; j1::_compute(MatrixType& matA, CoeffVectorType& matA.coeffRef(i1,j1) -= matA.coeff(i1,i)*ei_conj(hCoeffs.coeff(j1-1)) + hCoeffs.coeff(i1-1)*ei_conj(matA.coeff(j1,i)); } - /* end optimized implemenation */ + /* end optimized implementation */ // note: at that point matA(i+1,i+1) is the (i+1)-th element of the final diagonal // note: the sequence of the beta values leads to the subdiagonal entries diff --git a/Eigen/src/Sparse/HashMatrix.h b/Eigen/src/Sparse/HashMatrix.h index 0017d1998..47c673c61 100644 --- a/Eigen/src/Sparse/HashMatrix.h +++ b/Eigen/src/Sparse/HashMatrix.h @@ -76,7 +76,7 @@ class HashMatrix public: - inline void startFill(int /*reserveSize = 1000 --- currenty unused, don't generate a warning*/) {} + inline void startFill(int /*reserveSize = 1000 --- currently unused, don't generate a warning*/) {} inline Scalar& fill(int row, int col) { return coeffRef(row, col); } diff --git a/Eigen/src/Sparse/SparseProduct.h b/Eigen/src/Sparse/SparseProduct.h index e1659c49e..b19cb87da 100644 --- a/Eigen/src/Sparse/SparseProduct.h +++ b/Eigen/src/Sparse/SparseProduct.h @@ -297,11 +297,11 @@ struct ei_sparse_product_selector // static void run(const Lhs& lhs, const Rhs& rhs, ResultType& res) // { // // trivial product as lhs.row/rhs.col dot products -// // loop over the prefered order of the result +// // loop over the preferred order of the result // } // }; -// NOTE the 2 others cases (col row *) must never occurs since they are catched +// NOTE the 2 others cases (col row *) must never occurs since they are caught // by ProductReturnType which transform it to (col col *) by evaluating rhs. diff --git a/disabled/ompbenchmark.cpp b/disabled/ompbenchmark.cpp index ac5155cb8..704375b0d 100644 --- a/disabled/ompbenchmark.cpp +++ b/disabled/ompbenchmark.cpp @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { - // disbale floating point exceptions + // disable floating point exceptions // this leads to more stable bench results { int aux; diff --git a/doc/examples/Tutorial_simple_example_fixed_size.cpp b/doc/examples/Tutorial_simple_example_fixed_size.cpp index 6dd7ebf90..71bf1bafb 100644 --- a/doc/examples/Tutorial_simple_example_fixed_size.cpp +++ b/doc/examples/Tutorial_simple_example_fixed_size.cpp @@ -11,4 +11,4 @@ int main(int, char *[]) Vector4i v4(1, 2, 3, 4); std::cout << "m3\n" << m3 << "\nm4:\n" << m4 << "\nv4:\n" << v4 << std::endl; -} \ No newline at end of file +} diff --git a/doc/snippets/.krazy b/doc/snippets/.krazy new file mode 100644 index 000000000..60f6bcaf3 --- /dev/null +++ b/doc/snippets/.krazy @@ -0,0 +1 @@ +EXCLUDE copyright,license \ No newline at end of file diff --git a/doc/snippets/MatrixBase_set.cpp b/doc/snippets/MatrixBase_set.cpp index 9487008db..50ecf5fb9 100644 --- a/doc/snippets/MatrixBase_set.cpp +++ b/doc/snippets/MatrixBase_set.cpp @@ -10,4 +10,4 @@ Vector2i v1; v1 << 14, 15; m2 << v1.transpose(), 16, v1, m1.block(1,1,2,2); -cout << m2 << endl; \ No newline at end of file +cout << m2 << endl; diff --git a/doc/snippets/PartialRedux_maxCoeff.cpp b/doc/snippets/PartialRedux_maxCoeff.cpp index ff1a7ebdb..e8fd3820d 100644 --- a/doc/snippets/PartialRedux_maxCoeff.cpp +++ b/doc/snippets/PartialRedux_maxCoeff.cpp @@ -1,3 +1,3 @@ Matrix3d m = Matrix3d::Random(); cout << "Here is the matrix m:" << endl << m << endl; -cout << "Here is the maximum of each column:" << endl << m.colwise().maxCoeff() << endl; \ No newline at end of file +cout << "Here is the maximum of each column:" << endl << m.colwise().maxCoeff() << endl; diff --git a/doc/snippets/PartialRedux_minCoeff.cpp b/doc/snippets/PartialRedux_minCoeff.cpp index 1256cee5e..d717bc0d1 100644 --- a/doc/snippets/PartialRedux_minCoeff.cpp +++ b/doc/snippets/PartialRedux_minCoeff.cpp @@ -1,3 +1,3 @@ Matrix3d m = Matrix3d::Random(); cout << "Here is the matrix m:" << endl << m << endl; -cout << "Here is the minimum of each column:" << endl << m.colwise().minCoeff() << endl; \ No newline at end of file +cout << "Here is the minimum of each column:" << endl << m.colwise().minCoeff() << endl; diff --git a/doc/snippets/PartialRedux_norm.cpp b/doc/snippets/PartialRedux_norm.cpp index 46f26f715..dbcf290a0 100644 --- a/doc/snippets/PartialRedux_norm.cpp +++ b/doc/snippets/PartialRedux_norm.cpp @@ -1,3 +1,3 @@ Matrix3d m = Matrix3d::Random(); cout << "Here is the matrix m:" << endl << m << endl; -cout << "Here is the norm of each column:" << endl << m.colwise().norm() << endl; \ No newline at end of file +cout << "Here is the norm of each column:" << endl << m.colwise().norm() << endl; diff --git a/doc/snippets/PartialRedux_sum.cpp b/doc/snippets/PartialRedux_sum.cpp index dfd0eb9a9..ec82d3e41 100644 --- a/doc/snippets/PartialRedux_sum.cpp +++ b/doc/snippets/PartialRedux_sum.cpp @@ -1,3 +1,3 @@ Matrix3d m = Matrix3d::Random(); cout << "Here is the matrix m:" << endl << m << endl; -cout << "Here is the sum of each row:" << endl << m.rowwise().sum() << endl; \ No newline at end of file +cout << "Here is the sum of each row:" << endl << m.rowwise().sum() << endl; diff --git a/doc/snippets/Tutorial_commainit_01.cpp b/doc/snippets/Tutorial_commainit_01.cpp index f0a51509a..e3098cedb 100644 --- a/doc/snippets/Tutorial_commainit_01.cpp +++ b/doc/snippets/Tutorial_commainit_01.cpp @@ -2,4 +2,4 @@ Matrix3f m; m << 1, 2, 3, 4, 5, 6, 7, 8, 9; -cout << m; \ No newline at end of file +cout << m; diff --git a/doc/snippets/Tutorial_commainit_02.cpp b/doc/snippets/Tutorial_commainit_02.cpp index 6ffea9105..c960d6ab5 100644 --- a/doc/snippets/Tutorial_commainit_02.cpp +++ b/doc/snippets/Tutorial_commainit_02.cpp @@ -4,4 +4,4 @@ m << (Matrix3f() << 1, 2, 3, 4, 5, 6, 7, 8, 9).finished(), MatrixXf::Zero(3,cols-3), MatrixXf::Zero(rows-3,3), MatrixXf::Identity(rows-3,cols-3); -cout << m; \ No newline at end of file +cout << m; diff --git a/doc/tutorial.cpp b/doc/tutorial.cpp index 941a80c1a..6d3eb8bc2 100644 --- a/doc/tutorial.cpp +++ b/doc/tutorial.cpp @@ -59,4 +59,4 @@ int main(int argc, char *argv[]) m4 = m4 * m4.transpose().eval(); // forces immediate evaluation of the transpose std::cout << "*** Step 8 ***\nm3:\n" << m3 << "\nm4:\n" << m4 << std::endl; -} \ No newline at end of file +} diff --git a/test/geometry.cpp b/test/geometry.cpp index 2bfdb04b4..da99c86ac 100644 --- a/test/geometry.cpp +++ b/test/geometry.cpp @@ -152,6 +152,7 @@ template void geometry(void) t1.fromPositionOrientationScale(v0, q1, v1); VERIFY_IS_APPROX(t1.matrix(), t0.matrix()); + VERIFY_IS_APPROX(t1*v1, t0*v1); // 2D transformation Transform2 t20, t21; -- cgit v1.2.3