diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:17:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:22:54 +0400 |
commit | 54ee22130ca0ce59500c6eddb562b78eb4526bcd (patch) | |
tree | ba21cdaa35656c590059c864e028e24b6e234082 /extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h | |
parent | b09f7dcaa7b487ada53c8dbaa811deaa1201d163 (diff) | |
parent | 04814476c08e9350c424619cd99ccb1149d65365 (diff) |
Merge branch 'master' into dyntopo_holesdyntopo_holes
Conflicts:
source/blender/blenkernel/intern/pbvh_bmesh.c
Diffstat (limited to 'extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h')
-rw-r--r-- | extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h b/extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h index 484d88ece82..db706f7dbaf 100644 --- a/extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h +++ b/extern/libmv/third_party/ceres/include/ceres/gradient_problem_solver.h @@ -72,7 +72,6 @@ class CERES_EXPORT GradientProblemSolver { max_line_search_step_expansion = 10.0; max_num_iterations = 50; max_solver_time_in_seconds = 1e9; - num_threads = 1; function_tolerance = 1e-6; gradient_tolerance = 1e-10; logging_type = PER_MINIMIZER_ITERATION; @@ -224,10 +223,6 @@ class CERES_EXPORT GradientProblemSolver { // Maximum time for which the minimizer should run for. double max_solver_time_in_seconds; - // Number of threads used by Ceres for evaluating the cost and - // jacobians. - int num_threads; - // Minimizer terminates when // // (new_cost - old_cost) < function_tolerance * old_cost; @@ -251,13 +246,6 @@ class CERES_EXPORT GradientProblemSolver { // is sent to STDOUT. bool minimizer_progress_to_stdout; - // If true, the user's parameter blocks are updated at the end of - // every Minimizer iteration, otherwise they are updated when the - // Minimizer terminates. This is useful if, for example, the user - // wishes to visualize the state of the optimization every - // iteration. - bool update_state_every_iteration; - // Callbacks that are executed at the end of each iteration of the // Minimizer. An iteration may terminate midway, either due to // numerical failures or because one of the convergence tests has @@ -309,10 +297,10 @@ class CERES_EXPORT GradientProblemSolver { // Sum total of all time spent inside Ceres when Solve is called. double total_time_in_seconds; - // Time (in seconds) spent evaluating the residual vector. + // Time (in seconds) spent evaluating the cost. double cost_evaluation_time_in_seconds; - // Time (in seconds) spent evaluating the jacobian matrix. + // Time (in seconds) spent evaluating the gradient. double gradient_evaluation_time_in_seconds; // Number of parameters in the probem. |