use Eigen::Index in matrix operations

include/Spectra/GenEigsBase.h

@@ -361,7 +361,7 @@ class GenEigsBase
     ///
     /// \return Number of converged eigenvalues.
     ///
-    int compute(Index maxit = 1000, Scalar tol = 1e-10, int sort_rule = LARGEST_MAGN)
+    Index compute(Index maxit = 1000, Scalar tol = 1e-10, int sort_rule = LARGEST_MAGN)
     {
         // The m-step Arnoldi factorization
         m_fac.factorize_from(1, m_ncv, m_nmatop);

include/Spectra/MatOp/DenseCholesky.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Yixuan Qiu <yixuan.qiu@cos.name>
+// Copyright (C) 2016-2019 Yixuan Qiu <yixuan.qiu@cos.name>
 //
 // This Source Code Form is subject to the terms of the Mozilla
 // Public License v. 2.0. If a copy of the MPL was not distributed
@@ -27,14 +27,15 @@ template <typename Scalar, int Uplo = Eigen::Lower>
 class DenseCholesky
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic> Matrix;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Matrix> MapConstMat;
     typedef Eigen::Map<const Vector> MapConstVec;
     typedef Eigen::Map<Vector> MapVec;
     typedef const Eigen::Ref<const Matrix> ConstGenericMatrix;
 
-    const int m_n;
+    const Index m_n;
     Eigen::LLT<Matrix, Uplo> m_decomp;
     int m_info;  // status of the decomposition
 
@@ -62,11 +63,11 @@ class DenseCholesky
     ///
     /// Returns the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_n; }
+    Index rows() const { return m_n; }
     ///
     /// Returns the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_n; }
+    Index cols() const { return m_n; }
 
     ///
     /// Returns the status of the computation.

include/Spectra/MatOp/DenseGenComplexShiftSolve.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Yixuan Qiu <yixuan.qiu@cos.name>
+// Copyright (C) 2016-2019 Yixuan Qiu <yixuan.qiu@cos.name>
 //
 // This Source Code Form is subject to the terms of the Mozilla
 // Public License v. 2.0. If a copy of the MPL was not distributed
@@ -26,6 +26,7 @@ template <typename Scalar>
 class DenseGenComplexShiftSolve
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic> Matrix;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
@@ -39,7 +40,7 @@ class DenseGenComplexShiftSolve
     typedef Eigen::PartialPivLU<ComplexMatrix> ComplexSolver;
 
     ConstGenericMatrix m_mat;
-    const int m_n;
+    const Index m_n;
     ComplexSolver m_solver;
     ComplexVector m_x_cache;
 
@@ -62,11 +63,11 @@ class DenseGenComplexShiftSolve
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_n; }
+    Index rows() const { return m_n; }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_n; }
+    Index cols() const { return m_n; }
 
     ///
     /// Set the complex shift \f$\sigma\f$.

include/Spectra/MatOp/DenseGenMatProd.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Yixuan Qiu <yixuan.qiu@cos.name>
+// Copyright (C) 2016-2019 Yixuan Qiu <yixuan.qiu@cos.name>
 //
 // This Source Code Form is subject to the terms of the Mozilla
 // Public License v. 2.0. If a copy of the MPL was not distributed
@@ -30,6 +30,7 @@ template <typename Scalar>
 class DenseGenMatProd
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic> Matrix;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
@@ -54,11 +55,11 @@ class DenseGenMatProd
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_mat.rows(); }
+    Index rows() const { return m_mat.rows(); }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_mat.cols(); }
+    Index cols() const { return m_mat.cols(); }
 
     ///
     /// Perform the matrix-vector multiplication operation \f$y=Ax\f$.

include/Spectra/MatOp/DenseGenRealShiftSolve.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Yixuan Qiu <yixuan.qiu@cos.name>
+// Copyright (C) 2016-2019 Yixuan Qiu <yixuan.qiu@cos.name>
 //
 // This Source Code Form is subject to the terms of the Mozilla
 // Public License v. 2.0. If a copy of the MPL was not distributed
@@ -25,14 +25,15 @@ template <typename Scalar>
 class DenseGenRealShiftSolve
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic> Matrix;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
     typedef Eigen::Map<Vector> MapVec;
     typedef const Eigen::Ref<const Matrix> ConstGenericMatrix;
 
     ConstGenericMatrix m_mat;
-    const int m_n;
+    const Index m_n;
     Eigen::PartialPivLU<Matrix> m_solver;
 
 public:
@@ -54,11 +55,11 @@ class DenseGenRealShiftSolve
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_n; }
+    Index rows() const { return m_n; }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_n; }
+    Index cols() const { return m_n; }
 
     ///
     /// Set the real shift \f$\sigma\f$.

include/Spectra/MatOp/DenseSymMatProd.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Yixuan Qiu <yixuan.qiu@cos.name>
+// Copyright (C) 2016-2019 Yixuan Qiu <yixuan.qiu@cos.name>
 //
 // This Source Code Form is subject to the terms of the Mozilla
 // Public License v. 2.0. If a copy of the MPL was not distributed
@@ -23,6 +23,7 @@ template <typename Scalar, int Uplo = Eigen::Lower>
 class DenseSymMatProd
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic> Matrix;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
@@ -47,11 +48,11 @@ class DenseSymMatProd
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_mat.rows(); }
+    Index rows() const { return m_mat.rows(); }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_mat.cols(); }
+    Index cols() const { return m_mat.cols(); }
 
     ///
     /// Perform the matrix-vector multiplication operation \f$y=Ax\f$.

include/Spectra/MatOp/DenseSymShiftSolve.h

@@ -27,6 +27,7 @@ template <typename Scalar, int Uplo = Eigen::Lower>
 class DenseSymShiftSolve
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic> Matrix;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
@@ -56,11 +57,11 @@ class DenseSymShiftSolve
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_n; }
+    Index rows() const { return m_n; }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_n; }
+    Index cols() const { return m_n; }
 
     ///
     /// Set the real shift \f$\sigma\f$.

include/Spectra/MatOp/SparseCholesky.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Yixuan Qiu <yixuan.qiu@cos.name>
+// Copyright (C) 2016-2019 Yixuan Qiu <yixuan.qiu@cos.name>
 //
 // This Source Code Form is subject to the terms of the Mozilla
 // Public License v. 2.0. If a copy of the MPL was not distributed
@@ -28,13 +28,14 @@ template <typename Scalar, int Uplo = Eigen::Lower, int Flags = 0, typename Stor
 class SparseCholesky
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
     typedef Eigen::Map<Vector> MapVec;
     typedef Eigen::SparseMatrix<Scalar, Flags, StorageIndex> SparseMatrix;
     typedef const Eigen::Ref<const SparseMatrix> ConstGenericSparseMatrix;
 
-    const int m_n;
+    const Index m_n;
     Eigen::SimplicialLLT<SparseMatrix, Uplo> m_decomp;
     int m_info;  // status of the decomposition
 
@@ -61,11 +62,11 @@ class SparseCholesky
     ///
     /// Returns the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_n; }
+    Index rows() const { return m_n; }
     ///
     /// Returns the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_n; }
+    Index cols() const { return m_n; }
 
     ///
     /// Returns the status of the computation.

include/Spectra/MatOp/SparseGenMatProd.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Yixuan Qiu <yixuan.qiu@cos.name>
+// Copyright (C) 2016-2019 Yixuan Qiu <yixuan.qiu@cos.name>
 //
 // This Source Code Form is subject to the terms of the Mozilla
 // Public License v. 2.0. If a copy of the MPL was not distributed
@@ -25,6 +25,7 @@ template <typename Scalar, int Flags = 0, typename StorageIndex = int>
 class SparseGenMatProd
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
     typedef Eigen::Map<Vector> MapVec;
@@ -48,11 +49,11 @@ class SparseGenMatProd
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_mat.rows(); }
+    Index rows() const { return m_mat.rows(); }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_mat.cols(); }
+    Index cols() const { return m_mat.cols(); }
 
     ///
     /// Perform the matrix-vector multiplication operation \f$y=Ax\f$.

include/Spectra/MatOp/SparseGenRealShiftSolve.h

@@ -26,6 +26,7 @@ template <typename Scalar,int Flags = 0, typename StorageIndex = int>
 class SparseGenRealShiftSolve
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
     typedef Eigen::Map<Vector> MapVec;
@@ -54,11 +55,11 @@ class SparseGenRealShiftSolve
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_n; }
+    Index rows() const { return m_n; }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_n; }
+    Index cols() const { return m_n; }
 
     ///
     /// Set the real shift \f$\sigma\f$.

include/Spectra/MatOp/SparseRegularInverse.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2017-2018 Yixuan Qiu <yixuan.qiu@cos.name>
+// Copyright (C) 2017-2019 Yixuan Qiu <yixuan.qiu@cos.name>
 //
 // This Source Code Form is subject to the terms of the Mozilla
 // Public License v. 2.0. If a copy of the MPL was not distributed
@@ -30,6 +30,7 @@ template <typename Scalar, int Uplo = Eigen::Lower, int Flags = 0, typename Stor
 class SparseRegularInverse
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
     typedef Eigen::Map<Vector> MapVec;
@@ -60,11 +61,11 @@ class SparseRegularInverse
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_n; }
+    Index rows() const { return m_n; }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_n; }
+    Index cols() const { return m_n; }
 
     ///
     /// Perform the solving operation \f$y=B^{-1}x\f$.

include/Spectra/MatOp/SparseSymMatProd.h

@@ -1,4 +1,4 @@
-// Copyright (C) 2016-2018 Yixuan Qiu <yixuan.qiu@cos.name>
+// Copyright (C) 2016-2019 Yixuan Qiu <yixuan.qiu@cos.name>
 //
 // This Source Code Form is subject to the terms of the Mozilla
 // Public License v. 2.0. If a copy of the MPL was not distributed
@@ -24,6 +24,7 @@ template <typename Scalar, int Uplo = Eigen::Lower, int Flags = 0, typename Stor
 class SparseSymMatProd
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
     typedef Eigen::Map<Vector> MapVec;
@@ -47,11 +48,11 @@ class SparseSymMatProd
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_mat.rows(); }
+    Index rows() const { return m_mat.rows(); }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_mat.cols(); }
+    Index cols() const { return m_mat.cols(); }
 
     ///
     /// Perform the matrix-vector multiplication operation \f$y=Ax\f$.

include/Spectra/MatOp/SparseSymShiftSolve.h

@@ -26,6 +26,7 @@ template <typename Scalar, int Uplo = Eigen::Lower, int Flags = 0, typename Stor
 class SparseSymShiftSolve
 {
 private:
+    typedef Eigen::Index Index;
     typedef Eigen::Matrix<Scalar, Eigen::Dynamic, 1> Vector;
     typedef Eigen::Map<const Vector> MapConstVec;
     typedef Eigen::Map<Vector> MapVec;
@@ -54,11 +55,11 @@ class SparseSymShiftSolve
     ///
     /// Return the number of rows of the underlying matrix.
     ///
-    int rows() const { return m_n; }
+    Index rows() const { return m_n; }
     ///
     /// Return the number of columns of the underlying matrix.
     ///
-    int cols() const { return m_n; }
+    Index cols() const { return m_n; }
 
     ///
     /// Set the real shift \f$\sigma\f$.