From 85e1e1d16b3a7bb7efe07f9f9b34702268a2e861 Mon Sep 17 00:00:00 2001 From: Artur Meski Date: Sat, 24 Nov 2018 17:02:26 +0000 Subject: [PATCH] C, E printing, etc. --- formrsctlk.cc | 22 ++++++++++++++++++++++ formrsctlk.hh | 1 + 2 files changed, 23 insertions(+) diff --git a/formrsctlk.cc b/formrsctlk.cc index 9260769..a760321 100644 --- a/formrsctlk.cc +++ b/formrsctlk.cc @@ -93,6 +93,13 @@ std::string FormRSCTLK::toStr(void) const else if (oper == RSCTLK_UK) { return "K[" + getSingleAgent() + "](" + arg[0]->toStr() + ")"; } + else if (oper == RSCTLK_NC) { + return "NC[" + getAgentsStr() + "](" + arg[0]->toStr() + ")"; + } + else if (oper == RSCTLK_UC) { + return "C[" + getAgentsStr() + "](" + arg[0]->toStr() + ")"; + } + else { return "??"; @@ -252,6 +259,21 @@ void FormRSCTLK::encodeActions(const SymRS *srs) } } +std::string FormRSCTLK::getAgentsStr(void) const +{ + std::string r = ""; + bool first = true; + for (const auto &a : agents) + { + if (first) + first = false; + else + r += " "; + r += a; + } + return r; +} + ProcSet FormRSCTLK::getAgentsAsProcSet(RctSys *rs) const { ProcSet processes; diff --git a/formrsctlk.hh b/formrsctlk.hh index add62c7..95ee49a 100644 --- a/formrsctlk.hh +++ b/formrsctlk.hh @@ -292,6 +292,7 @@ class FormRSCTLK assert(oper == RSCTLK_NK || oper == RSCTLK_UK); return *(agents.begin()); } + std::string getAgentsStr(void) const; ProcSet getAgentsAsProcSet(RctSys *rs) const; };