commit e2a6cdc0816af9d0c77933f5017f137da3d52a35
author Keir Mierle <mierle@gmail.com> Mon May 07 06:39:56 2012 -0700
committer Keir Mierle <mierle@gmail.com> Mon May 07 06:39:56 2012 -0700
tree 45b85c8fe076dfb158d94aecb9af00d7edd1e9de
parent 1b95dc580aa5d89be021c0915e26df83f18013bb

Address some of the comments on CGNR patch

- Rename BlockDiagonalPreconditioner to BlockJacobiPreconditioner
- Include the diagonal in the block jacobi preconditioner.
- Better flag help for eta.
- Enable test for CGNR
- Rename CONJUGATE_GRADIENTS to CGNR.
- etc.

internal/ceres/types.cc

diff --git a/internal/ceres/types.cc b/internal/ceres/types.cc
index 55910b0..860f8a4 100644
--- a/internal/ceres/types.cc
+++ b/internal/ceres/types.cc
@@ -42,7 +42,7 @@
     CASESTR(DENSE_SCHUR);
     CASESTR(SPARSE_SCHUR);
     CASESTR(ITERATIVE_SCHUR);
-    CASESTR(CONJUGATE_GRADIENTS);
+    CASESTR(CGNR);
     default:
       return "UNKNOWN";
   }