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

Merge branch 'devel' into 337-cleanup-frame-constructors-accepting-eigen-vectors-and-matrices

parents 4f39d8bc 846ff15f
No related branches found
No related tags found
1 merge request!372Resolve "Cleanup Frame constructors accepting Eigen vectors and matrices"
Pipeline #5605 passed
...@@ -232,7 +232,7 @@ void CaptureBase::setProblem(ProblemPtr _problem) ...@@ -232,7 +232,7 @@ void CaptureBase::setProblem(ProblemPtr _problem)
void CaptureBase::printHeader(int _depth, bool _constr_by, bool _metric, bool _state_blocks, std::ostream& _stream, std::string _tabs) const void CaptureBase::printHeader(int _depth, bool _constr_by, bool _metric, bool _state_blocks, std::ostream& _stream, std::string _tabs) const
{ {
_stream << _tabs << "Cap" << id() << " " << getType(); _stream << _tabs << "Cap" << id() << " " << getType() << " ts = " << std::setprecision(3) << getTimeStamp();
if(getSensor() != nullptr) if(getSensor() != nullptr)
{ {
...@@ -261,8 +261,7 @@ void CaptureBase::printHeader(int _depth, bool _constr_by, bool _metric, bool _s ...@@ -261,8 +261,7 @@ void CaptureBase::printHeader(int _depth, bool _constr_by, bool _metric, bool _s
} }
else if (_metric) else if (_metric)
{ {
_stream << _tabs << (isFixed() ? "Fix" : "Est") << ", ts=" << std::setprecision(5) _stream << _tabs << (isFixed() ? "Fix" : "Est");
<< getTimeStamp();
_stream << ",\t x= ( " << std::setprecision(2) << getStateVector() << " )"; _stream << ",\t x= ( " << std::setprecision(2) << getStateVector() << " )";
_stream << std::endl; _stream << std::endl;
} }
......
...@@ -72,7 +72,7 @@ bool CaptureMotion::containsTimeStamp (const TimeStamp& _ts, double _time_tolera ...@@ -72,7 +72,7 @@ bool CaptureMotion::containsTimeStamp (const TimeStamp& _ts, double _time_tolera
void CaptureMotion::printHeader(int _depth, bool _constr_by, bool _metric, bool _state_blocks, std::ostream& _stream, std::string _tabs) const void CaptureMotion::printHeader(int _depth, bool _constr_by, bool _metric, bool _state_blocks, std::ostream& _stream, std::string _tabs) const
{ {
_stream << _tabs << "CapM" << id() << " " << getType(); _stream << _tabs << "CapM" << id() << " " << getType() << " ts = " << std::setprecision(3) << getTimeStamp();
if(getSensor() != nullptr) if(getSensor() != nullptr)
{ {
......
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