Merge branch 'V9_2_2_BR'

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

diff --git a/src/engine/Switch.hxx b/src/engine/Switch.hxx
index bc80388a416c02429bae2126d83dce8be58fa3c1..02516e8675beec196c79a8ba04932db9569561b9 100644 (file)
--- a/src/engine/Switch.hxx
+++ b/src/engine/Switch.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2006-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2006-2019  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -40,7 +40,7 @@ namespace YACS
     private:
       int edGetNumberOfOutLinks() const;
       std::set<InPort *> edSetInPort() const;
-      bool isAlreadyLinkedWith(InPort *with) const;
+      bool isAlreadyLinkedWith(InPort *withp) const;
       std::string getNameOfTypeOfCurrentInstance() const;
       void edRemoveAllLinksLinkedWithMe() throw(Exception);
       TypeOfChannel getTypeOfChannel() const;
@@ -111,11 +111,13 @@ namespace YACS
       virtual bool edAddChild(Node *DISOWNnode) throw(Exception);
       int getMaxCase();
       void getReadyTasks(std::vector<Task *>& tasks);
-      void selectRunnableTasks(std::vector<Task *>& tasks);
       std::list<Node *> edGetDirectDescendants() const;
       InputPort *edGetConditionPort() { return &_condition; }
       void writeDot(std::ostream &os) const;
       int getNumberOfInputPorts() const;
+      int getMaxLevelOfParallelism() const;
+      void getWeightRegardingDPL(ComplexWeight *weight);
+      void partitionRegardingDPL(const PartDefinition *pd, std::map<ComposedNode *, YACS::BASES::AutoRefCnt<PartDefinition> >& zeMap);
       void edRemoveChild(Node *node) throw(Exception);
       std::list<InputPort *> getSetOfInputPort() const;
       std::list<InputPort *> getLocalInputPorts() const;
@@ -129,6 +131,7 @@ namespace YACS
       virtual void accept(Visitor *visitor);
       int getRankOfNode(Node *node) const;
       virtual std::string typeName() {return "YACS__ENGINE__Switch";}
+      std::list<ProgressWeight> getProgressWeight() const;
     protected:
       YACS::Event updateStateOnFinishedEventFrom(Node *node);
       Node *simpleClone(ComposedNode *father, bool editionOnly=true) const;