Merge branch 'V7_dev'

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

diff --git a/src/engine/ElementaryNode.hxx b/src/engine/ElementaryNode.hxx
index db82867dd1f77e12ad6711455c7fcf87f821549b..5544c86fbbac52299d09242cd22180214d46a63d 100644 (file)
--- a/src/engine/ElementaryNode.hxx
+++ b/src/engine/ElementaryNode.hxx
@@ -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
@@ -69,6 +69,7 @@ namespace YACS
       void getReadyTasks(std::vector<Task *>& tasks);
       void edRemovePort(Port *port) throw(Exception);
       std::list<ElementaryNode *> getRecursiveConstituents() const;
+      std::list<ProgressWeight> getProgressWeight() const;
       Node *getChildByName(const std::string& name) const throw(Exception);
       virtual void checkBasicConsistency() const throw(Exception);
       ComposedNode *getDynClonerIfExists(const ComposedNode *levelToStop) const;
@@ -105,6 +106,8 @@ namespace YACS
       virtual void edUpdateState();
       virtual void ensureLoading();
 
+      int getMaxLevelOfParallelism() const { return 1; }
+
       //run part
       void begin();
       bool isReady();
@@ -126,6 +129,7 @@ namespace YACS
       virtual void addDatastreamPortToInitMultiService(const std::string & port_name,
                                                        int number) {}
     protected:
+      void initCommonPartWithoutStateManagement(bool start);
       // Management of multi property
       virtual void createMultiDatastreamPorts();