commit 956ed7e8f2054623615e6ae3601055d613897f26
author Sameer Agarwal <sameeragarwal@google.com> Tue Feb 19 07:06:15 2013 -0800
committer Sameer Agarwal <sameeragarwal@google.com> Tue Feb 19 09:13:50 2013 -0800
tree 835e48eace96938047d7076dd756249770671b7b
parent 3e2c4ef9ad35e94198f4f3367b99fd91e26996a1

Various minor fixes.

1. Unused variable warnings and fixes.
2. Minor documentation update.

Change-Id: I815588a5806df1030a7c8750f4fb594c503f8998

internal/ceres/dogleg_strategy_test.cc

diff --git a/internal/ceres/dogleg_strategy_test.cc b/internal/ceres/dogleg_strategy_test.cc
index 9e2ed9f..24c526e 100644
--- a/internal/ceres/dogleg_strategy_test.cc
+++ b/internal/ceres/dogleg_strategy_test.cc
@@ -206,10 +206,7 @@
   DoglegStrategy strategy(options_);
   TrustRegionStrategy::PerSolveOptions pso;
 
-  TrustRegionStrategy::Summary summary = strategy.ComputeStep(pso,
-                                                              jacobian_.get(),
-                                                              residual_.data(),
-                                                              x_.data());
+  strategy.ComputeStep(pso, jacobian_.get(), residual_.data(), x_.data());
 
   // Check if the basis is orthonormal.
   const Matrix basis = strategy.subspace_basis();
@@ -288,4 +285,3 @@
 
 }  // namespace internal
 }  // namespace ceres
-

internal/ceres/schur_complement_solver_test.cc

diff --git a/internal/ceres/schur_complement_solver_test.cc b/internal/ceres/schur_complement_solver_test.cc
index 71c6cfd..1820bc9 100644
--- a/internal/ceres/schur_complement_solver_test.cc
+++ b/internal/ceres/schur_complement_solver_test.cc
@@ -75,20 +75,12 @@
 
     // Gold standard solutions using dense QR factorization.
     DenseSparseMatrix dense_A(triplet_A);
-    LinearSolver::Summary summary1 =
-        qr->Solve(&dense_A,
-                  b.get(),
-                  LinearSolver::PerSolveOptions(),
-                  sol.get());
+    qr->Solve(&dense_A, b.get(), LinearSolver::PerSolveOptions(), sol.get());
 
     // Gold standard solution with appended diagonal.
     LinearSolver::PerSolveOptions per_solve_options;
     per_solve_options.D = D.get();
-    LinearSolver::Summary summary2 =
-        qr->Solve(&dense_A,
-                  b.get(),
-                  per_solve_options,
-                  sol_d.get());
+    qr->Solve(&dense_A, b.get(), per_solve_options, sol_d.get());
   }
 
   void ComputeAndCompareSolutions(

internal/ceres/solver_impl.cc

diff --git a/internal/ceres/solver_impl.cc b/internal/ceres/solver_impl.cc
index c6ee86a..803b711 100644
--- a/internal/ceres/solver_impl.cc
+++ b/internal/ceres/solver_impl.cc
@@ -490,9 +490,6 @@
 
     double post_process_start_time = WallTimeInSeconds();
 
-
-
-
     // Evaluate the final cost, residual vector and the jacobian
     // matrix if requested by the user.
     if (options.return_final_residuals ||
@@ -820,6 +817,8 @@
 
     // Ensure the program state is set to the user parameters on the way out.
     original_program->SetParameterBlockStatePtrsToUserStatePtrs();
+    summary->postprocessor_time_in_seconds =
+        WallTimeInSeconds() - post_process_start_time;
     return;
   }
 
@@ -886,6 +885,9 @@
       summary->termination_type = NUMERICAL_FAILURE;
       summary->error = "Unable to evaluate the final cost.";
       LOG(ERROR) << summary->error;
+
+      summary->postprocessor_time_in_seconds =
+          WallTimeInSeconds() - post_process_start_time;
       return;
     }
   }
@@ -901,9 +903,6 @@
   summary->jacobian_evaluation_time_in_seconds =
       FindWithDefault(evaluator_time_statistics, "Evaluator::Jacobian", 0.0);
 
-  summary->postprocessor_time_in_seconds =
-      WallTimeInSeconds() - post_process_start_time;
-
   // Stick a fork in it, we're done.
   summary->postprocessor_time_in_seconds =
       WallTimeInSeconds() - post_process_start_time;