From 46c28342293ab23afd095839746fe0453c0e0cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Thu, 8 Aug 2019 11:44:20 +0200
Subject: [PATCH] format
---
hello_wolf/sensor_range_bearing.h | 8 ++++----
include/core/processor/processor_base.h | 4 ++--
include/core/processor/processor_motion.h | 2 +-
include/core/processor/processor_odom_2D.h | 4 ++--
include/core/processor/processor_tracker.h | 9 +++++----
include/core/sensor/sensor_diff_drive.h | 2 +-
include/core/sensor/sensor_odom_2D.h | 5 +++--
include/core/sensor/sensor_odom_3D.h | 12 ++++++------
8 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/hello_wolf/sensor_range_bearing.h b/hello_wolf/sensor_range_bearing.h
index fbecdc8a0..b7788c27f 100644
--- a/hello_wolf/sensor_range_bearing.h
+++ b/hello_wolf/sensor_range_bearing.h
@@ -26,13 +26,13 @@ struct IntrinsicsRangeBearing : public IntrinsicsBase
IntrinsicsRangeBearing(std::string _unique_name, const ParamsServer& _server):
IntrinsicsBase(_unique_name, _server)
{
- noise_range_metres_std = _server.getParam<Scalar>(_unique_name + "/noise_range_metres_std");
- noise_bearing_degrees_std = _server.getParam<Scalar>(_unique_name + "/noise_bearing_degrees_std");
+ noise_range_metres_std = _server.getParam<Scalar>(_unique_name + "/noise_range_metres_std");
+ noise_bearing_degrees_std = _server.getParam<Scalar>(_unique_name + "/noise_bearing_degrees_std");
}
std::string print()
{
- return "" + IntrinsicsBase::print()
- + "noise_range_metres_std: " + std::to_string(noise_range_metres_std) + "\n"
+ return "" + IntrinsicsBase::print() + "\n"
+ + "noise_range_metres_std: " + std::to_string(noise_range_metres_std) + "\n"
+ "noise_bearing_degrees_std: " + std::to_string(noise_bearing_degrees_std) + "\n";
}
};
diff --git a/include/core/processor/processor_base.h b/include/core/processor/processor_base.h
index e605ab904..c97dc86ac 100644
--- a/include/core/processor/processor_base.h
+++ b/include/core/processor/processor_base.h
@@ -227,9 +227,9 @@ struct ProcessorParamsBase : public ParamsBase
std::string print()
{
return ParamsBase::print() + "\n"
- + "voting_active: " + std::to_string(voting_active) + "\n"
+ + "voting_active: " + std::to_string(voting_active) + "\n"
+ "voting_aux_active: " + std::to_string(voting_aux_active) + "\n"
- + "time_tolerance: " + std::to_string(time_tolerance) + "\n";
+ + "time_tolerance: " + std::to_string(time_tolerance) + "\n";
}
};
diff --git a/include/core/processor/processor_motion.h b/include/core/processor/processor_motion.h
index 6a5fb31c6..cd1d7972d 100644
--- a/include/core/processor/processor_motion.h
+++ b/include/core/processor/processor_motion.h
@@ -42,7 +42,7 @@ struct ProcessorParamsMotion : public ProcessorParamsBase
}
std::string print()
{
- return "\n" + ProcessorParamsBase::print()
+ return "\n" + ProcessorParamsBase::print() + "\n"
+ "max_time_span: " + std::to_string(max_time_span) + "\n"
+ "max_buff_length: " + std::to_string(max_buff_length) + "\n"
+ "dist_traveled: " + std::to_string(dist_traveled) + "\n"
diff --git a/include/core/processor/processor_odom_2D.h b/include/core/processor/processor_odom_2D.h
index a7091f62a..a55b2e1c0 100644
--- a/include/core/processor/processor_odom_2D.h
+++ b/include/core/processor/processor_odom_2D.h
@@ -32,8 +32,8 @@ struct ProcessorParamsOdom2D : public ProcessorParamsMotion
std::string print()
{
- return "\n" + ProcessorParamsMotion::print()
- + "cov_det: " + std::to_string(cov_det) + "\n";
+ return "\n" + ProcessorParamsMotion::print() + "\n"
+ + "cov_det: " + std::to_string(cov_det) + "\n";
}
};
diff --git a/include/core/processor/processor_tracker.h b/include/core/processor/processor_tracker.h
index 4da4460be..dc59acee3 100644
--- a/include/core/processor/processor_tracker.h
+++ b/include/core/processor/processor_tracker.h
@@ -24,13 +24,14 @@ struct ProcessorParamsTracker : public ProcessorParamsBase
ProcessorParamsTracker(std::string _unique_name, const wolf::ParamsServer & _server):
ProcessorParamsBase(_unique_name, _server)
{
- min_features_for_keyframe = _server.getParam<unsigned int>(_unique_name + "/min_features_for_keyframe");
- max_new_features = _server.getParam<int>(_unique_name + "/max_new_features");
+ min_features_for_keyframe = _server.getParam<unsigned int>(_unique_name + "/min_features_for_keyframe");
+ max_new_features = _server.getParam<int>(_unique_name + "/max_new_features");
}
std::string print()
{
- return ProcessorParamsBase::print() + "\n" + "min_features_for_keyframe: " + std::to_string(min_features_for_keyframe) + "\n"
- + "max_new_features: " + std::to_string(max_new_features) + "\n";
+ return ProcessorParamsBase::print() + "\n"
+ + "min_features_for_keyframe: " + std::to_string(min_features_for_keyframe) + "\n"
+ + "max_new_features: " + std::to_string(max_new_features) + "\n";
}
};
diff --git a/include/core/sensor/sensor_diff_drive.h b/include/core/sensor/sensor_diff_drive.h
index 29866c85f..a36356ed8 100644
--- a/include/core/sensor/sensor_diff_drive.h
+++ b/include/core/sensor/sensor_diff_drive.h
@@ -37,7 +37,7 @@ struct IntrinsicsDiffDrive : public IntrinsicsBase
}
std::string print()
{
- return "\n" + IntrinsicsBase::print()
+ return "\n" + IntrinsicsBase::print() + "\n"
+ "radius_left: " + std::to_string(radius_left) + "\n"
+ "radius_right: " + std::to_string(radius_right) + "\n"
+ "wheel_separation: " + std::to_string(wheel_separation) + "\n"
diff --git a/include/core/sensor/sensor_odom_2D.h b/include/core/sensor/sensor_odom_2D.h
index 614e715e5..83b776add 100644
--- a/include/core/sensor/sensor_odom_2D.h
+++ b/include/core/sensor/sensor_odom_2D.h
@@ -27,8 +27,9 @@ struct IntrinsicsOdom2D : public IntrinsicsBase
}
std::string print()
{
- return "\n" + IntrinsicsBase::print() + "k_disp_to_disp: " + std::to_string(k_disp_to_disp) + "\n"
- + "k_rot_to_rot: " + std::to_string(k_rot_to_rot) + "\n";
+ return "\n" + IntrinsicsBase::print() + "\n"
+ + "k_disp_to_disp: " + std::to_string(k_disp_to_disp) + "\n"
+ + "k_rot_to_rot: " + std::to_string(k_rot_to_rot) + "\n";
}
};
diff --git a/include/core/sensor/sensor_odom_3D.h b/include/core/sensor/sensor_odom_3D.h
index c41ffe725..1a727d613 100644
--- a/include/core/sensor/sensor_odom_3D.h
+++ b/include/core/sensor/sensor_odom_3D.h
@@ -38,12 +38,12 @@ struct IntrinsicsOdom3D : public IntrinsicsBase
}
std::string print()
{
- return "\n" + IntrinsicsBase::print()
- + "k_disp_to_disp: " + std::to_string(k_disp_to_disp) + "\n"
- + "k_disp_to_rot: " + std::to_string(k_disp_to_rot) + "\n"
- + "k_rot_to_rot: " + std::to_string(k_rot_to_rot) + "\n"
- + "min_disp_var: " + std::to_string(min_disp_var) + "\n"
- + "min_rot_var: " + std::to_string(min_rot_var) + "\n";
+ return "\n" + IntrinsicsBase::print() + "\n"
+ + "k_disp_to_disp: " + std::to_string(k_disp_to_disp) + "\n"
+ + "k_disp_to_rot: " + std::to_string(k_disp_to_rot) + "\n"
+ + "k_rot_to_rot: " + std::to_string(k_rot_to_rot) + "\n"
+ + "min_disp_var: " + std::to_string(min_disp_var) + "\n"
+ + "min_rot_var: " + std::to_string(min_rot_var) + "\n";
}
virtual ~IntrinsicsOdom3D() = default;
};
--
GitLab