New test of MacroNodes

diff --git a/Superv/Graphs/GraphAdd.xml b/Superv/Graphs/GraphAdd.xml
new file mode 100644 (file)
index 0000000..7ebce75
--- /dev/null
+++ b/Superv/Graphs/GraphAdd.xml
@@ -0,0 +1,92 @@
+<!DOCTYPE SuperGraph>
+<supergraph>
+ <dataflow>
+  <info-list>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>GraphAdd</node-name>
+    <kind>1</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>aNewDataFlow</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Add__x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Add__y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Add__FuncValue</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Add__z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:2:26</creation-date>
+    <lastmodification-date>28/9/2005 - 16:2:39</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>?</comment>
+    <x-position>0</x-position>
+    <y-position>0</y-position>
+   </node>
+  </info-list>
+  <node-list>
+   <node>
+    <component-name>AddComponent</component-name>
+    <interface-name>AddComponent</interface-name>
+    <node-name>Add</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>Add</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>FuncValue</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:2:39</creation-date>
+    <lastmodification-date>28/9/2005 - 16:2:39</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>Add from AddComponent</comment>
+    <x-position>55</x-position>
+    <y-position>61</y-position>
+   </node>
+  </node-list>
+  <link-list/>
+  <data-list/>
+ </dataflow>
+</supergraph>
+

diff --git a/Superv/Graphs/GraphMacroNodes1.xml b/Superv/Graphs/GraphMacroNodes1.xml
new file mode 100644 (file)
index 0000000..644d256
--- /dev/null
+++ b/Superv/Graphs/GraphMacroNodes1.xml
@@ -0,0 +1,594 @@
+<!DOCTYPE SuperGraph>
+<supergraph>
+ <dataflow>
+  <info-list>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>GraphMacroNodes1_1</node-name>
+    <kind>1</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>GraphMacroNodes1_1</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Add__x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Add__y</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Sub__x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Div__x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Div__y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Mul__z</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Div__z</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Macro_GraphAdd__Add__FuncValue</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Macro_GraphAdd__Add__z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>11/3/2003 - 9:58:58</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>1.04</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>?</comment>
+    <x-position>0</x-position>
+    <y-position>0</y-position>
+   </node>
+  </info-list>
+  <node-list>
+   <node>
+    <component-name>AddComponent</component-name>
+    <interface-name>AddComponent</interface-name>
+    <node-name>Add</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>Add</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>FuncValue</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:42:9</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>1.04</editor-release>
+    <author>?</author>
+    <container>FactoryServer</container>
+    <comment>Add from AddComponent</comment>
+    <x-position>15</x-position>
+    <y-position>241</y-position>
+   </node>
+   <node>
+    <component-name>SubComponent</component-name>
+    <interface-name>SubComponent</interface-name>
+    <node-name>Sub</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>Sub</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:42:9</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>1.04</editor-release>
+    <author>?</author>
+    <container>FactoryServer</container>
+    <comment>Sub from SubComponent</comment>
+    <x-position>227</x-position>
+    <y-position>99</y-position>
+   </node>
+   <node>
+    <component-name>MulComponent</component-name>
+    <interface-name>MulComponent</interface-name>
+    <node-name>Mul</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>Mul</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:42:9</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>1.04</editor-release>
+    <author>?</author>
+    <container>FactoryServer</container>
+    <comment>Mul from MulComponent</comment>
+    <x-position>468</x-position>
+    <y-position>301</y-position>
+   </node>
+   <node>
+    <component-name>DivComponent</component-name>
+    <interface-name>DivComponent</interface-name>
+    <node-name>Div</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>Div</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:42:9</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>1.04</editor-release>
+    <author>?</author>
+    <container>FactoryServer</container>
+    <comment>Div from DivComponent</comment>
+    <x-position>642</x-position>
+    <y-position>128</y-position>
+   </node>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>Macro_GraphAdd</node-name>
+    <kind>10</kind>
+    <coupled-node>GraphAdd_1</coupled-node>
+    <service>
+     <service-name>GraphAdd</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Add__x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Add__y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Add__FuncValue</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Add__z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list>
+     <PyFunction>
+      <FuncName>?</FuncName>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>28/9/2005 - 16:42:9</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>Macro Node</comment>
+    <x-position>434</x-position>
+    <y-position>128</y-position>
+   </node>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>Macro_GraphSub</node-name>
+    <kind>10</kind>
+    <coupled-node>GraphSub_1</coupled-node>
+    <service>
+     <service-name>GraphSub</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Sub__x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Sub__y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Sub__z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list>
+     <PyFunction>
+      <FuncName>?</FuncName>
+      <PyFunc><![CDATA[?]]></PyFunc>
+     </PyFunction>
+    </PyFunction-list>
+    <creation-date>28/9/2005 - 16:42:9</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>Macro Node</comment>
+    <x-position>240</x-position>
+    <y-position>301</y-position>
+   </node>
+  </node-list>
+  <link-list>
+   <link>
+    <fromnode-name>Add</fromnode-name>
+    <fromserviceparameter-name>FuncValue</fromserviceparameter-name>
+    <tonode-name>Macro_GraphSub</tonode-name>
+    <toserviceparameter-name>Sub__x</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>Add</fromnode-name>
+    <fromserviceparameter-name>FuncValue</fromserviceparameter-name>
+    <tonode-name>Macro_GraphAdd</tonode-name>
+    <toserviceparameter-name>Add__y</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>Add</fromnode-name>
+    <fromserviceparameter-name>z</fromserviceparameter-name>
+    <tonode-name>Sub</tonode-name>
+    <toserviceparameter-name>y</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>Add</fromnode-name>
+    <fromserviceparameter-name>z</fromserviceparameter-name>
+    <tonode-name>Macro_GraphSub</tonode-name>
+    <toserviceparameter-name>Sub__y</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>Sub</fromnode-name>
+    <fromserviceparameter-name>z</fromserviceparameter-name>
+    <tonode-name>Mul</tonode-name>
+    <toserviceparameter-name>x</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>Sub</fromnode-name>
+    <fromserviceparameter-name>z</fromserviceparameter-name>
+    <tonode-name>Macro_GraphAdd</tonode-name>
+    <toserviceparameter-name>Add__x</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>Macro_GraphAdd</fromnode-name>
+    <fromserviceparameter-name>Gate</fromserviceparameter-name>
+    <tonode-name>Div</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>Macro_GraphSub</fromnode-name>
+    <fromserviceparameter-name>Sub__z</fromserviceparameter-name>
+    <tonode-name>Mul</tonode-name>
+    <toserviceparameter-name>y</toserviceparameter-name>
+    <coord-list/>
+   </link>
+   <link>
+    <fromnode-name>Macro_GraphSub</fromnode-name>
+    <fromserviceparameter-name>Gate</fromserviceparameter-name>
+    <tonode-name>Mul</tonode-name>
+    <toserviceparameter-name>Gate</toserviceparameter-name>
+    <coord-list/>
+   </link>
+  </link-list>
+  <data-list>
+   <data>
+    <fromnode-name>GraphMacroNodes1_1</fromnode-name>
+    <fromserviceparameter-name>Add__x</fromserviceparameter-name>
+    <tonode-name>Add</tonode-name>
+    <toserviceparameter-name>x</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>3</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>GraphMacroNodes1_1</fromnode-name>
+    <fromserviceparameter-name>Add__y</fromserviceparameter-name>
+    <tonode-name>Add</tonode-name>
+    <toserviceparameter-name>y</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>4.5</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>GraphMacroNodes1_1</fromnode-name>
+    <fromserviceparameter-name>Sub__x</fromserviceparameter-name>
+    <tonode-name>Sub</tonode-name>
+    <toserviceparameter-name>x</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>1.5</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>GraphMacroNodes1_1</fromnode-name>
+    <fromserviceparameter-name>Div__x</fromserviceparameter-name>
+    <tonode-name>Div</tonode-name>
+    <toserviceparameter-name>x</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>1</value>
+    </data-value>
+    <coord-list/>
+   </data>
+   <data>
+    <fromnode-name>GraphMacroNodes1_1</fromnode-name>
+    <fromserviceparameter-name>Div__y</fromserviceparameter-name>
+    <tonode-name>Div</tonode-name>
+    <toserviceparameter-name>y</toserviceparameter-name>
+    <data-value>
+     <value-type>7</value-type>
+     <value>2</value>
+    </data-value>
+    <coord-list/>
+   </data>
+  </data-list>
+ </dataflow>
+ <dataflow>
+  <info-list>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>GraphAdd_1</node-name>
+    <kind>1</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>GraphAdd_1</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Add__x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Add__y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Add__FuncValue</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Add__z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:2:26</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>?</comment>
+    <x-position>0</x-position>
+    <y-position>0</y-position>
+   </node>
+  </info-list>
+  <node-list>
+   <node>
+    <component-name>AddComponent</component-name>
+    <interface-name>AddComponent</interface-name>
+    <node-name>Add</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>Add</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>FuncValue</outParameter-name>
+      </outParameter>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:42:9</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>Add from AddComponent</comment>
+    <x-position>55</x-position>
+    <y-position>61</y-position>
+   </node>
+  </node-list>
+  <link-list/>
+  <data-list/>
+ </dataflow>
+ <dataflow>
+  <info-list>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>GraphSub_1</node-name>
+    <kind>1</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>GraphSub_1</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Sub__x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Sub__y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Sub__z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:4:7</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>?</comment>
+    <x-position>0</x-position>
+    <y-position>0</y-position>
+   </node>
+  </info-list>
+  <node-list>
+   <node>
+    <component-name>SubComponent</component-name>
+    <interface-name>SubComponent</interface-name>
+    <node-name>Sub</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>Sub</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:42:9</creation-date>
+    <lastmodification-date>28/9/2005 - 16:42:9</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>Sub from SubComponent</comment>
+    <x-position>55</x-position>
+    <y-position>71</y-position>
+   </node>
+  </node-list>
+  <link-list/>
+  <data-list/>
+ </dataflow>
+</supergraph>
+

diff --git a/Superv/Graphs/GraphSub.xml b/Superv/Graphs/GraphSub.xml
new file mode 100644 (file)
index 0000000..bb916ee
--- /dev/null
+++ b/Superv/Graphs/GraphSub.xml
@@ -0,0 +1,84 @@
+<!DOCTYPE SuperGraph>
+<supergraph>
+ <dataflow>
+  <info-list>
+   <node>
+    <component-name>?</component-name>
+    <interface-name>?</interface-name>
+    <node-name>GraphSub</node-name>
+    <kind>1</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>GraphSub</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Sub__x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>Sub__y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>Sub__z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:4:7</creation-date>
+    <lastmodification-date>28/9/2005 - 16:4:20</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>?</container>
+    <comment>?</comment>
+    <x-position>0</x-position>
+    <y-position>0</y-position>
+   </node>
+  </info-list>
+  <node-list>
+   <node>
+    <component-name>SubComponent</component-name>
+    <interface-name>SubComponent</interface-name>
+    <node-name>Sub</node-name>
+    <kind>0</kind>
+    <coupled-node>?</coupled-node>
+    <service>
+     <service-name>Sub</service-name>
+     <inParameter-list>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>x</inParameter-name>
+      </inParameter>
+      <inParameter>
+       <inParameter-type>double</inParameter-type>
+       <inParameter-name>y</inParameter-name>
+      </inParameter>
+     </inParameter-list>
+     <outParameter-list>
+      <outParameter>
+       <outParameter-type>double</outParameter-type>
+       <outParameter-name>z</outParameter-name>
+      </outParameter>
+     </outParameter-list>
+    </service>
+    <DataStream-list/>
+    <PyFunction-list/>
+    <creation-date>28/9/2005 - 16:4:20</creation-date>
+    <lastmodification-date>28/9/2005 - 16:4:20</lastmodification-date>
+    <editor-release>2.0</editor-release>
+    <author>?</author>
+    <container>localhost/FactoryServer</container>
+    <comment>Sub from SubComponent</comment>
+    <x-position>55</x-position>
+    <y-position>71</y-position>
+   </node>
+  </node-list>
+  <link-list/>
+  <data-list/>
+ </dataflow>
+</supergraph>
+

diff --git a/Superv/Python/GraphAdd.py b/Superv/Python/GraphAdd.py
new file mode 100644 (file)
index 0000000..98fd731
--- /dev/null
+++ b/Superv/Python/GraphAdd.py
@@ -0,0 +1,39 @@
+
+# Generated python file of Graph GraphAdd
+
+from SuperV import *
+
+# Graph creation of GraphAdd
+def DefGraphAdd() :
+    GraphAdd = Graph( 'GraphAdd' )
+    GraphAdd.SetName( 'GraphAdd' )
+    GraphAdd.SetAuthor( '' )
+    GraphAdd.SetComment( '' )
+    GraphAdd.Coords( 0 , 0 )
+    
+    # Creation of Factory Nodes
+    
+    Add = GraphAdd.FNode( 'AddComponent' , 'AddComponent' , 'Add' )
+    Add.SetName( 'Add' )
+    Add.SetAuthor( '' )
+    Add.SetContainer( 'localhost/FactoryServer' )
+    Add.SetComment( 'Add from AddComponent' )
+    Add.Coords( 55 , 61 )
+    IAddx = Add.GetInPort( 'x' )
+    IAddy = Add.GetInPort( 'y' )
+    IAddGate = Add.GetInPort( 'Gate' )
+    OAddFuncValue = Add.GetOutPort( 'FuncValue' )
+    OAddz = Add.GetOutPort( 'z' )
+    OAddGate = Add.GetOutPort( 'Gate' )
+    
+    # Input Ports of the graph
+    #IAddx = Add.GetInPort( 'x' )
+    #IAddy = Add.GetInPort( 'y' )
+    
+    # Output Ports of the graph
+    #OAddFuncValue = Add.GetOutPort( 'FuncValue' )
+    #OAddz = Add.GetOutPort( 'z' )
+    return GraphAdd
+
+
+GraphAdd = DefGraphAdd()

diff --git a/Superv/Python/GraphMacroNodes1.py b/Superv/Python/GraphMacroNodes1.py
new file mode 100644 (file)
index 0000000..46e9adc
--- /dev/null
+++ b/Superv/Python/GraphMacroNodes1.py
@@ -0,0 +1,209 @@
+
+# Generated python file of Graph GraphMacroNodes1
+
+from SuperV import *
+
+# Graph creation of GraphMacroNodes1
+def DefGraphMacroNodes1() :
+    GraphMacroNodes1 = Graph( 'GraphMacroNodes1' )
+    GraphMacroNodes1.SetName( 'GraphMacroNodes1' )
+    GraphMacroNodes1.SetAuthor( '' )
+    GraphMacroNodes1.SetComment( '' )
+    GraphMacroNodes1.Coords( 0 , 0 )
+    
+    # Creation of Factory Nodes
+    
+    Add = GraphMacroNodes1.FNode( 'AddComponent' , 'AddComponent' , 'Add' )
+    Add.SetName( 'Add' )
+    Add.SetAuthor( '' )
+    Add.SetContainer( 'FactoryServer' )
+    Add.SetComment( 'Add from AddComponent' )
+    Add.Coords( 15 , 241 )
+    IAddx = Add.GetInPort( 'x' )
+    IAddy = Add.GetInPort( 'y' )
+    IAddGate = Add.GetInPort( 'Gate' )
+    OAddFuncValue = Add.GetOutPort( 'FuncValue' )
+    OAddz = Add.GetOutPort( 'z' )
+    OAddGate = Add.GetOutPort( 'Gate' )
+    
+    Sub = GraphMacroNodes1.FNode( 'SubComponent' , 'SubComponent' , 'Sub' )
+    Sub.SetName( 'Sub' )
+    Sub.SetAuthor( '' )
+    Sub.SetContainer( 'FactoryServer' )
+    Sub.SetComment( 'Sub from SubComponent' )
+    Sub.Coords( 227 , 99 )
+    ISubx = Sub.GetInPort( 'x' )
+    ISuby = Sub.GetInPort( 'y' )
+    ISubGate = Sub.GetInPort( 'Gate' )
+    OSubz = Sub.GetOutPort( 'z' )
+    OSubGate = Sub.GetOutPort( 'Gate' )
+    
+    Mul = GraphMacroNodes1.FNode( 'MulComponent' , 'MulComponent' , 'Mul' )
+    Mul.SetName( 'Mul' )
+    Mul.SetAuthor( '' )
+    Mul.SetContainer( 'FactoryServer' )
+    Mul.SetComment( 'Mul from MulComponent' )
+    Mul.Coords( 469 , 304 )
+    IMulx = Mul.GetInPort( 'x' )
+    IMuly = Mul.GetInPort( 'y' )
+    IMulGate = Mul.GetInPort( 'Gate' )
+    OMulz = Mul.GetOutPort( 'z' )
+    OMulGate = Mul.GetOutPort( 'Gate' )
+    
+    Div = GraphMacroNodes1.FNode( 'DivComponent' , 'DivComponent' , 'Div' )
+    Div.SetName( 'Div' )
+    Div.SetAuthor( '' )
+    Div.SetContainer( 'FactoryServer' )
+    Div.SetComment( 'Div from DivComponent' )
+    Div.Coords( 668 , 200 )
+    IDivx = Div.GetInPort( 'x' )
+    IDivy = Div.GetInPort( 'y' )
+    IDivGate = Div.GetInPort( 'Gate' )
+    ODivz = Div.GetOutPort( 'z' )
+    ODivGate = Div.GetOutPort( 'Gate' )
+    
+    # Creation of Macro Nodes
+    GraphAdd = DefGraphAdd()
+    Macro_GraphAdd = GraphMacroNodes1.GraphMNode( GraphAdd )
+    Macro_GraphAdd.SetCoupled( 'GraphAdd' )
+    Macro_GraphAdd.SetName( 'Macro_GraphAdd' )
+    Macro_GraphAdd.SetAuthor( '' )
+    Macro_GraphAdd.SetComment( 'Macro Node' )
+    Macro_GraphAdd.Coords( 434 , 128 )
+    IMacro_GraphAddAdd__x = Macro_GraphAdd.GetInPort( 'Add__x' )
+    IMacro_GraphAddAdd__y = Macro_GraphAdd.GetInPort( 'Add__y' )
+    IMacro_GraphAddGate = Macro_GraphAdd.GetInPort( 'Gate' )
+    OMacro_GraphAddAdd__FuncValue = Macro_GraphAdd.GetOutPort( 'Add__FuncValue' )
+    OMacro_GraphAddAdd__z = Macro_GraphAdd.GetOutPort( 'Add__z' )
+    OMacro_GraphAddGate = Macro_GraphAdd.GetOutPort( 'Gate' )
+    
+    GraphSub = DefGraphSub()
+    Macro_GraphSub = GraphMacroNodes1.GraphMNode( GraphSub )
+    Macro_GraphSub.SetCoupled( 'GraphSub' )
+    Macro_GraphSub.SetName( 'Macro_GraphSub' )
+    Macro_GraphSub.SetAuthor( '' )
+    Macro_GraphSub.SetComment( 'Macro Node' )
+    Macro_GraphSub.Coords( 240 , 301 )
+    IMacro_GraphSubSub__x = Macro_GraphSub.GetInPort( 'Sub__x' )
+    IMacro_GraphSubSub__y = Macro_GraphSub.GetInPort( 'Sub__y' )
+    IMacro_GraphSubGate = Macro_GraphSub.GetInPort( 'Gate' )
+    OMacro_GraphSubSub__z = Macro_GraphSub.GetOutPort( 'Sub__z' )
+    OMacro_GraphSubGate = Macro_GraphSub.GetOutPort( 'Gate' )
+    
+    # Creation of Links
+    LAddFuncValueMacro_GraphSubSub__x = GraphMacroNodes1.Link( OAddFuncValue , IMacro_GraphSubSub__x )
+    
+    LAddFuncValueMacro_GraphAddAdd__y = GraphMacroNodes1.Link( OAddFuncValue , IMacro_GraphAddAdd__y )
+    
+    LAddzSuby = GraphMacroNodes1.Link( OAddz , ISuby )
+    
+    LAddzMacro_GraphSubSub__y = GraphMacroNodes1.Link( OAddz , IMacro_GraphSubSub__y )
+    
+    LSubzMulx = GraphMacroNodes1.Link( OSubz , IMulx )
+    
+    LSubzMacro_GraphAddAdd__x = GraphMacroNodes1.Link( OSubz , IMacro_GraphAddAdd__x )
+    
+    LMacro_GraphAddGateDivGate = GraphMacroNodes1.Link( OMacro_GraphAddGate , IDivGate )
+    
+    LMacro_GraphSubSub__zMuly = GraphMacroNodes1.Link( OMacro_GraphSubSub__z , IMuly )
+    
+    LMacro_GraphSubGateMulGate = GraphMacroNodes1.Link( OMacro_GraphSubGate , IMulGate )
+    
+    # Input datas
+    IAddx.Input( 3 )
+    IAddy.Input( 4.5 )
+    ISubx.Input( 1.5 )
+    IDivx.Input( 1 )
+    IDivy.Input( 2 )
+    
+    # Output Ports of the graph
+    #OMulz = Mul.GetOutPort( 'z' )
+    #ODivz = Div.GetOutPort( 'z' )
+    #OMacro_GraphAddAdd__FuncValue = Macro_GraphAdd.GetOutPort( 'Add__FuncValue' )
+    #OMacro_GraphAddAdd__z = Macro_GraphAdd.GetOutPort( 'Add__z' )
+    return GraphMacroNodes1
+
+# Graph creation of GraphAdd
+def DefGraphAdd() :
+    GraphAdd = Graph( 'GraphAdd' )
+    GraphAdd.SetCoupled( 'Macro_GraphAdd' )
+    GraphAdd.SetName( 'GraphAdd' )
+    GraphAdd.SetAuthor( '' )
+    GraphAdd.SetComment( '' )
+    GraphAdd.Coords( 0 , 0 )
+    
+    # Creation of Factory Nodes
+    
+    Add = GraphAdd.FNode( 'AddComponent' , 'AddComponent' , 'Add' )
+    Add.SetName( 'Add' )
+    Add.SetAuthor( '' )
+    Add.SetContainer( 'localhost/FactoryServer' )
+    Add.SetComment( 'Add from AddComponent' )
+    Add.Coords( 55 , 61 )
+    IAddx = Add.GetInPort( 'x' )
+    IAddy = Add.GetInPort( 'y' )
+    IAddGate = Add.GetInPort( 'Gate' )
+    OAddFuncValue = Add.GetOutPort( 'FuncValue' )
+    OAddz = Add.GetOutPort( 'z' )
+    OAddGate = Add.GetOutPort( 'Gate' )
+    
+    # Input Ports of the graph
+    #IAddx = Add.GetInPort( 'x' )
+    #IAddy = Add.GetInPort( 'y' )
+    
+    # Output Ports of the graph
+    #OAddFuncValue = Add.GetOutPort( 'FuncValue' )
+    #OAddz = Add.GetOutPort( 'z' )
+    return GraphAdd
+
+# Graph creation of GraphSub
+def DefGraphSub() :
+    GraphSub = Graph( 'GraphSub' )
+    GraphSub.SetCoupled( 'Macro_GraphSub' )
+    GraphSub.SetName( 'GraphSub' )
+    GraphSub.SetAuthor( '' )
+    GraphSub.SetComment( '' )
+    GraphSub.Coords( 0 , 0 )
+    
+    # Creation of Factory Nodes
+    
+    Sub = GraphSub.FNode( 'SubComponent' , 'SubComponent' , 'Sub' )
+    Sub.SetName( 'Sub' )
+    Sub.SetAuthor( '' )
+    Sub.SetContainer( 'localhost/FactoryServer' )
+    Sub.SetComment( 'Sub from SubComponent' )
+    Sub.Coords( 55 , 71 )
+    ISubx = Sub.GetInPort( 'x' )
+    ISuby = Sub.GetInPort( 'y' )
+    ISubGate = Sub.GetInPort( 'Gate' )
+    OSubz = Sub.GetOutPort( 'z' )
+    OSubGate = Sub.GetOutPort( 'Gate' )
+    
+    # Input Ports of the graph
+    #ISubx = Sub.GetInPort( 'x' )
+    #ISuby = Sub.GetInPort( 'y' )
+    
+    # Output Ports of the graph
+    #OSubz = Sub.GetOutPort( 'z' )
+    return GraphSub
+
+
+GraphMacroNodes1 = DefGraphMacroNodes1()
+
+exec GraphMacroNodes1.ListNodes()
+# Add,Sub,Mul,Div,Macro_GraphAdd,Macro_GraphSub
+
+GraphMacroNodes1.Run()
+GraphMacroNodes1.DoneW()
+print "GraphMacroNodes1",GraphMacroNodes1.State()
+print "Macro_GraphAdd",Macro_GraphAdd.State()
+print "Macro_GraphSub",Macro_GraphSub.State()
+print "Mul",Mul.State()
+print "Div",Div.State()
+
+Macro_GraphSub.PrintPorts()
+Mul.PrintPorts()
+
+Macro_GraphAdd.PrintPorts()
+Div.PrintPorts()
+

diff --git a/Superv/Python/GraphSub.py b/Superv/Python/GraphSub.py
new file mode 100644 (file)
index 0000000..debcd6d
--- /dev/null
+++ b/Superv/Python/GraphSub.py
@@ -0,0 +1,37 @@
+
+# Generated python file of Graph GraphSub
+
+from SuperV import *
+
+# Graph creation of GraphSub
+def DefGraphSub() :
+    GraphSub = Graph( 'GraphSub' )
+    GraphSub.SetName( 'GraphSub' )
+    GraphSub.SetAuthor( '' )
+    GraphSub.SetComment( '' )
+    GraphSub.Coords( 0 , 0 )
+    
+    # Creation of Factory Nodes
+    
+    Sub = GraphSub.FNode( 'SubComponent' , 'SubComponent' , 'Sub' )
+    Sub.SetName( 'Sub' )
+    Sub.SetAuthor( '' )
+    Sub.SetContainer( 'localhost/FactoryServer' )
+    Sub.SetComment( 'Sub from SubComponent' )
+    Sub.Coords( 55 , 71 )
+    ISubx = Sub.GetInPort( 'x' )
+    ISuby = Sub.GetInPort( 'y' )
+    ISubGate = Sub.GetInPort( 'Gate' )
+    OSubz = Sub.GetOutPort( 'z' )
+    OSubGate = Sub.GetOutPort( 'Gate' )
+    
+    # Input Ports of the graph
+    #ISubx = Sub.GetInPort( 'x' )
+    #ISuby = Sub.GetInPort( 'y' )
+    
+    # Output Ports of the graph
+    #OSubz = Sub.GetOutPort( 'z' )
+    return GraphSub
+
+
+GraphSub = DefGraphSub()