Join modifications from branch BR_3_1_0deb

[samples/datafiles.git] / Superv / Python / GraphSwitch1.py

diff --git a/Superv/Python/GraphSwitch1.py b/Superv/Python/GraphSwitch1.py
index 7a150e934035ae643e1e4fc675d2552543982a67..b1ec39f5934b74782a321ab3921bfd816b5ffdf1 100755 (executable)
--- a/Superv/Python/GraphSwitch1.py
+++ b/Superv/Python/GraphSwitch1.py
@@ -24,7 +24,7 @@ def DefGraphSwitch1() :
     IsOdd.SetName( 'IsOdd' )
     IsOdd.SetAuthor( '' )
     IsOdd.SetComment( 'Python function' )
-    IsOdd.Coords( 389 , 65 )
+    IsOdd.Coords( 408 , 34 )
     IIsOdda = IsOdd.InPort( 'a' , 'long' )
     IIsOddGate = IsOdd.GetInPort( 'Gate' )
     OIsOdda = IsOdd.OutPort( 'a' , 'long' )
@@ -49,7 +49,7 @@ def DefGraphSwitch1() :
     EndOfInitLoop.SetName( 'EndOfInitLoop' )
     EndOfInitLoop.SetAuthor( '' )
     EndOfInitLoop.SetComment( 'Compute Node' )
-    EndOfInitLoop.Coords( 768 , 126 )
+    EndOfInitLoop.Coords( 862 , 156 )
     PyEndOfInitLoop = []
     EndOfInitLoop.SetPyFunction( '' , PyEndOfInitLoop )
     IInitLoopDoLoop = InitLoop.GetInPort( 'DoLoop' )
@@ -61,6 +61,7 @@ def DefGraphSwitch1() :
     OInitLoopIndex = InitLoop.GetOutPort( 'Index' )
     OInitLoopMin = InitLoop.GetOutPort( 'Min' )
     OInitLoopMax = InitLoop.GetOutPort( 'Max' )
+    OInitLoopGate = InitLoop.GetOutPort( 'Gate' )
     IEndOfInitLoopDoLoop = EndOfInitLoop.GetInPort( 'DoLoop' )
     IEndOfInitLoopIndex = EndOfInitLoop.GetInPort( 'Index' )
     IEndOfInitLoopMin = EndOfInitLoop.GetInPort( 'Min' )
@@ -87,7 +88,7 @@ def DefGraphSwitch1() :
     EndOfSwitch.SetName( 'EndOfSwitch' )
     EndOfSwitch.SetAuthor( '' )
     EndOfSwitch.SetComment( 'Compute Node' )
-    EndOfSwitch.Coords( 587 , 126 )
+    EndOfSwitch.Coords( 640 , 155 )
     PyEndOfSwitch = []
     EndOfSwitch.SetPyFunction( '' , PyEndOfSwitch )
     IEndOfSwitcha = EndOfSwitch.InPort( 'a' , 'long' )
@@ -107,8 +108,6 @@ def DefGraphSwitch1() :
     
     # Creation of Links
     LIsOddaEndOfSwitcha = GraphSwitch1.Link( OIsOdda , IEndOfSwitcha )
-    LIsOddaEndOfSwitcha.AddCoord( 1 , 571 , 158 )
-    LIsOddaEndOfSwitcha.AddCoord( 2 , 571 , 136 )
     
     LInitLoopIndexSwitcha = GraphSwitch1.Link( OInitLoopIndex , ISwitcha )
     
@@ -118,15 +117,11 @@ def DefGraphSwitch1() :
     
     LSwitchOddIsOddGate = GraphSwitch1.Link( OSwitchOdd , IIsOddGate )
     
-    LSwitchEvenEndOfSwitchDefault = GraphSwitch1.Link( OSwitchEven , IEndOfSwitchDefault )
-    
     LSwitchaIsOdda = GraphSwitch1.Link( OSwitcha , IIsOdda )
-    LSwitchaIsOdda.AddCoord( 1 , 375 , 136 )
+    LSwitchaIsOdda.AddCoord( 1 , 375 , 105 )
     LSwitchaIsOdda.AddCoord( 2 , 375 , 201 )
     
-    LSwitchaEndOfSwitcha = GraphSwitch1.Link( OSwitcha , IEndOfSwitcha )
-    LSwitchaEndOfSwitcha.AddCoord( 1 , 571 , 161 )
-    LSwitchaEndOfSwitcha.AddCoord( 2 , 570 , 221 )
+    LSwitchDefaultEndOfSwitchDefault = GraphSwitch1.Link( OSwitchDefault , IEndOfSwitchDefault )
     
     LEndOfSwitchaEndOfInitLoopIndex = GraphSwitch1.Link( OEndOfSwitcha , IEndOfInitLoopIndex )
     
@@ -139,6 +134,7 @@ def DefGraphSwitch1() :
     #OEndOfInitLoopIndex = EndOfInitLoop.GetOutPort( 'Index' )
     #OEndOfInitLoopMin = EndOfInitLoop.GetOutPort( 'Min' )
     #OEndOfInitLoopMax = EndOfInitLoop.GetOutPort( 'Max' )
+    #OSwitchEven = Switch.GetOutPort( 'Even' )
     return GraphSwitch1