Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
wolf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
wolf_projects
wolf_lib
wolf
Commits
e56cb85a
Commit
e56cb85a
authored
7 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Some formatting and help fixes
parent
915b2698
No related branches found
No related tags found
1 merge request
!110
Remove frame enum
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/problem.h
+13
-7
13 additions, 7 deletions
src/problem.h
with
13 additions
and
7 deletions
src/problem.h
+
13
−
7
View file @
e56cb85a
...
@@ -156,8 +156,10 @@ class Problem : public std::enable_shared_from_this<Problem>
...
@@ -156,8 +156,10 @@ class Problem : public std::enable_shared_from_this<Problem>
* - Add it to Trajectory
* - Add it to Trajectory
* - If it is key-frame, update state-block lists in Problem
* - If it is key-frame, update state-block lists in Problem
*/
*/
FrameBasePtr
emplaceFrame
(
const
std
::
string
&
_frame_structure
,
FrameType
_frame_key_type
,
const
Eigen
::
VectorXs
&
_frame_state
,
FrameBasePtr
emplaceFrame
(
const
std
::
string
&
_frame_structure
,
const
TimeStamp
&
_time_stamp
);
FrameType
_frame_key_type
,
const
Eigen
::
VectorXs
&
_frame_state
,
const
TimeStamp
&
_time_stamp
);
/** \brief Emplace frame from string frame_structure without state
/** \brief Emplace frame from string frame_structure without state
* \param _frame_structure String indicating the frame structure.
* \param _frame_structure String indicating the frame structure.
...
@@ -169,11 +171,13 @@ class Problem : public std::enable_shared_from_this<Problem>
...
@@ -169,11 +171,13 @@ class Problem : public std::enable_shared_from_this<Problem>
* - Add it to Trajectory
* - Add it to Trajectory
* - If it is key-frame, update state-block lists in Problem
* - If it is key-frame, update state-block lists in Problem
*/
*/
FrameBasePtr
emplaceFrame
(
const
std
::
string
&
_frame_structure
,
FrameType
_frame_key_type
,
const
TimeStamp
&
_time_stamp
);
FrameBasePtr
emplaceFrame
(
const
std
::
string
&
_frame_structure
,
FrameType
_frame_key_type
,
const
TimeStamp
&
_time_stamp
);
/** \brief Emplace frame from string frame_structure without structure
/** \brief Emplace frame from string frame_structure without structure
* \param _frame_structure String indicating the frame structure.
* \param _frame_key_type Either KEY_FRAME or NON_KEY_FRAME
* \param _frame_key_type Either KEY_FRAME or NON_KEY_FRAME
* \param _frame_state State vector; must match the size and format of the chosen frame structure
* \param _time_stamp Time stamp of the frame
* \param _time_stamp Time stamp of the frame
*
*
* This acts as a Frame factory, but also takes care to update related lists in WolfProblem:
* This acts as a Frame factory, but also takes care to update related lists in WolfProblem:
...
@@ -181,10 +185,11 @@ class Problem : public std::enable_shared_from_this<Problem>
...
@@ -181,10 +185,11 @@ class Problem : public std::enable_shared_from_this<Problem>
* - Add it to Trajectory
* - Add it to Trajectory
* - If it is key-frame, update state-block lists in Problem
* - If it is key-frame, update state-block lists in Problem
*/
*/
FrameBasePtr
emplaceFrame
(
FrameType
_frame_key_type
,
const
Eigen
::
VectorXs
&
_frame_state
,
const
TimeStamp
&
_time_stamp
);
FrameBasePtr
emplaceFrame
(
FrameType
_frame_key_type
,
const
Eigen
::
VectorXs
&
_frame_state
,
const
TimeStamp
&
_time_stamp
);
/** \brief Emplace frame from string frame_structure without structure nor state
/** \brief Emplace frame from string frame_structure without structure nor state
* \param _frame_structure String indicating the frame structure.
* \param _frame_key_type Either KEY_FRAME or NON_KEY_FRAME
* \param _frame_key_type Either KEY_FRAME or NON_KEY_FRAME
* \param _time_stamp Time stamp of the frame
* \param _time_stamp Time stamp of the frame
*
*
...
@@ -193,7 +198,8 @@ class Problem : public std::enable_shared_from_this<Problem>
...
@@ -193,7 +198,8 @@ class Problem : public std::enable_shared_from_this<Problem>
* - Add it to Trajectory
* - Add it to Trajectory
* - If it is key-frame, update state-block lists in Problem
* - If it is key-frame, update state-block lists in Problem
*/
*/
FrameBasePtr
emplaceFrame
(
FrameType
_frame_key_type
,
const
TimeStamp
&
_time_stamp
);
FrameBasePtr
emplaceFrame
(
FrameType
_frame_key_type
,
const
TimeStamp
&
_time_stamp
);
// State getters
// State getters
Eigen
::
VectorXs
getCurrentState
();
Eigen
::
VectorXs
getCurrentState
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment