From 4d4a1e85306a84b16da3bc66c1c5f97d2fb66f82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Sol=C3=A0?= <jsola@iri.upc.edu> Date: Wed, 1 Apr 2020 21:45:02 +0200 Subject: [PATCH] Fix some labels --- src/problem/problem.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/problem/problem.cpp b/src/problem/problem.cpp index 815927331..5b89bd683 100644 --- a/src/problem/problem.cpp +++ b/src/problem/problem.cpp @@ -945,13 +945,13 @@ void Problem::print(int depth, std::ostream& stream, bool constr_by, bool metric stream << " PrcM" << p->id() << " " << p->getType() << " \"" << p->getName() << "\"" << std::endl; ProcessorMotionPtr pm = std::static_pointer_cast<ProcessorMotion>(p); if (pm->getOrigin()) - stream << " o: C" << pm->getOrigin()->id() << " - " << (pm->getOrigin()->getFrame()->isKeyOrAux() ? (pm->getOrigin()->getFrame()->isKey() ? " KFrm" : " AFrm" ) : " Frm") + stream << " o: Cap" << pm->getOrigin()->id() << " - " << (pm->getOrigin()->getFrame()->isKeyOrAux() ? (pm->getOrigin()->getFrame()->isKey() ? " KFrm" : " AFrm" ) : " Frm") << pm->getOrigin()->getFrame()->id() << std::endl; if (pm->getLast()) - stream << " l: C" << pm->getLast()->id() << " - " << (pm->getLast()->getFrame()->isKeyOrAux() ? (pm->getLast()->getFrame()->isKey() ? " KFrm" : " AFrm") : " Frm") + stream << " l: Cap" << pm->getLast()->id() << " - " << (pm->getLast()->getFrame()->isKeyOrAux() ? (pm->getLast()->getFrame()->isKey() ? " KFrm" : " AFrm") : " Frm") << pm->getLast()->getFrame()->id() << std::endl; if (pm->getIncoming()) - stream << " i: C" << pm->getIncoming()->id() << std::endl; + stream << " i: Cap" << pm->getIncoming()->id() << std::endl; } else { @@ -960,13 +960,13 @@ void Problem::print(int depth, std::ostream& stream, bool constr_by, bool metric if (pt) { if (pt->getOrigin()) - stream << " o: C" << pt->getOrigin()->id() << " - " << (pt->getOrigin()->getFrame()->isKeyOrAux() ? (pt->getOrigin()->getFrame()->isKey() ? " KFrm" : " AFrm") : " Frm") + stream << " o: Cap" << pt->getOrigin()->id() << " - " << (pt->getOrigin()->getFrame()->isKeyOrAux() ? (pt->getOrigin()->getFrame()->isKey() ? " KFrm" : " AFrm") : " Frm") << pt->getOrigin()->getFrame()->id() << std::endl; if (pt->getLast()) - stream << " l: C" << pt->getLast()->id() << " - " << (pt->getLast()->getFrame()->isKeyOrAux() ? (pt->getLast()->getFrame()->isKey() ? " KFrm" : " AFrm") : " Frm") + stream << " l: Cap" << pt->getLast()->id() << " - " << (pt->getLast()->getFrame()->isKeyOrAux() ? (pt->getLast()->getFrame()->isKey() ? " KFrm" : " AFrm") : " Frm") << pt->getLast()->getFrame()->id() << std::endl; if (pt->getIncoming()) - stream << " i: C" << pt->getIncoming()->id() << std::endl; + stream << " i: Cap" << pt->getIncoming()->id() << std::endl; } } } // for p @@ -1015,7 +1015,7 @@ void Problem::print(int depth, std::ostream& stream, bool constr_by, bool metric stream << " -> Sen" << C->getSensor()->id(); } else - stream << " -> S-"; + stream << " -> Sen-"; if (C->isMotion()) { auto CM = std::static_pointer_cast<CaptureMotion>(C); -- GitLab