GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-28 07:42:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #544: assertion in JacobiSVD when compiling with EIGEN_NO_AUTOMATIC_RESIZING

Browse Source
This commit is contained in:
Gael Guennebaud 2013-02-12 19:56:48 +01:00
parent 3cd32996f1
commit a143c5b78c
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Eigen/src/SVD/JacobiSVD.h
View File

@ -78,7 +78,8 @@ public:
{ {
if (svd.rows() != m_qr.rows() || svd.cols() != m_qr.cols()) if (svd.rows() != m_qr.rows() || svd.cols() != m_qr.cols())
{ {
m_qr = FullPivHouseholderQR<MatrixType>(svd.rows(), svd.cols()); m_qr.~QRType();
::new (&m_qr) QRType(svd.rows(), svd.cols());
} }
if (svd.m_computeFullU) m_workspace.resize(svd.rows()); if (svd.m_computeFullU) m_workspace.resize(svd.rows());
} }
@ -96,7 +97,8 @@ public:
return false; return false;
} }
private: private:
FullPivHouseholderQR<MatrixType> m_qr; typedef FullPivHouseholderQR<MatrixType> QRType;
QRType m_qr;
WorkspaceType m_workspace; WorkspaceType m_workspace;
}; };
@ -121,7 +123,8 @@ public:
{ {
if (svd.cols() != m_qr.rows() || svd.rows() != m_qr.cols()) if (svd.cols() != m_qr.rows() || svd.rows() != m_qr.cols())
{ {
m_qr = FullPivHouseholderQR<TransposeTypeWithSameStorageOrder>(svd.cols(), svd.rows()); m_qr.~QRType();
::new (&m_qr) QRType(svd.cols(), svd.rows());
} }
m_adjoint.resize(svd.cols(), svd.rows()); m_adjoint.resize(svd.cols(), svd.rows());
if (svd.m_computeFullV) m_workspace.resize(svd.cols()); if (svd.m_computeFullV) m_workspace.resize(svd.cols());
@ -141,7 +144,8 @@ public:
else return false; else return false;
} }
private: private:
FullPivHouseholderQR<TransposeTypeWithSameStorageOrder> m_qr; typedef FullPivHouseholderQR<TransposeTypeWithSameStorageOrder> QRType;
QRType m_qr;
TransposeTypeWithSameStorageOrder m_adjoint; TransposeTypeWithSameStorageOrder m_adjoint;
typename internal::plain_row_type<MatrixType>::type m_workspace; typename internal::plain_row_type<MatrixType>::type m_workspace;
}; };
@ -158,7 +162,8 @@ public:
{ {
if (svd.rows() != m_qr.rows() || svd.cols() != m_qr.cols()) if (svd.rows() != m_qr.rows() || svd.cols() != m_qr.cols())
{ {
m_qr = ColPivHouseholderQR<MatrixType>(svd.rows(), svd.cols()); m_qr.~QRType();
::new (&m_qr) QRType(svd.rows(), svd.cols());
} }
if (svd.m_computeFullU) m_workspace.resize(svd.rows()); if (svd.m_computeFullU) m_workspace.resize(svd.rows());
else if (svd.m_computeThinU) m_workspace.resize(svd.cols()); else if (svd.m_computeThinU) m_workspace.resize(svd.cols());
@ -183,7 +188,8 @@ public:
} }
private: private:
ColPivHouseholderQR<MatrixType> m_qr; typedef ColPivHouseholderQR<MatrixType> QRType;
QRType m_qr;
typename internal::plain_col_type<MatrixType>::type m_workspace; typename internal::plain_col_type<MatrixType>::type m_workspace;
}; };
@ -209,7 +215,8 @@ public:
{ {
if (svd.cols() != m_qr.rows() || svd.rows() != m_qr.cols()) if (svd.cols() != m_qr.rows() || svd.rows() != m_qr.cols())
{ {
m_qr = ColPivHouseholderQR<TransposeTypeWithSameStorageOrder>(svd.cols(), svd.rows()); m_qr.~QRType();
::new (&m_qr) QRType(svd.cols(), svd.rows());
} }
if (svd.m_computeFullV) m_workspace.resize(svd.cols()); if (svd.m_computeFullV) m_workspace.resize(svd.cols());
else if (svd.m_computeThinV) m_workspace.resize(svd.rows()); else if (svd.m_computeThinV) m_workspace.resize(svd.rows());
@ -237,7 +244,8 @@ public:
} }
private: private:
ColPivHouseholderQR<TransposeTypeWithSameStorageOrder> m_qr; typedef ColPivHouseholderQR<TransposeTypeWithSameStorageOrder> QRType;
QRType m_qr;
TransposeTypeWithSameStorageOrder m_adjoint; TransposeTypeWithSameStorageOrder m_adjoint;
typename internal::plain_row_type<MatrixType>::type m_workspace; typename internal::plain_row_type<MatrixType>::type m_workspace;
}; };
@ -254,7 +262,8 @@ public:
{ {
if (svd.rows() != m_qr.rows() || svd.cols() != m_qr.cols()) if (svd.rows() != m_qr.rows() || svd.cols() != m_qr.cols())
{ {
m_qr = HouseholderQR<MatrixType>(svd.rows(), svd.cols()); m_qr.~QRType();
::new (&m_qr) QRType(svd.rows(), svd.cols());
} }
if (svd.m_computeFullU) m_workspace.resize(svd.rows()); if (svd.m_computeFullU) m_workspace.resize(svd.rows());
else if (svd.m_computeThinU) m_workspace.resize(svd.cols()); else if (svd.m_computeThinU) m_workspace.resize(svd.cols());
@ -278,7 +287,8 @@ public:
return false; return false;
} }
private: private:
HouseholderQR<MatrixType> m_qr; typedef HouseholderQR<MatrixType> QRType;
QRType m_qr;
typename internal::plain_col_type<MatrixType>::type m_workspace; typename internal::plain_col_type<MatrixType>::type m_workspace;
}; };
@ -304,7 +314,8 @@ public:
{ {
if (svd.cols() != m_qr.rows() || svd.rows() != m_qr.cols()) if (svd.cols() != m_qr.rows() || svd.rows() != m_qr.cols())
{ {
m_qr = HouseholderQR<TransposeTypeWithSameStorageOrder>(svd.cols(), svd.rows()); m_qr.~QRType();
::new (&m_qr) QRType(svd.cols(), svd.rows());
} }
if (svd.m_computeFullV) m_workspace.resize(svd.cols()); if (svd.m_computeFullV) m_workspace.resize(svd.cols());
else if (svd.m_computeThinV) m_workspace.resize(svd.rows()); else if (svd.m_computeThinV) m_workspace.resize(svd.rows());
@ -332,7 +343,8 @@ public:
} }
private: private:
HouseholderQR<TransposeTypeWithSameStorageOrder> m_qr; typedef HouseholderQR<TransposeTypeWithSameStorageOrder> QRType;
QRType m_qr;
TransposeTypeWithSameStorageOrder m_adjoint; TransposeTypeWithSameStorageOrder m_adjoint;
typename internal::plain_row_type<MatrixType>::type m_workspace; typename internal::plain_row_type<MatrixType>::type m_workspace;
}; };