delete shadowed typedefs

This commit is contained in:
Charles Schlosser 2024-02-28 02:40:45 +00:00 committed by Rasmus Munk Larsen
parent a962a27594
commit b334910700
4 changed files with 2 additions and 10 deletions

View File

@ -229,7 +229,7 @@ struct get_compile_time_incr<ArithmeticSequence<FirstType, SizeType, IncrType> >
template <typename FirstType, typename SizeType, typename IncrType> template <typename FirstType, typename SizeType, typename IncrType>
constexpr Index get_runtime_incr(const ArithmeticSequence<FirstType, SizeType, IncrType>& x) EIGEN_NOEXCEPT { constexpr Index get_runtime_incr(const ArithmeticSequence<FirstType, SizeType, IncrType>& x) EIGEN_NOEXCEPT {
return static_cast<Index>(x.incrObject()); return static_cast<Index>(x.incrObject());
}; }
} // end namespace internal } // end namespace internal

View File

@ -70,7 +70,7 @@ struct get_compile_time_incr {
template <typename T> template <typename T>
constexpr Index get_runtime_incr(const T&) EIGEN_NOEXCEPT { constexpr Index get_runtime_incr(const T&) EIGEN_NOEXCEPT {
return Index(1); return Index(1);
}; }
// Analogue of std::get<0>(x), but tailored for our needs. // Analogue of std::get<0>(x), but tailored for our needs.
template <typename T> template <typename T>

View File

@ -438,7 +438,6 @@ class ColPivHouseholderQR : public SolverBase<ColPivHouseholderQR<MatrixType_, P
template <typename MatrixType, typename PermutationIndex> template <typename MatrixType, typename PermutationIndex>
typename MatrixType::Scalar ColPivHouseholderQR<MatrixType, PermutationIndex>::determinant() const { typename MatrixType::Scalar ColPivHouseholderQR<MatrixType, PermutationIndex>::determinant() const {
using Scalar = typename MatrixType::Scalar;
eigen_assert(m_isInitialized && "HouseholderQR is not initialized."); eigen_assert(m_isInitialized && "HouseholderQR is not initialized.");
eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!");
Scalar detQ; Scalar detQ;
@ -449,7 +448,6 @@ typename MatrixType::Scalar ColPivHouseholderQR<MatrixType, PermutationIndex>::d
template <typename MatrixType, typename PermutationIndex> template <typename MatrixType, typename PermutationIndex>
typename MatrixType::RealScalar ColPivHouseholderQR<MatrixType, PermutationIndex>::absDeterminant() const { typename MatrixType::RealScalar ColPivHouseholderQR<MatrixType, PermutationIndex>::absDeterminant() const {
using std::abs; using std::abs;
using RealScalar = typename MatrixType::RealScalar;
eigen_assert(m_isInitialized && "ColPivHouseholderQR is not initialized."); eigen_assert(m_isInitialized && "ColPivHouseholderQR is not initialized.");
eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!");
return isInjective() ? abs(m_qr.diagonal().prod()) : RealScalar(0); return isInjective() ? abs(m_qr.diagonal().prod()) : RealScalar(0);
@ -457,7 +455,6 @@ typename MatrixType::RealScalar ColPivHouseholderQR<MatrixType, PermutationIndex
template <typename MatrixType, typename PermutationIndex> template <typename MatrixType, typename PermutationIndex>
typename MatrixType::RealScalar ColPivHouseholderQR<MatrixType, PermutationIndex>::logAbsDeterminant() const { typename MatrixType::RealScalar ColPivHouseholderQR<MatrixType, PermutationIndex>::logAbsDeterminant() const {
using RealScalar = typename MatrixType::RealScalar;
eigen_assert(m_isInitialized && "ColPivHouseholderQR is not initialized."); eigen_assert(m_isInitialized && "ColPivHouseholderQR is not initialized.");
eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!");
return isInjective() ? m_qr.diagonal().cwiseAbs().array().log().sum() : -NumTraits<RealScalar>::infinity(); return isInjective() ? m_qr.diagonal().cwiseAbs().array().log().sum() : -NumTraits<RealScalar>::infinity();
@ -465,7 +462,6 @@ typename MatrixType::RealScalar ColPivHouseholderQR<MatrixType, PermutationIndex
template <typename MatrixType, typename PermutationIndex> template <typename MatrixType, typename PermutationIndex>
typename MatrixType::Scalar ColPivHouseholderQR<MatrixType, PermutationIndex>::signDeterminant() const { typename MatrixType::Scalar ColPivHouseholderQR<MatrixType, PermutationIndex>::signDeterminant() const {
using Scalar = typename MatrixType::Scalar;
eigen_assert(m_isInitialized && "ColPivHouseholderQR is not initialized."); eigen_assert(m_isInitialized && "ColPivHouseholderQR is not initialized.");
eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!");
Scalar detQ; Scalar detQ;

View File

@ -435,7 +435,6 @@ class FullPivHouseholderQR : public SolverBase<FullPivHouseholderQR<MatrixType_,
template <typename MatrixType, typename PermutationIndex> template <typename MatrixType, typename PermutationIndex>
typename MatrixType::Scalar FullPivHouseholderQR<MatrixType, PermutationIndex>::determinant() const { typename MatrixType::Scalar FullPivHouseholderQR<MatrixType, PermutationIndex>::determinant() const {
using Scalar = typename MatrixType::Scalar;
eigen_assert(m_isInitialized && "HouseholderQR is not initialized."); eigen_assert(m_isInitialized && "HouseholderQR is not initialized.");
eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!");
Scalar detQ; Scalar detQ;
@ -445,7 +444,6 @@ typename MatrixType::Scalar FullPivHouseholderQR<MatrixType, PermutationIndex>::
template <typename MatrixType, typename PermutationIndex> template <typename MatrixType, typename PermutationIndex>
typename MatrixType::RealScalar FullPivHouseholderQR<MatrixType, PermutationIndex>::absDeterminant() const { typename MatrixType::RealScalar FullPivHouseholderQR<MatrixType, PermutationIndex>::absDeterminant() const {
using RealScalar = typename MatrixType::RealScalar;
using std::abs; using std::abs;
eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized."); eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized.");
eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!");
@ -454,7 +452,6 @@ typename MatrixType::RealScalar FullPivHouseholderQR<MatrixType, PermutationInde
template <typename MatrixType, typename PermutationIndex> template <typename MatrixType, typename PermutationIndex>
typename MatrixType::RealScalar FullPivHouseholderQR<MatrixType, PermutationIndex>::logAbsDeterminant() const { typename MatrixType::RealScalar FullPivHouseholderQR<MatrixType, PermutationIndex>::logAbsDeterminant() const {
using RealScalar = typename MatrixType::RealScalar;
eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized."); eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized.");
eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!");
return isInjective() ? m_qr.diagonal().cwiseAbs().array().log().sum() : -NumTraits<RealScalar>::infinity(); return isInjective() ? m_qr.diagonal().cwiseAbs().array().log().sum() : -NumTraits<RealScalar>::infinity();
@ -462,7 +459,6 @@ typename MatrixType::RealScalar FullPivHouseholderQR<MatrixType, PermutationInde
template <typename MatrixType, typename PermutationIndex> template <typename MatrixType, typename PermutationIndex>
typename MatrixType::Scalar FullPivHouseholderQR<MatrixType, PermutationIndex>::signDeterminant() const { typename MatrixType::Scalar FullPivHouseholderQR<MatrixType, PermutationIndex>::signDeterminant() const {
using Scalar = typename MatrixType::Scalar;
eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized."); eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized.");
eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!");
Scalar detQ; Scalar detQ;