rename PlanarRotation -> JacobiRotation

This commit is contained in:
Benoit Jacob
2010-10-19 21:56:26 -04:00
parent 9044c98cff
commit e259f71477
18 changed files with 50 additions and 50 deletions

View File

@@ -358,7 +358,7 @@ void MatrixFunction<MatrixType,1>::permuteSchur()
template <typename MatrixType>
void MatrixFunction<MatrixType,1>::swapEntriesInSchur(Index index)
{
PlanarRotation<Scalar> rotation;
JacobiRotation<Scalar> rotation;
rotation.makeGivens(m_T(index, index+1), m_T(index+1, index+1) - m_T(index, index));
m_T.applyOnTheLeft(index, index+1, rotation.adjoint());
m_T.applyOnTheRight(index, index+1, rotation);

View File

@@ -201,7 +201,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveOneStep(FVectorType &x)
assert(x.size()==n); // check the caller is not cheating us
Index j;
std::vector<PlanarRotation<Scalar> > v_givens(n), w_givens(n);
std::vector<JacobiRotation<Scalar> > v_givens(n), w_givens(n);
jeval = true;
@@ -440,7 +440,7 @@ HybridNonLinearSolver<FunctorType,Scalar>::solveNumericalDiffOneStep(FVectorType
assert(x.size()==n); // check the caller is not cheating us
Index j;
std::vector<PlanarRotation<Scalar> > v_givens(n), w_givens(n);
std::vector<JacobiRotation<Scalar> > v_givens(n), w_givens(n);
jeval = true;
if (parameters.nb_of_subdiagonals<0) parameters.nb_of_subdiagonals= n-1;

View File

@@ -18,7 +18,7 @@ void ei_qrsolv(
Scalar temp;
Index n = s.cols();
Matrix< Scalar, Dynamic, 1 > wa(n);
PlanarRotation<Scalar> givens;
JacobiRotation<Scalar> givens;
/* Function Body */
// the following will only change the lower triangular part of s, including

View File

@@ -2,7 +2,7 @@
// TODO : move this to GivensQR once there's such a thing in Eigen
template <typename Scalar>
void ei_r1mpyq(DenseIndex m, DenseIndex n, Scalar *a, const std::vector<PlanarRotation<Scalar> > &v_givens, const std::vector<PlanarRotation<Scalar> > &w_givens)
void ei_r1mpyq(DenseIndex m, DenseIndex n, Scalar *a, const std::vector<JacobiRotation<Scalar> > &v_givens, const std::vector<JacobiRotation<Scalar> > &w_givens)
{
typedef DenseIndex Index;

View File

@@ -3,8 +3,8 @@ template <typename Scalar>
void ei_r1updt(
Matrix< Scalar, Dynamic, Dynamic > &s,
const Matrix< Scalar, Dynamic, 1> &u,
std::vector<PlanarRotation<Scalar> > &v_givens,
std::vector<PlanarRotation<Scalar> > &w_givens,
std::vector<JacobiRotation<Scalar> > &v_givens,
std::vector<JacobiRotation<Scalar> > &w_givens,
Matrix< Scalar, Dynamic, 1> &v,
Matrix< Scalar, Dynamic, 1> &w,
bool *sing)
@@ -16,7 +16,7 @@ void ei_r1updt(
const Index n = s.cols();
Index i, j=1;
Scalar temp;
PlanarRotation<Scalar> givens;
JacobiRotation<Scalar> givens;
// ei_r1updt had a broader usecase, but we dont use it here. And, more
// importantly, we can not test it.

View File

@@ -10,7 +10,7 @@ void ei_rwupdt(
const Index n = r.cols();
assert(r.rows()>=n);
std::vector<PlanarRotation<Scalar> > givens(n);
std::vector<JacobiRotation<Scalar> > givens(n);
/* Local variables */
Scalar temp, rowj;
@@ -29,7 +29,7 @@ void ei_rwupdt(
if (rowj == 0.)
{
givens[j] = PlanarRotation<Scalar>(1,0);
givens[j] = JacobiRotation<Scalar>(1,0);
continue;
}