commit d010de543530001fa917501a13ba02879c8ea52f
author Sameer Agarwal <sameeragarwal@google.com> Fri Feb 15 14:26:56 2013 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 16 01:32:44 2013 +0000
tree 0e1506605d8712a841fdf848d023b58db8f8b83b
parent fbbea464d1c9575d8224220d3e61f92d93fe9739

Solver::Summary::FullReport() supports line search now.

Change-Id: Ib08d300198b85d9732cfb5785af4235ca4bd5226

include/ceres/solver.h

diff --git a/include/ceres/solver.h b/include/ceres/solver.h
index cb858ba..07ce0e4 100644
--- a/include/ceres/solver.h
+++ b/include/ceres/solver.h
@@ -59,7 +59,7 @@
     // Default constructor that sets up a generic sparse problem.
     Options() {
       minimizer_type = TRUST_REGION;
-      line_search_direction_type = STEEPEST_DESCENT;
+      line_search_direction_type = LBFGS;
       line_search_type = ARMIJO;
       nonlinear_conjugate_gradient_type = FLETCHER_REEVES;
       max_lbfgs_rank = 20;
@@ -578,6 +578,8 @@
     string FullReport() const;
 
     // Minimizer summary -------------------------------------------------
+    MinimizerType minimizer_type;
+
     SolverTerminationType termination_type;
 
     // If the solver did not run, or there was a failure, a
@@ -698,9 +700,14 @@
 
     TrustRegionStrategyType trust_region_strategy_type;
     DoglegType dogleg_type;
+    bool inner_iterations;
+
     SparseLinearAlgebraLibraryType sparse_linear_algebra_library;
 
-    bool inner_iterations;
+    LineSearchDirectionType line_search_direction_type;
+    LineSearchType line_search_type;
+    int max_lbfgs_rank;
+
     vector<int> inner_iteration_ordering_given;
     vector<int> inner_iteration_ordering_used;
   };