set->list in Node.getOutNodes

diff --git a/src/engine/Bloc.cxx b/src/engine/Bloc.cxx
index 07f1e6be66017bca8783d22fbed9783cc32cfd3a..e7fa7f74cb26696ff6ec0f535eb9ca069f5cfe27 100644 (file)
--- 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<Node *>& nodeSet)
 {
   bool verdict=true;
-  set<Node *> outNodes=node->getOutNodes();
-  for (set<Node *>::iterator iter=outNodes.begin();iter!=outNodes.end(); iter++)
+  list<Node *> outNodes=node->getOutNodes();
+  for (list<Node *>::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" ;
-    list<Node *>nodes=getChildren();
-    for(list<Node *>::const_iterator iter=nodes.begin();iter!=nodes.end();iter++)
+  os << "  subgraph cluster_" << getId() << "  {\n" ;
+  list<Node *>nodes=getChildren();
+  for(list<Node *>::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";
-        set<Node *>outnodes = (*iter)->getOutNodes();
-        for(set<Node *>::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";
+      list<Node *>outnodes = (*iter)->getOutNodes();
+      for(list<Node *>::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 b03914f111cb1b06017b778cea1e2d48439fba6d..75ed0d420e15bc46382b026ac6030acab832fb93 100644 (file)
--- 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 *> Node::getOutNodes() const
+list<Node *> Node::getOutNodes() const
 {
-  set<Node *> ret;
+  list<Node *> ret;
   list<InGate *> inGates=_outGate.edSetInGate();
   for(list<InGate *>::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 e94b0a4add2ccfe21a48b12abed54cdf1a6a4807..92a6323170616e1e59f3a7c80ba03dac0cf61da9 100644 (file)
--- 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<Node *> getOutNodes() const;
+      std::list<Node *> getOutNodes() const;
       virtual void writeDot(std::ostream &os) const;
       virtual void exUpdateState();
       virtual void exFailedState();