diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-05 13:38:50 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-03-05 13:38:50 +0400 |
| commit | f81b59479034bcf1d8055e0512f55204b256edfc (patch) | |
| tree | 7a55c0de82e1cb01412051ed3e270fa24652bbfb /extern/libmv | |
| parent | 3a0d62f4f4aad448522368821ea1d9ff433b1348 (diff) | |
Switch from DENSE_NORMAL_CHOLESKY to DENSE_QR
DENSE_QR is better behaved numerically and after recent
changes from Sameer there's no big difference in speed.
Diffstat (limited to 'extern/libmv')
| -rw-r--r-- | extern/libmv/libmv/simple_pipeline/intersect.cc | 2 | ||||
| -rw-r--r-- | extern/libmv/libmv/simple_pipeline/modal_solver.cc | 2 | ||||
| -rw-r--r-- | extern/libmv/libmv/tracking/track_region.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/extern/libmv/libmv/simple_pipeline/intersect.cc b/extern/libmv/libmv/simple_pipeline/intersect.cc index 660b4b21ece..d0f139a991a 100644 --- a/extern/libmv/libmv/simple_pipeline/intersect.cc +++ b/extern/libmv/libmv/simple_pipeline/intersect.cc @@ -117,7 +117,7 @@ bool EuclideanIntersect(const vector<Marker> &markers, // Configure the solve. ceres::Solver::Options solver_options; - solver_options.linear_solver_type = ceres::DENSE_NORMAL_CHOLESKY; + solver_options.linear_solver_type = ceres::DENSE_QR; solver_options.max_num_iterations = 50; solver_options.update_state_every_iteration = true; solver_options.parameter_tolerance = 1e-16; diff --git a/extern/libmv/libmv/simple_pipeline/modal_solver.cc b/extern/libmv/libmv/simple_pipeline/modal_solver.cc index 169c53bb601..d79c71508cc 100644 --- a/extern/libmv/libmv/simple_pipeline/modal_solver.cc +++ b/extern/libmv/libmv/simple_pipeline/modal_solver.cc @@ -200,7 +200,7 @@ void ModalSolver(Tracks &tracks, if (num_residuals) { // Configure the solve. ceres::Solver::Options solver_options; - solver_options.linear_solver_type = ceres::DENSE_NORMAL_CHOLESKY; + solver_options.linear_solver_type = ceres::DENSE_QR; solver_options.max_num_iterations = 50; solver_options.update_state_every_iteration = true; solver_options.gradient_tolerance = 1e-36; diff --git a/extern/libmv/libmv/tracking/track_region.cc b/extern/libmv/libmv/tracking/track_region.cc index 472d58a1547..036b7c94966 100644 --- a/extern/libmv/libmv/tracking/track_region.cc +++ b/extern/libmv/libmv/tracking/track_region.cc @@ -1404,7 +1404,7 @@ void TemplatedTrackRegion(const FloatImage &image1, // Configure the solve. ceres::Solver::Options solver_options; - solver_options.linear_solver_type = ceres::DENSE_NORMAL_CHOLESKY; + solver_options.linear_solver_type = ceres::DENSE_QR; solver_options.max_num_iterations = options.max_iterations; solver_options.update_state_every_iteration = true; solver_options.parameter_tolerance = 1e-16; |