rename PlanarRotation -> JacobiRotation

5 files changed, 9 insertions, 9 deletions

diff --git a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
index 0ef3ecafa..3308a4a34 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/HybridNonLinearSolver.h
@@ -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;
diff --git a/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h b/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
index 15a27d53d..2a602fedf 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/qrsolv.h
@@ -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
diff --git a/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h b/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
index ad319d9eb..b2ea20d77 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/r1mpyq.h
@@ -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;
 
diff --git a/unsupported/Eigen/src/NonLinearOptimization/r1updt.h b/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
index e01d02910..881327af7 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/r1updt.h
@@ -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.
diff --git a/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h b/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
index aa0bf7d0f..ec97b707a 100644
--- a/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
+++ b/unsupported/Eigen/src/NonLinearOptimization/rwupdt.h
@@ -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;
         }