diff options
Diffstat (limited to 'internal/ceres/minimizer.h')
| -rw-r--r-- | internal/ceres/minimizer.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/internal/ceres/minimizer.h b/internal/ceres/minimizer.h index 622e9ce..f1da3f7 100644 --- a/internal/ceres/minimizer.h +++ b/internal/ceres/minimizer.h @@ -107,12 +107,14 @@ class Minimizer { options.line_search_sufficient_curvature_decrease; max_line_search_step_expansion = options.max_line_search_step_expansion; + is_silent = (options.logging_type == SILENT); evaluator = NULL; trust_region_strategy = NULL; jacobian = NULL; callbacks = options.callbacks; inner_iteration_minimizer = NULL; inner_iteration_tolerance = options.inner_iteration_tolerance; + is_constrained = false; } int max_num_iterations; @@ -153,6 +155,8 @@ class Minimizer { double line_search_sufficient_curvature_decrease; double max_line_search_step_expansion; + // If true, then all logging is disabled. + bool is_silent; // List of callbacks that are executed by the Minimizer at the end // of each iteration. @@ -177,9 +181,12 @@ class Minimizer { Minimizer* inner_iteration_minimizer; double inner_iteration_tolerance; + + // Use a bounds constrained optimization algorithm. + bool is_constrained; }; - static bool RunCallbacks(const vector<IterationCallback*> callbacks, + static bool RunCallbacks(const Options& options, const IterationSummary& iteration_summary, Solver::Summary* summary); |