From 4e7489fbe13383084edfca04426e78d011626d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Wed, 14 Aug 2019 14:16:09 +0200
Subject: [PATCH] Add SolverType to solver registration macro
---
include/core/solver/solver_factory.h | 4 ++--
src/ceres_wrapper/ceres_manager.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/core/solver/solver_factory.h b/include/core/solver/solver_factory.h
index 5205ad5c9..95bab65a7 100644
--- a/include/core/solver/solver_factory.h
+++ b/include/core/solver/solver_factory.h
@@ -219,9 +219,9 @@ inline std::string SolverFactory::getClass()
return "SolverFactory";
}
-#define WOLF_REGISTER_SOLVER(SolverName) \
+#define WOLF_REGISTER_SOLVER(SolverType, SolverName) \
namespace{ const bool WOLF_UNUSED SolverName##Registered = \
- wolf::SolverFactory::get().registerCreator("Solver", SolverName::create); } \
+ wolf::SolverFactory::get().registerCreator(SolverType, SolverName::create); } \
} /* namespace wolf */
diff --git a/src/ceres_wrapper/ceres_manager.cpp b/src/ceres_wrapper/ceres_manager.cpp
index b64e86ab9..7d56eefa6 100644
--- a/src/ceres_wrapper/ceres_manager.cpp
+++ b/src/ceres_wrapper/ceres_manager.cpp
@@ -444,6 +444,6 @@ void CeresManager::check()
} // namespace wolf
#include "core/solver/solver_factory.h"
namespace wolf {
- WOLF_REGISTER_SOLVER(CeresManager)
+ WOLF_REGISTER_SOLVER("CERES", CeresManager)
} // namespace wolf
--
GitLab