From 49d9d1f003db6542601d3e415a6081706f6b23ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu> Date: Thu, 17 Dec 2020 23:41:04 +0100 Subject: [PATCH] Fis Capture and Feature print methods --- src/capture/capture_base.cpp | 4 +++- src/feature/feature_base.cpp | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/capture/capture_base.cpp b/src/capture/capture_base.cpp index 0ee44db53..489d67637 100644 --- a/src/capture/capture_base.cpp +++ b/src/capture/capture_base.cpp @@ -236,6 +236,8 @@ 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 { + _stream << _tabs << "Cap" << id() << " " << getType(); + if(getSensor() != nullptr) { _stream << " -> Sen" << getSensor()->id(); @@ -260,7 +262,7 @@ void CaptureBase::printHeader(int _depth, bool _constr_by, bool _metric, bool _s { auto sb = getStateBlock(key); if (sb) - _stream << _tabs << key << "[" << (sb->isFixed() ? "Fix" : "Est") << "] = ( " << sb->getState().transpose() << " ) @ " << sb << std::endl; + _stream << " " + _tabs << key << "[" << (sb->isFixed() ? "Fix" : "Est") << "] = ( " << sb->getState().transpose() << " ) @ " << sb << std::endl; } } else if (_metric) diff --git a/src/feature/feature_base.cpp b/src/feature/feature_base.cpp index b864e27c8..c2af9127c 100644 --- a/src/feature/feature_base.cpp +++ b/src/feature/feature_base.cpp @@ -194,7 +194,6 @@ void FeatureBase::printHeader(int _depth, bool _constr_by, bool _metric, bool _s void FeatureBase::print(int _depth, bool _constr_by, bool _metric, bool _state_blocks, std::ostream& _stream, std::string _tabs) const { - _stream << _tabs << "id: " << id() << std::endl; printHeader(_depth, _constr_by, _metric, _state_blocks, _stream, _tabs); if (_depth >= 4) for (auto c : getFactorList()) -- GitLab