From 5546aa992f3f6a0a75722b5c7ccbb93e4d7fd282 Mon Sep 17 00:00:00 2001 From: cont-integration <CI@iri.upc.edu> Date: Thu, 25 Jul 2024 10:15:37 +0200 Subject: [PATCH] [skip ci] applied clang format --- demos/hello_wolf/hello_wolf_autoconf.cpp | 3 +-- include/core/solver/solver_manager.h | 4 ++-- src/ceres_wrapper/solver_ceres.cpp | 7 ++++--- test/gtest_solver_manager.cpp | 5 ++--- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/demos/hello_wolf/hello_wolf_autoconf.cpp b/demos/hello_wolf/hello_wolf_autoconf.cpp index 99638dc99..a1e2bf8ff 100644 --- a/demos/hello_wolf/hello_wolf_autoconf.cpp +++ b/demos/hello_wolf/hello_wolf_autoconf.cpp @@ -121,8 +121,7 @@ int main() problem->print(4, 0, 1, 0); // Solver. Configure a Ceres solver - SolverManagerPtr ceres = - SolverManager::autoSetup(problem, server.getNode()["solver"], {wolf_path}); + SolverManagerPtr ceres = SolverManager::autoSetup(problem, server.getNode()["solver"], {wolf_path}); if (not ceres) { WOLF_ERROR("Couldn't load or validate the yaml file for the solver"); diff --git a/include/core/solver/solver_manager.h b/include/core/solver/solver_manager.h index 6e4493691..f2e057674 100644 --- a/include/core/solver/solver_manager.h +++ b/include/core/solver/solver_manager.h @@ -133,13 +133,13 @@ class SolverManager static SolverManagerPtr autoSetup(const ProblemPtr& _problem, const std::string& _input_yaml_file, std::vector<std::string> _primary_schema_folders, - LoaderPtr _loader = nullptr, + LoaderPtr _loader = nullptr, bool _skip_yaml_validation = false); static SolverManagerPtr autoSetup(const ProblemPtr& _problem, YAML::Node _param_node, std::vector<std::string> _primary_schema_folders, - LoaderPtr _loader = nullptr, + LoaderPtr _loader = nullptr, bool _skip_yaml_validation = false); virtual ~SolverManager(); diff --git a/src/ceres_wrapper/solver_ceres.cpp b/src/ceres_wrapper/solver_ceres.cpp index 9eb429ae4..1012ee97b 100644 --- a/src/ceres_wrapper/solver_ceres.cpp +++ b/src/ceres_wrapper/solver_ceres.cpp @@ -896,10 +896,11 @@ bool SolverCeres::hasThisLocalParametrizationDerived(const StateBlockPtr& void SolverCeres::printProfilingDerived(std::ostream& _stream) const { - _stream << "Iterations:" << "\n\tUser-defined limit: " << solver_options_.max_num_iterations + _stream << "Iterations:" + << "\n\tUser-defined limit: " << solver_options_.max_num_iterations << "\n\tAverage iterations: " << n_iter_acc_ / n_solve_ - << "\n\tMax. iterations: " << n_iter_max_ - << "\nTermination:" << "\n\tConvergence: " << 1e2 * n_convergence_ / n_solve_ << " %" + << "\n\tMax. iterations: " << n_iter_max_ << "\nTermination:" + << "\n\tConvergence: " << 1e2 * n_convergence_ / n_solve_ << " %" << "\n\tInterrupted by problem change: " << 1e2 * n_interrupted_ / n_solve_ << " %" << "\n\tMax. iterations reached: " << 1e2 * n_no_convergence_ / n_solve_ << " %" << std::endl; } diff --git a/test/gtest_solver_manager.cpp b/test/gtest_solver_manager.cpp index 1a90e6f7a..6a00a2cda 100644 --- a/test/gtest_solver_manager.cpp +++ b/test/gtest_solver_manager.cpp @@ -132,9 +132,8 @@ TEST(SolverManagerFactories, autoSetupNode) TEST(SolverManagerFactories, autoSetupFile) { - auto problem = Problem::create(3); - auto solver_ptr = - SolverManager::autoSetup(problem, wolf_dir + "/test/yaml/solver_dummy.yaml", {wolf_dir}); + auto problem = Problem::create(3); + auto solver_ptr = SolverManager::autoSetup(problem, wolf_dir + "/test/yaml/solver_dummy.yaml", {wolf_dir}); // check pointers EXPECT_EQ(problem, solver_ptr->getProblem()); -- GitLab