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

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

diff --git a/src/engine/Switch.hxx b/src/engine/Switch.hxx
index 49c620c5cde536ecaf85068e2253cd52639b2203..a635bdb417337f301f85705d165ec7a1d90b3e26 100644 (file)
--- a/src/engine/Switch.hxx
+++ b/src/engine/Switch.hxx
@@ -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;
@@ -116,6 +116,8 @@ namespace YACS
       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;