commit 05292bf8fc5208b86b4a13544615b584f6efa936
author Sameer Agarwal <sameeragarwal@google.com> Mon Aug 20 07:40:45 2012 -0700
committer ceres-solver code review <noreply-gerritcodereview@google.com> Mon Aug 20 08:48:09 2012 -0700
tree 529f980a8548a1008c315c043efc9a2a52b96837
parent b12b906c4d21c3949f0dce62c4c0d083c8edecf1

Add a TrustRegionStrategy::Summary object.

Change-Id: I7caee35a3408ee4a0ec16ba407410d822929340d

internal/ceres/levenberg_marquardt_strategy.cc

diff --git a/internal/ceres/levenberg_marquardt_strategy.cc b/internal/ceres/levenberg_marquardt_strategy.cc
index 576648a..af76c42 100644
--- a/internal/ceres/levenberg_marquardt_strategy.cc
+++ b/internal/ceres/levenberg_marquardt_strategy.cc
@@ -61,7 +61,7 @@
 LevenbergMarquardtStrategy::~LevenbergMarquardtStrategy() {
 }
 
-LinearSolver::Summary LevenbergMarquardtStrategy::ComputeStep(
+TrustRegionStrategy::Summary LevenbergMarquardtStrategy::ComputeStep(
     const TrustRegionStrategy::PerSolveOptions& per_solve_options,
     SparseMatrix* jacobian,
     const double* residuals,
@@ -113,7 +113,12 @@
   }
 
   reuse_diagonal_ = true;
-  return linear_solver_summary;
+
+  TrustRegionStrategy::Summary summary;
+  summary.residual_norm = linear_solver_summary.residual_norm;
+  summary.num_iterations = linear_solver_summary.num_iterations;
+  summary.termination_type = linear_solver_summary.termination_type;
+  return summary;
 }
 
 void LevenbergMarquardtStrategy::StepAccepted(double step_quality) {