Merge remote-tracking branch 'origin/master' into V9_dev

[modules/yacs.git] / src / engine / ElementaryNode.cxx

diff --git a/src/engine/ElementaryNode.cxx b/src/engine/ElementaryNode.cxx
index e628ae6369d6b5b35cbd6e7f85b3fc1ce4a1d148..129deaa1d701bbbc0466d8e007ea257854cb7697 100644 (file)
--- a/src/engine/ElementaryNode.cxx
+++ b/src/engine/ElementaryNode.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2006-2015  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2016  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -85,24 +85,25 @@ ElementaryNode::~ElementaryNode()
     delete *iter4;
 }
 
-void ElementaryNode::init(bool start)
+void ElementaryNode::initCommonPartWithoutStateManagement(bool start)
 {
-  DEBTRACE("ElementaryNode::init " << getName() << " " << start << " " << _state);
-
   for(list<OutputPort *>::iterator iter=_setOfOutputPort.begin();iter!=_setOfOutputPort.end();iter++)
     (*iter)->exInit();
   for(list<InputPort *>::iterator iter2=_setOfInputPort.begin();iter2!=_setOfInputPort.end();iter2++)
     (*iter2)->exInit(start);
   _inGate.exReset();
+}
+
+void ElementaryNode::init(bool start)
+{
+  DEBTRACE("ElementaryNode::init " << getName() << " " << start << " " << _state);
+  initCommonPartWithoutStateManagement(start);
   if(_state == YACS::DISABLED)
     {
       exDisabledState(); // to refresh propagation of DISABLED state
-      return;
+      return ;
     }
-  if(start) //complete initialization
-    setState(YACS::READY);
-  else if(_state > YACS::LOADED)//partial initialization (inside a loop)
-    setState(YACS::TORECONNECT);
+  setState(YACS::READY);
 }
 
 bool ElementaryNode::isDeployable() const
@@ -554,14 +555,14 @@ list<ElementaryNode *> ElementaryNode::getRecursiveConstituents() const
  */
 list<ProgressWeight> ElementaryNode::getProgressWeight() const
 {
-       list<ProgressWeight> ret;
-       ProgressWeight myWeight;
-       myWeight.weightTotal=1;
-       if (getState() == YACS::DONE)
-         myWeight.weightDone=1;
-       else
-               myWeight.weightDone=0;
-       ret.push_back(myWeight);
+  list<ProgressWeight> ret;
+  ProgressWeight myWeight;
+  myWeight.weightTotal=1;
+  if (getState() == YACS::DONE)
+    myWeight.weightDone=1;
+  else
+    myWeight.weightDone=0;
+  ret.push_back(myWeight);
   return ret;
 }