From 51a2a6c8712555270d647ec6f108952aca1afa3d Mon Sep 17 00:00:00 2001 From: Anthony Geay Date: Fri, 2 Oct 2015 10:01:44 +0200 Subject: [PATCH] set->list in Node.getOutNodes --- src/engine/Bloc.cxx | 36 ++++++++++++++++++------------------ src/engine/Node.cxx | 6 +++--- src/engine/Node.hxx | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/engine/Bloc.cxx b/src/engine/Bloc.cxx index 07f1e6be6..e7fa7f74c 100644 --- a/src/engine/Bloc.cxx +++ b/src/engine/Bloc.cxx @@ -319,8 +319,8 @@ bool Bloc::isNameAlreadyUsed(const std::string& name) const bool insertNodeChildrenInSet(Node *node, std::set& nodeSet) { bool verdict=true; - set outNodes=node->getOutNodes(); - for (set::iterator iter=outNodes.begin();iter!=outNodes.end(); iter++) + list outNodes=node->getOutNodes(); + for (list::iterator iter=outNodes.begin();iter!=outNodes.end(); iter++) { verdict=(nodeSet.insert(*iter)).second; if (verdict) verdict = insertNodeChildrenInSet((*iter),nodeSet); @@ -420,26 +420,26 @@ YACS::Event Bloc::updateStateOnFailedEventFrom(Node *node, const Executor *execI void Bloc::writeDot(std::ostream &os) const { - os << " subgraph cluster_" << getId() << " {\n" ; - listnodes=getChildren(); - for(list::const_iterator iter=nodes.begin();iter!=nodes.end();iter++) + os << " subgraph cluster_" << getId() << " {\n" ; + listnodes=getChildren(); + for(list::const_iterator iter=nodes.begin();iter!=nodes.end();iter++) { - (*iter)->writeDot(os); - string p=(*iter)->getId(); - //not connected node - if((*iter)->_inGate._backLinks.size() == 0) os << getId() << " -> " << p << ";\n"; - setoutnodes = (*iter)->getOutNodes(); - for(set::const_iterator itout=outnodes.begin();itout!=outnodes.end();itout++) + (*iter)->writeDot(os); + string p=(*iter)->getId(); + //not connected node + if((*iter)->_inGate._backLinks.size() == 0) os << getId() << " -> " << p << ";\n"; + listoutnodes = (*iter)->getOutNodes(); + for(list::const_iterator itout=outnodes.begin();itout!=outnodes.end();itout++) { - os << p << " -> " << (*itout)->getId() << ";\n"; + os << p << " -> " << (*itout)->getId() << ";\n"; } } - os << "}\n" ; - os << getId() << "[fillcolor=\"" ; - YACS::StatesForNode state=getEffectiveState(); - os << getColorState(state); - os << "\" label=\"" << "Bloc:" ; - os << getQualifiedName() <<"\"];\n"; + os << "}\n" ; + os << getId() << "[fillcolor=\"" ; + YACS::StatesForNode state=getEffectiveState(); + os << getColorState(state); + os << "\" label=\"" << "Bloc:" ; + os << getQualifiedName() <<"\"];\n"; } void Bloc::accept(Visitor* visitor) diff --git a/src/engine/Node.cxx b/src/engine/Node.cxx index b03914f11..75ed0d420 100644 --- a/src/engine/Node.cxx +++ b/src/engine/Node.cxx @@ -177,12 +177,12 @@ void Node::setName(const std::string& name) * get the set of all nodes connected to the outGate */ -set Node::getOutNodes() const +list Node::getOutNodes() const { - set ret; + list ret; list inGates=_outGate.edSetInGate(); for(list::iterator iter=inGates.begin();iter!=inGates.end();iter++) - ret.insert((*iter)->getNode()); + ret.push_back((*iter)->getNode()); return ret; } diff --git a/src/engine/Node.hxx b/src/engine/Node.hxx index e94b0a4ad..92a632317 100644 --- a/src/engine/Node.hxx +++ b/src/engine/Node.hxx @@ -124,7 +124,7 @@ namespace YACS ComposedNode * getFather() const { return _father; } const std::string getId() const; bool exIsControlReady() const; - std::set getOutNodes() const; + std::list getOutNodes() const; virtual void writeDot(std::ostream &os) const; virtual void exUpdateState(); virtual void exFailedState(); -- 2.30.2