Remove local Index typedef from unit-tests
diff --git a/test/adjoint.cpp b/test/adjoint.cpp index bdea51c..37032d2 100644 --- a/test/adjoint.cpp +++ b/test/adjoint.cpp
@@ -70,7 +70,6 @@ Transpose.h Conjugate.h Dot.h */ using std::abs; - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType;
diff --git a/test/array.cpp b/test/array.cpp index f7f3ba7..7e228ed 100644 --- a/test/array.cpp +++ b/test/array.cpp
@@ -11,7 +11,6 @@ template<typename ArrayType> void array(const ArrayType& m) { - typedef typename ArrayType::Index Index; typedef typename ArrayType::Scalar Scalar; typedef typename ArrayType::RealScalar RealScalar; typedef Array<Scalar, ArrayType::RowsAtCompileTime, 1> ColVectorType; @@ -130,7 +129,6 @@ template<typename ArrayType> void comparisons(const ArrayType& m) { using std::abs; - typedef typename ArrayType::Index Index; typedef typename ArrayType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; @@ -197,7 +195,7 @@ RealScalar a = m1.abs().mean(); VERIFY( (m1<-a || m1>a).count() == (m1.abs()>a).count()); - typedef Array<typename ArrayType::Index, Dynamic, 1> ArrayOfIndices; + typedef Array<Index, Dynamic, 1> ArrayOfIndices; // TODO allows colwise/rowwise for array VERIFY_IS_APPROX(((m1.abs()+1)>RealScalar(0.1)).colwise().count(), ArrayOfIndices::Constant(cols,rows).transpose()); @@ -208,7 +206,6 @@ { using std::abs; using std::sqrt; - typedef typename ArrayType::Index Index; typedef typename ArrayType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; @@ -322,7 +319,6 @@ template<typename ArrayType> void array_complex(const ArrayType& m) { - typedef typename ArrayType::Index Index; typedef typename ArrayType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; @@ -427,7 +423,6 @@ template<typename ArrayType> void min_max(const ArrayType& m) { - typedef typename ArrayType::Index Index; typedef typename ArrayType::Scalar Scalar; Index rows = m.rows();
diff --git a/test/array_for_matrix.cpp b/test/array_for_matrix.cpp index b872139..3dc5dc4 100644 --- a/test/array_for_matrix.cpp +++ b/test/array_for_matrix.cpp
@@ -11,7 +11,6 @@ template<typename MatrixType> void array_for_matrix(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> ColVectorType; typedef Matrix<Scalar, 1, MatrixType::ColsAtCompileTime> RowVectorType; @@ -83,7 +82,6 @@ template<typename MatrixType> void comparisons(const MatrixType& m) { using std::abs; - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; @@ -140,7 +138,7 @@ RealScalar a = m1.cwiseAbs().mean(); VERIFY( ((m1.array()<-a).matrix() || (m1.array()>a).matrix()).count() == (m1.cwiseAbs().array()>a).count()); - typedef Matrix<typename MatrixType::Index, Dynamic, 1> VectorOfIndices; + typedef Matrix<Index, Dynamic, 1> VectorOfIndices; // TODO allows colwise/rowwise for array VERIFY_IS_APPROX(((m1.array().abs()+1)>RealScalar(0.1)).matrix().colwise().count(), VectorOfIndices::Constant(cols,rows).transpose()); @@ -172,7 +170,6 @@ template<typename MatrixType> void cwise_min_max(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; Index rows = m.rows(); @@ -211,7 +208,6 @@ template<typename MatrixTraits> void resize(const MatrixTraits& t) { - typedef typename MatrixTraits::Index Index; typedef typename MatrixTraits::Scalar Scalar; typedef Matrix<Scalar,Dynamic,Dynamic> MatrixType; typedef Array<Scalar,Dynamic,Dynamic> Array2DType;
diff --git a/test/array_replicate.cpp b/test/array_replicate.cpp index 779c8fc..0dad5ba 100644 --- a/test/array_replicate.cpp +++ b/test/array_replicate.cpp
@@ -14,7 +14,6 @@ /* this test covers the following files: Replicate.cpp */ - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType; typedef Matrix<Scalar, Dynamic, Dynamic> MatrixX;
diff --git a/test/array_reverse.cpp b/test/array_reverse.cpp index c9d9f90..9d5b9a6 100644 --- a/test/array_reverse.cpp +++ b/test/array_reverse.cpp
@@ -15,7 +15,6 @@ template<typename MatrixType> void reverse(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType;
diff --git a/test/basicstuff.cpp b/test/basicstuff.cpp index c346ce6..0fbeb42 100644 --- a/test/basicstuff.cpp +++ b/test/basicstuff.cpp
@@ -13,7 +13,6 @@ template<typename MatrixType> void basicStuff(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime> SquareMatrixType; @@ -124,22 +123,22 @@ // check automatic transposition sm2.setZero(); - for(typename MatrixType::Index i=0;i<rows;++i) + for(Index i=0;i<rows;++i) sm2.col(i) = sm1.row(i); VERIFY_IS_APPROX(sm2,sm1.transpose()); sm2.setZero(); - for(typename MatrixType::Index i=0;i<rows;++i) + for(Index i=0;i<rows;++i) sm2.col(i).noalias() = sm1.row(i); VERIFY_IS_APPROX(sm2,sm1.transpose()); sm2.setZero(); - for(typename MatrixType::Index i=0;i<rows;++i) + for(Index i=0;i<rows;++i) sm2.col(i).noalias() += sm1.row(i); VERIFY_IS_APPROX(sm2,sm1.transpose()); sm2.setZero(); - for(typename MatrixType::Index i=0;i<rows;++i) + for(Index i=0;i<rows;++i) sm2.col(i).noalias() -= sm1.row(i); VERIFY_IS_APPROX(sm2,-sm1.transpose()); @@ -160,7 +159,6 @@ template<typename MatrixType> void basicStuffComplex(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; typedef Matrix<RealScalar, MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime> RealMatrixType;
diff --git a/test/block.cpp b/test/block.cpp index 0c1d2b7..a45dd50 100644 --- a/test/block.cpp +++ b/test/block.cpp
@@ -39,7 +39,6 @@ template<typename MatrixType> void block(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType; @@ -227,7 +226,6 @@ template<typename MatrixType> void compare_using_data_and_stride(const MatrixType& m) { - typedef typename MatrixType::Index Index; Index rows = m.rows(); Index cols = m.cols(); Index size = m.size(); @@ -261,7 +259,6 @@ template<typename MatrixType> void data_and_stride(const MatrixType& m) { - typedef typename MatrixType::Index Index; Index rows = m.rows(); Index cols = m.cols();
diff --git a/test/cholesky.cpp b/test/cholesky.cpp index b4b6bda..62c391d 100644 --- a/test/cholesky.cpp +++ b/test/cholesky.cpp
@@ -57,7 +57,6 @@ template<typename MatrixType> void cholesky(const MatrixType& m) { - typedef typename MatrixType::Index Index; /* this test covers the following files: LLT.h LDLT.h */ @@ -289,8 +288,6 @@ // test mixing real/scalar types - typedef typename MatrixType::Index Index; - Index rows = m.rows(); Index cols = m.cols();
diff --git a/test/conservative_resize.cpp b/test/conservative_resize.cpp index 498421b..21a1db4 100644 --- a/test/conservative_resize.cpp +++ b/test/conservative_resize.cpp
@@ -17,7 +17,6 @@ void run_matrix_tests() { typedef Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic, Storage> MatrixType; - typedef typename MatrixType::Index Index; MatrixType m, n;
diff --git a/test/corners.cpp b/test/corners.cpp index 3c64c32..32edadb 100644 --- a/test/corners.cpp +++ b/test/corners.cpp
@@ -15,7 +15,6 @@ template<typename MatrixType> void corners(const MatrixType& m) { - typedef typename MatrixType::Index Index; Index rows = m.rows(); Index cols = m.cols();
diff --git a/test/determinant.cpp b/test/determinant.cpp index 758f3af..b8c9bab 100644 --- a/test/determinant.cpp +++ b/test/determinant.cpp
@@ -16,7 +16,6 @@ /* this test covers the following files: Determinant.h */ - typedef typename MatrixType::Index Index; Index size = m.rows(); MatrixType m1(size, size), m2(size, size);
diff --git a/test/diagonal.cpp b/test/diagonal.cpp index 0b5ae82..8ed9b46 100644 --- a/test/diagonal.cpp +++ b/test/diagonal.cpp
@@ -11,7 +11,6 @@ template<typename MatrixType> void diagonal(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; Index rows = m.rows();
diff --git a/test/diagonalmatrices.cpp b/test/diagonalmatrices.cpp index a4ff102..c55733d 100644 --- a/test/diagonalmatrices.cpp +++ b/test/diagonalmatrices.cpp
@@ -11,7 +11,6 @@ using namespace std; template<typename MatrixType> void diagonalmatrices(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; enum { Rows = MatrixType::RowsAtCompileTime, Cols = MatrixType::ColsAtCompileTime }; typedef Matrix<Scalar, Rows, 1> VectorType;
diff --git a/test/dontalign.cpp b/test/dontalign.cpp index 4643cfe..ac00112 100644 --- a/test/dontalign.cpp +++ b/test/dontalign.cpp
@@ -19,7 +19,6 @@ template<typename MatrixType> void dontalign(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::RowsAtCompileTime> SquareMatrixType;
diff --git a/test/eigen2support.cpp b/test/eigen2support.cpp index ad1d980..ac6931a 100644 --- a/test/eigen2support.cpp +++ b/test/eigen2support.cpp
@@ -13,7 +13,6 @@ template<typename MatrixType> void eigen2support(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; Index rows = m.rows();
diff --git a/test/eigensolver_complex.cpp b/test/eigensolver_complex.cpp index 03d5774..8f279dc 100644 --- a/test/eigensolver_complex.cpp +++ b/test/eigensolver_complex.cpp
@@ -71,7 +71,6 @@ template<typename MatrixType> void eigensolver(const MatrixType& m) { - typedef typename MatrixType::Index Index; /* this test covers the following files: ComplexEigenSolver.h, and indirectly ComplexSchur.h */
diff --git a/test/eigensolver_generalized_real.cpp b/test/eigensolver_generalized_real.cpp index 9c0838b..12a15ab 100644 --- a/test/eigensolver_generalized_real.cpp +++ b/test/eigensolver_generalized_real.cpp
@@ -15,7 +15,6 @@ template<typename MatrixType> void generalized_eigensolver_real(const MatrixType& m) { - typedef typename MatrixType::Index Index; /* this test covers the following files: GeneralizedEigenSolver.h */
diff --git a/test/eigensolver_generic.cpp b/test/eigensolver_generic.cpp index d0e644d..07bf65e 100644 --- a/test/eigensolver_generic.cpp +++ b/test/eigensolver_generic.cpp
@@ -14,7 +14,6 @@ template<typename MatrixType> void eigensolver(const MatrixType& m) { - typedef typename MatrixType::Index Index; /* this test covers the following files: EigenSolver.h */
diff --git a/test/eigensolver_selfadjoint.cpp b/test/eigensolver_selfadjoint.cpp index 39ad413..0e39b53 100644 --- a/test/eigensolver_selfadjoint.cpp +++ b/test/eigensolver_selfadjoint.cpp
@@ -68,7 +68,6 @@ template<typename MatrixType> void selfadjointeigensolver(const MatrixType& m) { - typedef typename MatrixType::Index Index; /* this test covers the following files: EigenSolver.h, SelfAdjointEigenSolver.h (and indirectly: Tridiagonalization.h) */
diff --git a/test/geo_alignedbox.cpp b/test/geo_alignedbox.cpp index 223ff5e..87bf114 100644 --- a/test/geo_alignedbox.cpp +++ b/test/geo_alignedbox.cpp
@@ -33,7 +33,6 @@ /* this test covers the following files: AlignedBox.h */ - typedef typename BoxType::Index Index; typedef typename BoxType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; typedef Matrix<Scalar, BoxType::AmbientDimAtCompileTime, 1> VectorType; @@ -95,7 +94,6 @@ void alignedboxCastTests(const BoxType& _box) { // casting - typedef typename BoxType::Index Index; typedef typename BoxType::Scalar Scalar; typedef Matrix<Scalar, BoxType::AmbientDimAtCompileTime, 1> VectorType;
diff --git a/test/geo_hyperplane.cpp b/test/geo_hyperplane.cpp index 2789285..b3a48c5 100644 --- a/test/geo_hyperplane.cpp +++ b/test/geo_hyperplane.cpp
@@ -19,7 +19,6 @@ Hyperplane.h */ using std::abs; - typedef typename HyperplaneType::Index Index; const Index dim = _plane.dim(); enum { Options = HyperplaneType::Options }; typedef typename HyperplaneType::Scalar Scalar;
diff --git a/test/geo_parametrizedline.cpp b/test/geo_parametrizedline.cpp index 29c1b10..14cf4fd 100644 --- a/test/geo_parametrizedline.cpp +++ b/test/geo_parametrizedline.cpp
@@ -19,7 +19,6 @@ ParametrizedLine.h */ using std::abs; - typedef typename LineType::Index Index; const Index dim = _line.dim(); typedef typename LineType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar;
diff --git a/test/householder.cpp b/test/householder.cpp index 78d44d4..ccda468 100644 --- a/test/householder.cpp +++ b/test/householder.cpp
@@ -12,7 +12,6 @@ template<typename MatrixType> void householder(const MatrixType& m) { - typedef typename MatrixType::Index Index; static bool even = true; even = !even; /* this test covers the following files:
diff --git a/test/integer_types.cpp b/test/integer_types.cpp index 2512631..3629559 100644 --- a/test/integer_types.cpp +++ b/test/integer_types.cpp
@@ -18,7 +18,6 @@ template<typename MatrixType> void signed_integer_type_tests(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; enum { is_signed = (Scalar(-1) > Scalar(0)) ? 0 : 1 }; @@ -49,7 +48,6 @@ template<typename MatrixType> void integer_type_tests(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; VERIFY(NumTraits<Scalar>::IsInteger);
diff --git a/test/inverse.cpp b/test/inverse.cpp index 97fe6ff..be607cc 100644 --- a/test/inverse.cpp +++ b/test/inverse.cpp
@@ -14,7 +14,6 @@ template<typename MatrixType> void inverse(const MatrixType& m) { using std::abs; - typedef typename MatrixType::Index Index; /* this test covers the following files: Inverse.h */
diff --git a/test/jacobi.cpp b/test/jacobi.cpp index 7ccd412..319e476 100644 --- a/test/jacobi.cpp +++ b/test/jacobi.cpp
@@ -14,7 +14,6 @@ template<typename MatrixType, typename JacobiScalar> void jacobi(const MatrixType& m = MatrixType()) { - typedef typename MatrixType::Index Index; Index rows = m.rows(); Index cols = m.cols();
diff --git a/test/jacobisvd.cpp b/test/jacobisvd.cpp index 7f5f715..72007bf 100644 --- a/test/jacobisvd.cpp +++ b/test/jacobisvd.cpp
@@ -36,7 +36,6 @@ template<typename MatrixType> void jacobisvd_verify_assert(const MatrixType& m) { svd_verify_assert<JacobiSVD<MatrixType> >(m); - typedef typename MatrixType::Index Index; Index rows = m.rows(); Index cols = m.cols();
diff --git a/test/linearstructure.cpp b/test/linearstructure.cpp index 17474af..b6559b2 100644 --- a/test/linearstructure.cpp +++ b/test/linearstructure.cpp
@@ -19,7 +19,6 @@ /* this test covers the following files: CwiseUnaryOp.h, CwiseBinaryOp.h, SelfCwiseBinaryOp.h */ - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar;
diff --git a/test/lu.cpp b/test/lu.cpp index 9787f4d..cad703d 100644 --- a/test/lu.cpp +++ b/test/lu.cpp
@@ -18,7 +18,6 @@ template<typename MatrixType> void lu_non_invertible() { - typedef typename MatrixType::Index Index; typedef typename MatrixType::RealScalar RealScalar; /* this test covers the following files: LU.h @@ -181,7 +180,6 @@ /* this test covers the following files: PartialPivLU.h */ - typedef typename MatrixType::Index Index; typedef typename NumTraits<typename MatrixType::Scalar>::Real RealScalar; Index size = internal::random<Index>(1,4);
diff --git a/test/mapped_matrix.cpp b/test/mapped_matrix.cpp index 7b9e1fe..a530fab 100644 --- a/test/mapped_matrix.cpp +++ b/test/mapped_matrix.cpp
@@ -17,7 +17,6 @@ template<typename VectorType> void map_class_vector(const VectorType& m) { - typedef typename VectorType::Index Index; typedef typename VectorType::Scalar Scalar; Index size = m.size(); @@ -51,7 +50,6 @@ template<typename MatrixType> void map_class_matrix(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; Index rows = m.rows(), cols = m.cols(), size = rows*cols; @@ -121,7 +119,6 @@ template<typename VectorType> void map_static_methods(const VectorType& m) { - typedef typename VectorType::Index Index; typedef typename VectorType::Scalar Scalar; Index size = m.size(); @@ -163,7 +160,6 @@ void map_not_aligned_on_scalar() { typedef Matrix<Scalar,Dynamic,Dynamic> MatrixType; - typedef typename MatrixType::Index Index; Index size = 11; Scalar* array1 = internal::aligned_new<Scalar>((size+1)*(size+1)+1); Scalar* array2 = reinterpret_cast<Scalar*>(sizeof(Scalar)/2+std::size_t(array1));
diff --git a/test/mapstaticmethods.cpp b/test/mapstaticmethods.cpp index 06272d1..8156ca9 100644 --- a/test/mapstaticmethods.cpp +++ b/test/mapstaticmethods.cpp
@@ -69,7 +69,6 @@ { static void run(const PlainObjectType& m) { - typedef typename PlainObjectType::Index Index; Index rows = m.rows(), cols = m.cols(); int i = internal::random<int>(2,5), j = internal::random<int>(2,5); @@ -116,7 +115,6 @@ { static void run(const PlainObjectType& v) { - typedef typename PlainObjectType::Index Index; Index size = v.size(); int i = internal::random<int>(2,5);
diff --git a/test/mapstride.cpp b/test/mapstride.cpp index de77dc5..d785148 100644 --- a/test/mapstride.cpp +++ b/test/mapstride.cpp
@@ -11,7 +11,6 @@ template<int Alignment,typename VectorType> void map_class_vector(const VectorType& m) { - typedef typename VectorType::Index Index; typedef typename VectorType::Scalar Scalar; Index size = m.size(); @@ -50,7 +49,6 @@ template<int Alignment,typename MatrixType> void map_class_matrix(const MatrixType& _m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; Index rows = _m.rows(), cols = _m.cols();
diff --git a/test/miscmatrices.cpp b/test/miscmatrices.cpp index ef20dc7..f17291c 100644 --- a/test/miscmatrices.cpp +++ b/test/miscmatrices.cpp
@@ -14,7 +14,6 @@ /* this test covers the following files: DiagonalMatrix.h Ones.h */ - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType; Index rows = m.rows();
diff --git a/test/nomalloc.cpp b/test/nomalloc.cpp index 50756c2..d1ca79d 100644 --- a/test/nomalloc.cpp +++ b/test/nomalloc.cpp
@@ -24,7 +24,6 @@ { /* this test check no dynamic memory allocation are issued with fixed-size matrices */ - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; Index rows = m.rows(); @@ -173,7 +172,7 @@ typedef typename MatrixType::Scalar Scalar; enum { Flag = MatrixType::IsRowMajor ? Eigen::RowMajor : Eigen::ColMajor}; enum { TransposeFlag = !MatrixType::IsRowMajor ? Eigen::RowMajor : Eigen::ColMajor}; - typename MatrixType::Index rows = m.rows(), cols=m.cols(); + Index rows = m.rows(), cols=m.cols(); typedef Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic, Flag > MatrixX; typedef Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic, TransposeFlag> MatrixXT; // Dynamic reference:
diff --git a/test/permutationmatrices.cpp b/test/permutationmatrices.cpp index b2229cf..e885f0e 100644 --- a/test/permutationmatrices.cpp +++ b/test/permutationmatrices.cpp
@@ -14,7 +14,6 @@ using namespace std; template<typename MatrixType> void permutationmatrices(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; enum { Rows = MatrixType::RowsAtCompileTime, Cols = MatrixType::ColsAtCompileTime, Options = MatrixType::Options };
diff --git a/test/product_extra.cpp b/test/product_extra.cpp index e2b855b..de2709d 100644 --- a/test/product_extra.cpp +++ b/test/product_extra.cpp
@@ -11,7 +11,6 @@ template<typename MatrixType> void product_extra(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Matrix<Scalar, 1, Dynamic> RowVectorType; typedef Matrix<Scalar, Dynamic, 1> ColVectorType;
diff --git a/test/product_notemporary.cpp b/test/product_notemporary.cpp index 062180f..b90165b 100644 --- a/test/product_notemporary.cpp +++ b/test/product_notemporary.cpp
@@ -15,7 +15,6 @@ { /* This test checks the number of temporaries created * during the evaluation of a complex expression */ - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar; typedef Matrix<Scalar, 1, Dynamic> RowVectorType;
diff --git a/test/product_selfadjoint.cpp b/test/product_selfadjoint.cpp index 3d768aa..88d6839 100644 --- a/test/product_selfadjoint.cpp +++ b/test/product_selfadjoint.cpp
@@ -11,7 +11,6 @@ template<typename MatrixType> void product_selfadjoint(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType; typedef Matrix<Scalar, 1, MatrixType::RowsAtCompileTime> RowVectorType;
diff --git a/test/product_symm.cpp b/test/product_symm.cpp index 8c44383..7d1042a 100644 --- a/test/product_symm.cpp +++ b/test/product_symm.cpp
@@ -16,7 +16,6 @@ typedef Matrix<Scalar, OtherSize, Size> Rhs2; enum { order = OtherSize==1 ? 0 : RowMajor }; typedef Matrix<Scalar, Size, OtherSize,order> Rhs3; - typedef typename MatrixType::Index Index; Index rows = size; Index cols = size;
diff --git a/test/product_syrk.cpp b/test/product_syrk.cpp index e10f0f2..3ebbe14 100644 --- a/test/product_syrk.cpp +++ b/test/product_syrk.cpp
@@ -11,7 +11,6 @@ template<typename MatrixType> void syrk(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime, RowMajor> RMatrixType; typedef Matrix<Scalar, MatrixType::ColsAtCompileTime, Dynamic> Rhs1;
diff --git a/test/product_trmv.cpp b/test/product_trmv.cpp index 57a202a..65d66e5 100644 --- a/test/product_trmv.cpp +++ b/test/product_trmv.cpp
@@ -11,7 +11,6 @@ template<typename MatrixType> void trmv(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> VectorType;
diff --git a/test/qr.cpp b/test/qr.cpp index 00ef99e..02e3ed7 100644 --- a/test/qr.cpp +++ b/test/qr.cpp
@@ -12,8 +12,6 @@ template<typename MatrixType> void qr(const MatrixType& m) { - typedef typename MatrixType::Index Index; - Index rows = m.rows(); Index cols = m.cols();
diff --git a/test/qr_colpivoting.cpp b/test/qr_colpivoting.cpp index 26ed27f..96c0bad 100644 --- a/test/qr_colpivoting.cpp +++ b/test/qr_colpivoting.cpp
@@ -14,8 +14,6 @@ template <typename MatrixType> void cod() { - typedef typename MatrixType::Index Index; - Index rows = internal::random<Index>(2, EIGEN_TEST_MAX_SIZE); Index cols = internal::random<Index>(2, EIGEN_TEST_MAX_SIZE); Index cols2 = internal::random<Index>(2, EIGEN_TEST_MAX_SIZE); @@ -94,7 +92,6 @@ template<typename MatrixType> void qr() { using std::sqrt; - typedef typename MatrixType::Index Index; Index rows = internal::random<Index>(2,EIGEN_TEST_MAX_SIZE), cols = internal::random<Index>(2,EIGEN_TEST_MAX_SIZE), cols2 = internal::random<Index>(2,EIGEN_TEST_MAX_SIZE); Index rank = internal::random<Index>(1, (std::min)(rows, cols)-1); @@ -211,7 +208,6 @@ { using std::sqrt; using std::abs; - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar;
diff --git a/test/qr_fullpivoting.cpp b/test/qr_fullpivoting.cpp index 3d9acce..c270edf 100644 --- a/test/qr_fullpivoting.cpp +++ b/test/qr_fullpivoting.cpp
@@ -13,8 +13,6 @@ template<typename MatrixType> void qr() { - typedef typename MatrixType::Index Index; - static const int Rows = MatrixType::RowsAtCompileTime, Cols = MatrixType::ColsAtCompileTime; Index max_size = EIGEN_TEST_MAX_SIZE; Index min_size = numext::maxi(1,EIGEN_TEST_MAX_SIZE/10);
diff --git a/test/qtvector.cpp b/test/qtvector.cpp index 2be885e..22df0d5 100644 --- a/test/qtvector.cpp +++ b/test/qtvector.cpp
@@ -18,8 +18,6 @@ template<typename MatrixType> void check_qtvector_matrix(const MatrixType& m) { - typedef typename MatrixType::Index Index; - Index rows = m.rows(); Index cols = m.cols(); MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols);
diff --git a/test/real_qz.cpp b/test/real_qz.cpp index 99ac312..3c1492e 100644 --- a/test/real_qz.cpp +++ b/test/real_qz.cpp
@@ -18,7 +18,6 @@ RealQZ.h */ using std::abs; - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; Index dim = m.cols();
diff --git a/test/redux.cpp b/test/redux.cpp index 2bade37..213f080 100644 --- a/test/redux.cpp +++ b/test/redux.cpp
@@ -16,7 +16,6 @@ template<typename MatrixType> void matrixRedux(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar; @@ -81,7 +80,6 @@ template<typename VectorType> void vectorRedux(const VectorType& w) { using std::abs; - typedef typename VectorType::Index Index; typedef typename VectorType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; Index size = w.size();
diff --git a/test/ref.cpp b/test/ref.cpp index 9dd2c04..704495a 100644 --- a/test/ref.cpp +++ b/test/ref.cpp
@@ -32,7 +32,6 @@ template<typename MatrixType> void ref_matrix(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar; typedef Matrix<Scalar,Dynamic,Dynamic,MatrixType::Options> DynMatrixType; @@ -80,7 +79,6 @@ template<typename VectorType> void ref_vector(const VectorType& m) { - typedef typename VectorType::Index Index; typedef typename VectorType::Scalar Scalar; typedef typename VectorType::RealScalar RealScalar; typedef Matrix<Scalar,Dynamic,1,VectorType::Options> DynMatrixType;
diff --git a/test/schur_real.cpp b/test/schur_real.cpp index 4aede87..e5229e6 100644 --- a/test/schur_real.cpp +++ b/test/schur_real.cpp
@@ -13,8 +13,6 @@ template<typename MatrixType> void verifyIsQuasiTriangular(const MatrixType& T) { - typedef typename MatrixType::Index Index; - const Index size = T.cols(); typedef typename MatrixType::Scalar Scalar;
diff --git a/test/selfadjoint.cpp b/test/selfadjoint.cpp index aaa4888..bb11cc3 100644 --- a/test/selfadjoint.cpp +++ b/test/selfadjoint.cpp
@@ -15,7 +15,6 @@ template<typename MatrixType> void selfadjoint(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; Index rows = m.rows();
diff --git a/test/sizeof.cpp b/test/sizeof.cpp index 03ad204..e552bae 100644 --- a/test/sizeof.cpp +++ b/test/sizeof.cpp
@@ -15,7 +15,7 @@ if (MatrixType::RowsAtCompileTime!=Dynamic && MatrixType::ColsAtCompileTime!=Dynamic) VERIFY_IS_EQUAL(std::ptrdiff_t(sizeof(MatrixType)),std::ptrdiff_t(sizeof(Scalar))*std::ptrdiff_t(MatrixType::SizeAtCompileTime)); else - VERIFY_IS_EQUAL(sizeof(MatrixType),sizeof(Scalar*) + 2 * sizeof(typename MatrixType::Index)); + VERIFY_IS_EQUAL(sizeof(MatrixType),sizeof(Scalar*) + 2 * sizeof(Index)); } void test_sizeof()
diff --git a/test/stable_norm.cpp b/test/stable_norm.cpp index 0dcf072..255cae9 100644 --- a/test/stable_norm.cpp +++ b/test/stable_norm.cpp
@@ -21,7 +21,6 @@ */ using std::sqrt; using std::abs; - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar;
diff --git a/test/stddeque.cpp b/test/stddeque.cpp index bb4b476..b511c4e 100644 --- a/test/stddeque.cpp +++ b/test/stddeque.cpp
@@ -15,8 +15,6 @@ template<typename MatrixType> void check_stddeque_matrix(const MatrixType& m) { - typedef typename MatrixType::Index Index; - Index rows = m.rows(); Index cols = m.cols(); MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols);
diff --git a/test/stddeque_overload.cpp b/test/stddeque_overload.cpp index 4da618b..0541bc1 100644 --- a/test/stddeque_overload.cpp +++ b/test/stddeque_overload.cpp
@@ -28,8 +28,8 @@ template<typename MatrixType> void check_stddeque_matrix(const MatrixType& m) { - typename MatrixType::Index rows = m.rows(); - typename MatrixType::Index cols = m.cols(); + Index rows = m.rows(); + Index cols = m.cols(); MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols); std::deque<MatrixType> v(10, MatrixType(rows,cols)), w(20, y); v[5] = x;
diff --git a/test/stdlist.cpp b/test/stdlist.cpp index 17cce77..23cbe90 100644 --- a/test/stdlist.cpp +++ b/test/stdlist.cpp
@@ -15,8 +15,6 @@ template<typename MatrixType> void check_stdlist_matrix(const MatrixType& m) { - typedef typename MatrixType::Index Index; - Index rows = m.rows(); Index cols = m.cols(); MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols);
diff --git a/test/stdlist_overload.cpp b/test/stdlist_overload.cpp index bb910bd..386124a 100644 --- a/test/stdlist_overload.cpp +++ b/test/stdlist_overload.cpp
@@ -44,8 +44,8 @@ template<typename MatrixType> void check_stdlist_matrix(const MatrixType& m) { - typename MatrixType::Index rows = m.rows(); - typename MatrixType::Index cols = m.cols(); + Index rows = m.rows(); + Index cols = m.cols(); MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols); std::list<MatrixType> v(10, MatrixType(rows,cols)), w(20, y); typename std::list<MatrixType>::iterator itv = get(v, 5);
diff --git a/test/stdvector.cpp b/test/stdvector.cpp index 50cb334..cf36468 100644 --- a/test/stdvector.cpp +++ b/test/stdvector.cpp
@@ -14,8 +14,8 @@ template<typename MatrixType> void check_stdvector_matrix(const MatrixType& m) { - typename MatrixType::Index rows = m.rows(); - typename MatrixType::Index cols = m.cols(); + Index rows = m.rows(); + Index cols = m.cols(); MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols); std::vector<MatrixType,Eigen::aligned_allocator<MatrixType> > v(10, MatrixType(rows,cols)), w(20, y); v[5] = x;
diff --git a/test/stdvector_overload.cpp b/test/stdvector_overload.cpp index 9596659..0c86ce8 100644 --- a/test/stdvector_overload.cpp +++ b/test/stdvector_overload.cpp
@@ -28,8 +28,8 @@ template<typename MatrixType> void check_stdvector_matrix(const MatrixType& m) { - typename MatrixType::Index rows = m.rows(); - typename MatrixType::Index cols = m.cols(); + Index rows = m.rows(); + Index cols = m.cols(); MatrixType x = MatrixType::Random(rows,cols), y = MatrixType::Random(rows,cols); std::vector<MatrixType> v(10, MatrixType(rows,cols)), w(20, y); v[5] = x;
diff --git a/test/svd_common.h b/test/svd_common.h index 605d5df..cba0665 100644 --- a/test/svd_common.h +++ b/test/svd_common.h
@@ -23,7 +23,6 @@ template<typename SvdType, typename MatrixType> void svd_check_full(const MatrixType& m, const SvdType& svd) { - typedef typename MatrixType::Index Index; Index rows = m.rows(); Index cols = m.cols(); @@ -101,7 +100,6 @@ { typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar; - typedef typename MatrixType::Index Index; Index rows = m.rows(); Index cols = m.cols(); @@ -168,7 +166,6 @@ void svd_min_norm(const MatrixType& m, unsigned int computationOptions) { typedef typename MatrixType::Scalar Scalar; - typedef typename MatrixType::Index Index; Index cols = m.cols(); enum { @@ -261,7 +258,6 @@ CALL_SUBTEST(( svd_min_norm(m, ComputeThinU | ComputeThinV) )); // test reconstruction - typedef typename MatrixType::Index Index; Index diagSize = (std::min)(m.rows(), m.cols()); SvdType svd(m, ComputeThinU | ComputeThinV); VERIFY_IS_APPROX(m, svd.matrixU().leftCols(diagSize) * svd.singularValues().asDiagonal() * svd.matrixV().leftCols(diagSize).adjoint()); @@ -437,7 +433,6 @@ void svd_verify_assert(const MatrixType& m) { typedef typename MatrixType::Scalar Scalar; - typedef typename MatrixType::Index Index; Index rows = m.rows(); Index cols = m.cols();
diff --git a/test/svd_fill.h b/test/svd_fill.h index 3877c0c..d68647e 100644 --- a/test/svd_fill.h +++ b/test/svd_fill.h
@@ -23,7 +23,6 @@ using std::pow; typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar; - typedef typename MatrixType::Index Index; Index diagSize = (std::min)(m.rows(), m.cols()); RealScalar s = std::numeric_limits<RealScalar>::max_exponent10/4; s = internal::random<RealScalar>(1,s);
diff --git a/test/swap.cpp b/test/swap.cpp index f76e362..a294da7 100644 --- a/test/swap.cpp +++ b/test/swap.cpp
@@ -28,8 +28,8 @@ typedef typename MatrixType::Scalar Scalar; eigen_assert((!internal::is_same<MatrixType,OtherMatrixType>::value)); - typename MatrixType::Index rows = m.rows(); - typename MatrixType::Index cols = m.cols(); + Index rows = m.rows(); + Index cols = m.cols(); // construct 3 matrix guaranteed to be distinct MatrixType m1 = MatrixType::Random(rows,cols);
diff --git a/test/triangular.cpp b/test/triangular.cpp index b968564..d50342c 100644 --- a/test/triangular.cpp +++ b/test/triangular.cpp
@@ -19,8 +19,8 @@ RealScalar largerEps = 10*test_precision<RealScalar>(); - typename MatrixType::Index rows = m.rows(); - typename MatrixType::Index cols = m.cols(); + Index rows = m.rows(); + Index cols = m.cols(); MatrixType m1 = MatrixType::Random(rows, cols), m2 = MatrixType::Random(rows, cols), @@ -134,7 +134,6 @@ template<typename MatrixType> void triangular_rect(const MatrixType& m) { - typedef const typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; enum { Rows = MatrixType::RowsAtCompileTime, Cols = MatrixType::ColsAtCompileTime };
diff --git a/test/upperbidiagonalization.cpp b/test/upperbidiagonalization.cpp index 847b34b..27a7478 100644 --- a/test/upperbidiagonalization.cpp +++ b/test/upperbidiagonalization.cpp
@@ -12,8 +12,8 @@ template<typename MatrixType> void upperbidiag(const MatrixType& m) { - const typename MatrixType::Index rows = m.rows(); - const typename MatrixType::Index cols = m.cols(); + const Index rows = m.rows(); + const Index cols = m.cols(); typedef Matrix<typename MatrixType::RealScalar, MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime> RealMatrixType; typedef Matrix<typename MatrixType::Scalar, MatrixType::ColsAtCompileTime, MatrixType::RowsAtCompileTime> TransposeMatrixType;
diff --git a/test/vectorwiseop.cpp b/test/vectorwiseop.cpp index f3ab561..a099d17 100644 --- a/test/vectorwiseop.cpp +++ b/test/vectorwiseop.cpp
@@ -15,7 +15,6 @@ template<typename ArrayType> void vectorwiseop_array(const ArrayType& m) { - typedef typename ArrayType::Index Index; typedef typename ArrayType::Scalar Scalar; typedef Array<Scalar, ArrayType::RowsAtCompileTime, 1> ColVectorType; typedef Array<Scalar, 1, ArrayType::ColsAtCompileTime> RowVectorType; @@ -129,7 +128,6 @@ template<typename MatrixType> void vectorwiseop_matrix(const MatrixType& m) { - typedef typename MatrixType::Index Index; typedef typename MatrixType::Scalar Scalar; typedef typename NumTraits<Scalar>::Real RealScalar; typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1> ColVectorType;
diff --git a/test/visitor.cpp b/test/visitor.cpp index 844170e..7f4efab 100644 --- a/test/visitor.cpp +++ b/test/visitor.cpp
@@ -12,7 +12,6 @@ template<typename MatrixType> void matrixVisitor(const MatrixType& p) { typedef typename MatrixType::Scalar Scalar; - typedef typename MatrixType::Index Index; Index rows = p.rows(); Index cols = p.cols(); @@ -65,7 +64,6 @@ template<typename VectorType> void vectorVisitor(const VectorType& w) { typedef typename VectorType::Scalar Scalar; - typedef typename VectorType::Index Index; Index size = w.size();