commit c8063df9176824eef874c2864fa7cbc4752ffb9c
author Sameer Agarwal <sameeragarwal@google.com> Tue Jun 03 20:26:40 2014 -0700
committer Sameer Agarwal <sameeragarwal@google.com> Tue Jun 03 20:30:15 2014 -0700
tree 19cf85309534462f9ab48c2ddc94eb467024abe4
parent 52bad6223bf41598804387ad073e55c672c8d294

POLAK_RIBIRERE -> POLAK_RIBIERE

Thanks to Vladimir Chalupecky for reporting this.

Change-Id: I2e419415394f5d2be35b825d7c777b01ff31add1

docs/source/solving.rst

diff --git a/docs/source/solving.rst b/docs/source/solving.rst
index 32b7fc5..ed50da0 100644
--- a/docs/source/solving.rst
+++ b/docs/source/solving.rst
@@ -399,7 +399,7 @@
    Gradient method to non-linear functions. The generalization can be
    performed in a number of different ways, resulting in a variety of
    search directions. Ceres Solver currently supports
-   ``FLETCHER_REEVES``, ``POLAK_RIBIRERE`` and ``HESTENES_STIEFEL``
+   ``FLETCHER_REEVES``, ``POLAK_RIBIERE`` and ``HESTENES_STIEFEL``
    directions.
 
 3. ``BFGS`` A generalization of the Secant method to multiple
@@ -828,7 +828,7 @@
 
    Default: ``FLETCHER_REEVES``
 
-   Choices are ``FLETCHER_REEVES``, ``POLAK_RIBIRERE`` and
+   Choices are ``FLETCHER_REEVES``, ``POLAK_RIBIERE`` and
    ``HESTENES_STIEFEL``.
 
 .. member:: int Solver::Options::max_lbfs_rank

include/ceres/types.h

diff --git a/include/ceres/types.h b/include/ceres/types.h
index 9e91246..158e059 100644
--- a/include/ceres/types.h
+++ b/include/ceres/types.h
@@ -247,7 +247,7 @@
 // details see Numerical Optimization by Nocedal & Wright.
 enum NonlinearConjugateGradientType {
   FLETCHER_REEVES,
-  POLAK_RIBIRERE,
+  POLAK_RIBIERE,
   HESTENES_STIEFEL,
 };
 

internal/ceres/line_search_direction.cc

diff --git a/internal/ceres/line_search_direction.cc b/internal/ceres/line_search_direction.cc
index e04c65b..dddcecd 100644
--- a/internal/ceres/line_search_direction.cc
+++ b/internal/ceres/line_search_direction.cc
@@ -65,7 +65,7 @@
       case FLETCHER_REEVES:
         beta = current.gradient_squared_norm / previous.gradient_squared_norm;
         break;
-      case POLAK_RIBIRERE:
+      case POLAK_RIBIERE:
         gradient_change = current.gradient - previous.gradient;
         beta = (current.gradient.dot(gradient_change) /
                 previous.gradient_squared_norm);

internal/ceres/types.cc

diff --git a/internal/ceres/types.cc b/internal/ceres/types.cc
index 5a344ea..8eaadc3 100644
--- a/internal/ceres/types.cc
+++ b/internal/ceres/types.cc
@@ -240,7 +240,7 @@
     NonlinearConjugateGradientType type) {
   switch (type) {
     CASESTR(FLETCHER_REEVES);
-    CASESTR(POLAK_RIBIRERE);
+    CASESTR(POLAK_RIBIERE);
     CASESTR(HESTENES_STIEFEL);
     default:
       return "UNKNOWN";
@@ -252,7 +252,7 @@
     NonlinearConjugateGradientType* type) {
   UpperCase(&value);
   STRENUM(FLETCHER_REEVES);
-  STRENUM(POLAK_RIBIRERE);
+  STRENUM(POLAK_RIBIERE);
   STRENUM(HESTENES_STIEFEL);
   return false;
 }