commit 1c70ae9aa626e591cda987a970c240dd40d23a69
author Sameer Agarwal <sameeragarwal@google.com> Sun Jun 30 12:50:43 2013 -0700
committer Sameer Agarwal <sameeragarwal@google.com> Sun Jun 30 12:50:43 2013 -0700
tree 09bdcb82ea28b6f81bb03a894c8c36d0f9e340e4
parent 70b06c89c7491d7749957c8454769bfcb0108a97

Fix Solver::Summary when line search is used.

Also enable line search in bundle_adjuster.

Change-Id: Ic4343a4334b9f5a6fdeab38d4e3e1f6932bbc601

internal/ceres/line_search_minimizer.cc

diff --git a/internal/ceres/line_search_minimizer.cc b/internal/ceres/line_search_minimizer.cc
index 684a736..92b7965 100644
--- a/internal/ceres/line_search_minimizer.cc
+++ b/internal/ceres/line_search_minimizer.cc
@@ -194,6 +194,8 @@
 
     iteration_summary = IterationSummary();
     iteration_summary.iteration = summary->iterations.back().iteration + 1;
+    iteration_summary.step_is_valid = false;
+    iteration_summary.step_is_successful = false;
 
     bool line_search_status = true;
     if (iteration_summary.iteration == 1) {
@@ -232,6 +234,8 @@
     delta = current_state.step_size * current_state.search_direction;
 
     previous_state = current_state;
+    iteration_summary.step_solver_time_in_seconds =
+        WallTimeInSeconds() - iteration_start_time;
 
     // TODO(sameeragarwal): Collect stats.
     if (!evaluator->Plus(x.data(), delta.data(), x_plus_delta.data()) ||
@@ -278,6 +282,7 @@
         + summary->preprocessor_time_in_seconds;
 
     summary->iterations.push_back(iteration_summary);
+    ++summary->num_successful_steps;
   }
 }