From 24156ce3ad2f921fb4ab55faef543fa3eac79ad6 Mon Sep 17 00:00:00 2001 From: Joan Sola <jsola@iri.upc.edu> Date: Mon, 13 Jan 2020 15:08:40 +0100 Subject: [PATCH] Use factory keys as for new definition, equal to class name --- hello_wolf/hello_wolf.cpp | 8 ++++---- hello_wolf/processor_range_bearing.cpp | 4 ++-- hello_wolf/sensor_range_bearing.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hello_wolf/hello_wolf.cpp b/hello_wolf/hello_wolf.cpp index b11a6b13a..9aaa79212 100644 --- a/hello_wolf/hello_wolf.cpp +++ b/hello_wolf/hello_wolf.cpp @@ -112,7 +112,7 @@ int main() // sensor odometer 2D IntrinsicsOdom2DPtr intrinsics_odo = std::make_shared<IntrinsicsOdom2D>(); - SensorBasePtr sensor_odo = problem->installSensor("ODOM 2D", "sensor odo", Vector3s(0,0,0), intrinsics_odo); + SensorBasePtr sensor_odo = problem->installSensor("SensorOdom2D", "sensor odo", Vector3s(0,0,0), intrinsics_odo); // processor odometer 2D ProcessorParamsOdom2DPtr params_odo = std::make_shared<ProcessorParamsOdom2D>(); @@ -123,19 +123,19 @@ int main() params_odo->angle_turned = 999; params_odo->cov_det = 999; params_odo->unmeasured_perturbation_std = 0.001; - ProcessorBasePtr processor = problem->installProcessor("ODOM 2D", "processor odo", sensor_odo, params_odo); + ProcessorBasePtr processor = problem->installProcessor("ProcessorOdom2D", "processor odo", sensor_odo, params_odo); // sensor Range and Bearing IntrinsicsRangeBearingPtr intrinsics_rb = std::make_shared<IntrinsicsRangeBearing>(); intrinsics_rb->noise_range_metres_std = 0.1; intrinsics_rb->noise_bearing_degrees_std = 1.0; - SensorBasePtr sensor_rb = problem->installSensor("RANGE BEARING", "sensor RB", Vector3s(1,1,0), intrinsics_rb); + SensorBasePtr sensor_rb = problem->installSensor("SensorRangeBearing", "sensor RB", Vector3s(1,1,0), intrinsics_rb); // processor Range and Bearing ProcessorParamsRangeBearingPtr params_rb = std::make_shared<ProcessorParamsRangeBearing>(); params_rb->voting_active = false; params_rb->time_tolerance = 0.01; - ProcessorBasePtr processor_rb = problem->installProcessor("RANGE BEARING", "processor RB", sensor_rb, params_rb); + ProcessorBasePtr processor_rb = problem->installProcessor("ProcessorRangeBearing", "processor RB", sensor_rb, params_rb); // initialize TimeStamp t(0.0); // t : 0.0 diff --git a/hello_wolf/processor_range_bearing.cpp b/hello_wolf/processor_range_bearing.cpp index 9e72c57b7..d43badcc3 100644 --- a/hello_wolf/processor_range_bearing.cpp +++ b/hello_wolf/processor_range_bearing.cpp @@ -163,7 +163,7 @@ bool ProcessorRangeBearing::storeCapture(CaptureBasePtr _cap_ptr) #include "core/processor/processor_factory.h" namespace wolf { -WOLF_REGISTER_PROCESSOR("RANGE BEARING", ProcessorRangeBearing) -WOLF_REGISTER_PROCESSOR_AUTO("RANGE BEARING", ProcessorRangeBearing) +WOLF_REGISTER_PROCESSOR("ProcessorRangeBearing", ProcessorRangeBearing) +WOLF_REGISTER_PROCESSOR_AUTO("ProcessorRangeBearing", ProcessorRangeBearing) } // namespace wolf diff --git a/hello_wolf/sensor_range_bearing.cpp b/hello_wolf/sensor_range_bearing.cpp index a63a7a248..a6de52e90 100644 --- a/hello_wolf/sensor_range_bearing.cpp +++ b/hello_wolf/sensor_range_bearing.cpp @@ -41,6 +41,6 @@ SensorRangeBearing::~SensorRangeBearing() #include "core/sensor/sensor_factory.h" namespace wolf { -WOLF_REGISTER_SENSOR("RANGE BEARING", SensorRangeBearing) -WOLF_REGISTER_SENSOR_AUTO("RANGE BEARING", SensorRangeBearing) +WOLF_REGISTER_SENSOR("SensorRangeBearing", SensorRangeBearing) +WOLF_REGISTER_SENSOR_AUTO("SensorRangeBearing", SensorRangeBearing) } // namespace wolf -- GitLab