From 4b609458012a380bf865bfeef24934c77725244f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Tue, 13 Aug 2019 13:51:44 +0200
Subject: [PATCH] Move params factories to sensor_base and processor_base
---
include/core/common/factory.h | 20 --------------------
include/core/processor/processor_factory.h | 11 +++++++++++
include/core/sensor/sensor_factory.h | 11 +++++++++++
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/include/core/common/factory.h b/include/core/common/factory.h
index 25c819a9c..4a760ddc0 100644
--- a/include/core/common/factory.h
+++ b/include/core/common/factory.h
@@ -314,26 +314,6 @@ namespace wolf
// Some specializations
//======================
-// Intrinsics
-struct IntrinsicsBase;
-typedef Factory<IntrinsicsBase,
- const std::string&> IntrinsicsFactory;
-template<>
-inline std::string IntrinsicsFactory::getClass()
-{
- return "IntrinsicsFactory";
-}
-
-// ProcessorParams
-struct ProcessorParamsBase;
-typedef Factory<ProcessorParamsBase,
- const std::string&> ProcessorParamsFactory;
-template<>
-inline std::string ProcessorParamsFactory::getClass()
-{
- return "ProcessorParamsFactory";
-}
-
// Landmarks from YAML
class LandmarkBase;
typedef Factory<LandmarkBase,
diff --git a/include/core/processor/processor_factory.h b/include/core/processor/processor_factory.h
index c5068dc0e..1f1d8606c 100644
--- a/include/core/processor/processor_factory.h
+++ b/include/core/processor/processor_factory.h
@@ -165,6 +165,17 @@ namespace wolf
* You can also check the code in the example file ````src/examples/test_wolf_factories.cpp````.
*/
+// ProcessorParams factory
+struct ProcessorParamsBase;
+typedef Factory<ProcessorParamsBase,
+ const std::string&> ProcessorParamsFactory;
+template<>
+inline std::string ProcessorParamsFactory::getClass()
+{
+ return "ProcessorParamsFactory";
+}
+
+// Processor factory
typedef Factory<ProcessorBase,
const std::string&,
const ProcessorParamsBasePtr> ProcessorFactory;
diff --git a/include/core/sensor/sensor_factory.h b/include/core/sensor/sensor_factory.h
index 4e4c8306a..3c74b0fd7 100644
--- a/include/core/sensor/sensor_factory.h
+++ b/include/core/sensor/sensor_factory.h
@@ -209,6 +209,17 @@ namespace wolf
* You can also check the code in the example file ````src/examples/test_wolf_factories.cpp````.
*/
+// Intrinsics factory
+struct IntrinsicsBase;
+typedef Factory<IntrinsicsBase,
+ const std::string&> IntrinsicsFactory;
+template<>
+inline std::string IntrinsicsFactory::getClass()
+{
+ return "IntrinsicsFactory";
+}
+
+// Sensor factory
typedef Factory<SensorBase,
const std::string&,
const Eigen::VectorXs&, const IntrinsicsBasePtr> SensorFactory;
--
GitLab