DCQ : Merge with Ecole_Ete_a6.

[modules/superv.git] / examples / GraphEssai2.py

diff --git a/examples/GraphEssai2.py b/examples/GraphEssai2.py
index aee58ba236003ead8b7f3438439d5670a749a56e..a1489b31e04fd9891fedc98a7ba8bfe0a97468cd 100755 (executable)
--- a/examples/GraphEssai2.py
+++ b/examples/GraphEssai2.py
@@ -9,43 +9,57 @@ GraphEssai2.SetAuthor( '' )
 GraphEssai2.SetComment( '' )
 GraphEssai2.Coords( 0 , 0 )
 
-# Creation of Computing Nodes
-Add = GraphEssai2.Node( 'AddComponent' , 'AddComponent' , 'Add' )
+# Creation of Factory Nodes
+
+Add = GraphEssai2.FNode( 'AddComponent' , 'AddComponent' , 'Add' )
 Add.SetName( 'Add' )
 Add.SetAuthor( '' )
 Add.SetContainer( 'localhost/FactoryServer' )
-Add.SetComment( '' )
-Add.Coords( 49 , 182 )
-Sub = GraphEssai2.Node( 'SubComponent' , 'SubComponent' , 'Sub' )
+Add.SetComment( 'Add from AddComponent' )
+Add.Coords( 18 , 239 )
+
+Sub = GraphEssai2.FNode( 'SubComponent' , 'SubComponent' , 'Sub' )
 Sub.SetName( 'Sub' )
 Sub.SetAuthor( '' )
 Sub.SetContainer( 'localhost/FactoryServer' )
-Sub.SetComment( '' )
-Sub.Coords( 300 , 270 )
-Mul = GraphEssai2.Node( 'MulComponent' , 'MulComponent' , 'Mul' )
+Sub.SetComment( 'Sub from SubComponent' )
+Sub.Coords( 232 , 269 )
+
+Mul = GraphEssai2.FNode( 'MulComponent' , 'MulComponent' , 'Mul' )
 Mul.SetName( 'Mul' )
 Mul.SetAuthor( '' )
 Mul.SetContainer( 'localhost/FactoryServer' )
-Mul.SetComment( '' )
-Mul.Coords( 306 , 28 )
-Div = GraphEssai2.Node( 'DivComponent' , 'DivComponent' , 'Div' )
+Mul.SetComment( 'Mul from MulComponent' )
+Mul.Coords( 431 , 22 )
+
+Div = GraphEssai2.FNode( 'DivComponent' , 'DivComponent' , 'Div' )
 Div.SetName( 'Div' )
 Div.SetAuthor( '' )
 Div.SetContainer( 'localhost/FactoryServer' )
-Div.SetComment( '' )
-Div.Coords( 603 , 156 )
+Div.SetComment( 'Div from DivComponent' )
+Div.Coords( 645 , 268 )
 
-# Creation of intermediate Output variables and of Computing Links
+# Creation of Links
 AddFuncValue = Add.Port( 'FuncValue' )
 Mulx = GraphEssai2.Link( AddFuncValue , Mul.Port( 'x' ) )
+Mulx.AddCoord( 1 , 199 , 102 )
+Mulx.AddCoord( 2 , 198 , 319 )
+
 Addz = Add.Port( 'z' )
 Subx = GraphEssai2.Link( Addz , Sub.Port( 'x' ) )
-SubOutGate = Sub.Port( 'OutGate' )
-MulInGate = GraphEssai2.Link( SubOutGate , Mul.Port( 'InGate' ) )
+
 Subz = Sub.Port( 'z' )
 Divx = GraphEssai2.Link( Subz , Div.Port( 'x' ) )
+
+SubOutGate = Sub.Port( 'OutGate' )
+MulInGate = GraphEssai2.Link( SubOutGate , Mul.Port( 'InGate' ) )
+MulInGate.AddCoord( 1 , 405 , 165 )
+MulInGate.AddCoord( 2 , 405 , 412 )
+
 Mulz = Mul.Port( 'z' )
 Divy = GraphEssai2.Link( Mulz , Div.Port( 'y' ) )
+Divy.AddCoord( 1 , 612 , 377 )
+Divy.AddCoord( 2 , 612 , 103 )
 
 # Creation of Input datas
 Addx = Add.Input( 'x' , 1)