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
0649efeb
Commit
0649efeb
authored
8 years ago
by
Joan Solà Ortega
Browse files
Options
Downloads
Patches
Plain Diff
Remove comments
parent
82c7e459
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/capture_motion.h
+3
-21
3 additions, 21 deletions
src/capture_motion.h
src/problem.cpp
+1
-8
1 addition, 8 deletions
src/problem.cpp
src/problem.h
+1
-1
1 addition, 1 deletion
src/problem.h
with
5 additions
and
30 deletions
src/capture_motion.h
+
3
−
21
View file @
0649efeb
...
...
@@ -71,9 +71,9 @@ class CaptureMotion : public CaptureBase
// member data:
private:
Eigen
::
VectorXs
data_
;
///< Motion data in form of vector mandatory
Eigen
::
MatrixXs
data_cov_
;
///< Motion data covariance
MotionBuffer
buffer_
;
///< Buffer of motions between this Capture and the next one.
Eigen
::
VectorXs
data_
;
///< Motion data in form of vector mandatory
Eigen
::
MatrixXs
data_cov_
;
///< Motion data covariance
MotionBuffer
buffer_
;
///< Buffer of motions between this Capture and the next one.
FrameBasePtr
origin_frame_ptr_
;
///< Pointer to the origin frame of the motion
};
...
...
@@ -86,24 +86,8 @@ inline CaptureMotion::CaptureMotion(const TimeStamp& _ts, SensorBasePtr _sensor_
origin_frame_ptr_
(
_origin_frame_ptr
)
{
//
// std::cout << "constructed +C-Mot" << id() << std::endl;
}
//inline CaptureMotion::CaptureMotion(const TimeStamp& _ts, SensorBasePtr _sensor_ptr, const Eigen::VectorXs& _data,
// const Eigen::VectorXs& _data_sigmas, FrameBasePtr _origin_frame_ptr) :
// CaptureBase("MOTION", _ts, _sensor_ptr),
// data_(_data),
// data_cov_(_data_sigmas.size(), _data_sigmas.size()),
// buffer_(),
// origin_frame_ptr_(_origin_frame_ptr)
//{
// data_cov_.setZero();
// for (int i = 0; i < _data_sigmas.size(); i++)
// data_cov_(i,i) = _data_sigmas(i) * _data_sigmas(i);
//
//// std::cout << "constructed +C-Mot" << id() << std::endl;
//}
inline
CaptureMotion
::
CaptureMotion
(
const
TimeStamp
&
_ts
,
SensorBasePtr
_sensor_ptr
,
const
Eigen
::
VectorXs
&
_data
,
const
Eigen
::
MatrixXs
&
_data_cov
,
FrameBasePtr
_origin_frame_ptr
)
:
CaptureBase
(
"MOTION"
,
_ts
,
_sensor_ptr
),
...
...
@@ -113,12 +97,10 @@ inline CaptureMotion::CaptureMotion(const TimeStamp& _ts, SensorBasePtr _sensor_
origin_frame_ptr_
(
_origin_frame_ptr
)
{
//
// std::cout << "constructed +C-Mot" << id() << std::endl;
}
inline
CaptureMotion
::~
CaptureMotion
()
{
// std::cout << "destructed -C-Mot" << id() << std::endl;
//
}
...
...
This diff is collapsed.
Click to expand it.
src/problem.cpp
+
1
−
8
View file @
0649efeb
...
...
@@ -565,13 +565,6 @@ FrameBasePtr Problem::setPrior(const Eigen::VectorXs& _prior_state, const Eigen:
// Create origin frame
FrameBasePtr
origin_frame_ptr
=
emplaceFrame
(
KEY_FRAME
,
_prior_state
,
_ts
);
// create origin capture with just pose
// Size pose_size, pose_cov_size;
// getFrameStructureSize(pose_size, pose_cov_size);
// VectorXs pose = _origin_state.head(pose_size);
// MatrixXs pose_cov = _origin_state_cov.topLeftCorner(pose_cov_size,pose_cov_size);
// CaptureFixPtr init_capture = std::make_shared<CaptureFix>(_ts, nullptr, pose, pose_cov);
// create origin capture with the given state as data
CaptureFixPtr
init_capture
=
std
::
make_shared
<
CaptureFix
>
(
_ts
,
nullptr
,
_prior_state
,
_prior_cov
);
origin_frame_ptr
->
addCapture
(
init_capture
);
...
...
@@ -579,7 +572,7 @@ FrameBasePtr Problem::setPrior(const Eigen::VectorXs& _prior_state, const Eigen:
// emplace feature and constraint
init_capture
->
emplaceFeatureAndConstraint
();
// notify processors about the
new
keyframe
// notify
all motion
processors about the
origin
keyframe
for
(
auto
sensor_ptr
:
hardware_ptr_
->
getSensorList
())
for
(
auto
processor_ptr
:
sensor_ptr
->
getProcessorList
())
if
(
processor_ptr
->
isMotion
())
...
...
This diff is collapsed.
Click to expand it.
src/problem.h
+
1
−
1
View file @
0649efeb
...
...
@@ -132,7 +132,7 @@ class Problem : public std::enable_shared_from_this<Problem>
/** \brief Set the processor motion
*
* Set the processor motion.
It will provide the state.
* Set the processor motion.
*/
void
setProcessorMotion
(
ProcessorMotionPtr
_processor_motion_ptr
);
ProcessorMotionPtr
setProcessorMotion
(
const
std
::
string
&
_unique_processor_name
);
...
...
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