Skip to content
Snippets Groups Projects
Commit 3633a2ff authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

follow core 422

parent 845abf29
No related branches found
No related tags found
3 merge requests!30Release after RAL,!29After 2nd RAL submission,!26Resolve "Follow core 422"
...@@ -42,7 +42,7 @@ namespace wolf { ...@@ -42,7 +42,7 @@ namespace wolf {
WOLF_PTR_TYPEDEFS(ProcessorOdomIcp); WOLF_PTR_TYPEDEFS(ProcessorOdomIcp);
WOLF_STRUCT_PTR_TYPEDEFS(ParamsProcessorOdomIcp); WOLF_STRUCT_PTR_TYPEDEFS(ParamsProcessorOdomIcp);
struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMotion struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsMotionProvider
{ {
// ICP Params // ICP Params
laserscanutils::icpParams icp_params; laserscanutils::icpParams icp_params;
...@@ -60,7 +60,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo ...@@ -60,7 +60,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo
ParamsProcessorOdomIcp() = default; ParamsProcessorOdomIcp() = default;
ParamsProcessorOdomIcp(std::string _unique_name, const ParamsServer &_server): ParamsProcessorOdomIcp(std::string _unique_name, const ParamsServer &_server):
ParamsProcessorTracker(_unique_name, _server), ParamsProcessorTracker(_unique_name, _server),
ParamsIsMotion(_unique_name, _server) ParamsMotionProvider(_unique_name, _server)
{ {
// keyframe voting // keyframe voting
vfk_min_dist = _server.getParam<double> (prefix + _unique_name + "/keyframe_vote/min_dist"); vfk_min_dist = _server.getParam<double> (prefix + _unique_name + "/keyframe_vote/min_dist");
...@@ -127,7 +127,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo ...@@ -127,7 +127,7 @@ struct ParamsProcessorOdomIcp : public ParamsProcessorTracker, public ParamsIsMo
} }
}; };
class ProcessorOdomIcp : public ProcessorTracker, public IsMotion class ProcessorOdomIcp : public ProcessorTracker, public MotionProvider
{ {
protected: protected:
// Useful sensor stuff // Useful sensor stuff
......
...@@ -29,7 +29,7 @@ namespace wolf ...@@ -29,7 +29,7 @@ namespace wolf
ProcessorOdomIcp::ProcessorOdomIcp(ParamsProcessorOdomIcpPtr _params): ProcessorOdomIcp::ProcessorOdomIcp(ParamsProcessorOdomIcpPtr _params):
ProcessorTracker("ProcessorOdomIcp", "PO", 2, _params), ProcessorTracker("ProcessorOdomIcp", "PO", 2, _params),
IsMotion("PO", _params), MotionProvider("PO", _params),
odom_origin_(Eigen::Vector3d::Zero()), odom_origin_(Eigen::Vector3d::Zero()),
odom_last_(Eigen::Vector3d::Zero()), odom_last_(Eigen::Vector3d::Zero()),
odom_incoming_(Eigen::Vector3d::Zero()), odom_incoming_(Eigen::Vector3d::Zero()),
...@@ -372,7 +372,7 @@ VectorComposite ProcessorOdomIcp::getState(const TimeStamp& _ts, const StateStru ...@@ -372,7 +372,7 @@ VectorComposite ProcessorOdomIcp::getState(const TimeStamp& _ts, const StateStru
void ProcessorOdomIcp::setProblem(ProblemPtr _problem_ptr) void ProcessorOdomIcp::setProblem(ProblemPtr _problem_ptr)
{ {
NodeBase::setProblem(_problem_ptr); NodeBase::setProblem(_problem_ptr);
addToProblem(_problem_ptr, std::dynamic_pointer_cast<IsMotion>(shared_from_this())); addToProblem(_problem_ptr, std::dynamic_pointer_cast<MotionProvider>(shared_from_this()));
} }
} // namespace wolf } // namespace wolf
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment