From 6a27a07a3c67a3728e392fac5475b4886543acbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu>
Date: Wed, 27 May 2020 23:29:38 +0200
Subject: [PATCH] Reorder arguments in FrameBase constructor
---
include/core/frame/frame_base.h | 6 +++---
src/frame/frame_base.cpp | 6 +++---
src/problem/problem.cpp | 4 ++--
test/gtest_factor_diff_drive.cpp | 8 ++++----
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/core/frame/frame_base.h b/include/core/frame/frame_base.h
index b9849c63b..2c8ff19d9 100644
--- a/include/core/frame/frame_base.h
+++ b/include/core/frame/frame_base.h
@@ -63,10 +63,10 @@ class FrameBase : public NodeBase, public HasStateBlocks, public std::enable_sha
StateBlockPtr _o_ptr = nullptr,
StateBlockPtr _v_ptr = nullptr);
- FrameBase(const std::string _frame_structure,
- const SizeEigen _dim,
- const FrameType & _tp,
+ FrameBase(const FrameType & _tp,
const TimeStamp& _ts,
+ const std::string _frame_structure,
+ const SizeEigen _dim,
const Eigen::VectorXd& _x);
FrameBase(const FrameType & _tp,
diff --git a/src/frame/frame_base.cpp b/src/frame/frame_base.cpp
index 80b631874..97b6a062e 100644
--- a/src/frame/frame_base.cpp
+++ b/src/frame/frame_base.cpp
@@ -89,10 +89,10 @@ FrameBase::FrameBase(const FrameType & _tp,
}
}
-FrameBase::FrameBase(const std::string _frame_structure,
- const SizeEigen _dim,
- const FrameType & _tp,
+FrameBase::FrameBase(const FrameType & _tp,
const TimeStamp& _ts,
+ const std::string _frame_structure,
+ const SizeEigen _dim,
const Eigen::VectorXd& _x) :
NodeBase("FRAME", "FrameBase"),
HasStateBlocks(_frame_structure),
diff --git a/src/problem/problem.cpp b/src/problem/problem.cpp
index 89cfa5bbd..e6321ff04 100644
--- a/src/problem/problem.cpp
+++ b/src/problem/problem.cpp
@@ -329,10 +329,10 @@ FrameBasePtr Problem::emplaceFrame(FrameType _frame_key_type, //
const Eigen::VectorXd& _frame_state)
{
auto frm = FrameBase::emplace<FrameBase>(trajectory_ptr_,
- _frame_structure,
- _dim,
_frame_key_type,
_time_stamp,
+ _frame_structure,
+ _dim,
_frame_state);
return frm;
}
diff --git a/test/gtest_factor_diff_drive.cpp b/test/gtest_factor_diff_drive.cpp
index 579875a8b..7aab9e5ce 100644
--- a/test/gtest_factor_diff_drive.cpp
+++ b/test/gtest_factor_diff_drive.cpp
@@ -160,16 +160,16 @@ class FactorDiffDriveTest : public testing::Test
// frames
F0 = FrameBase::emplace<FrameBase>(trajectory,
- "PO",
- 2,
KEY,
0.0,
- Vector3d(0,0,0));
- F1 = FrameBase::emplace<FrameBase>(trajectory,
"PO",
2,
+ Vector3d(0,0,0));
+ F1 = FrameBase::emplace<FrameBase>(trajectory,
KEY,
1.0,
+ "PO",
+ 2,
Vector3d(1,0,0));
// captures
--
GitLab