diff options
Diffstat (limited to 'internal/ceres/dogleg_strategy_test.cc')
-rw-r--r-- | internal/ceres/dogleg_strategy_test.cc | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/internal/ceres/dogleg_strategy_test.cc b/internal/ceres/dogleg_strategy_test.cc index 9e2ed9f..ace635f 100644 --- a/internal/ceres/dogleg_strategy_test.cc +++ b/internal/ceres/dogleg_strategy_test.cc @@ -84,8 +84,8 @@ class DoglegStrategyFixtureEllipse : public Fixture { x_.resize(6); x_.setZero(); - options_.lm_min_diagonal = 1.0; - options_.lm_max_diagonal = 1.0; + options_.min_lm_diagonal = 1.0; + options_.max_lm_diagonal = 1.0; } }; @@ -112,8 +112,8 @@ class DoglegStrategyFixtureValley : public Fixture { x_.resize(6); x_.setZero(); - options_.lm_min_diagonal = 1.0; - options_.lm_max_diagonal = 1.0; + options_.min_lm_diagonal = 1.0; + options_.max_lm_diagonal = 1.0; } }; @@ -129,9 +129,9 @@ TEST_F(DoglegStrategyFixtureEllipse, TrustRegionObeyedTraditional) { scoped_ptr<LinearSolver> linear_solver( new DenseQRSolver(LinearSolver::Options())); options_.linear_solver = linear_solver.get(); - // The global minimum is at (1, 1, ..., 1), so the distance to it is sqrt(6.0). - // By restricting the trust region to a radius of 2.0, we test if the trust - // region is actually obeyed. + // The global minimum is at (1, 1, ..., 1), so the distance to it is + // sqrt(6.0). By restricting the trust region to a radius of 2.0, + // we test if the trust region is actually obeyed. options_.dogleg_type = TRADITIONAL_DOGLEG; options_.initial_radius = 2.0; options_.max_radius = 2.0; @@ -206,10 +206,7 @@ TEST_F(DoglegStrategyFixtureEllipse, ValidSubspaceBasis) { 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 @@ TEST_F(DoglegStrategyFixtureValley, CorrectStepGlobalOptimumAlongGradient) { } // namespace internal } // namespace ceres - |