From 8994ca77724d14a6e71d6401e66c548e23783d7c Mon Sep 17 00:00:00 2001
From: imcovangent <I.vanGent@tudelft.nl>
Date: Tue, 7 Aug 2018 18:08:47 +0200
Subject: [PATCH] Removed executableBlocksOrder from CMDOWS and KADMOS as
process graph attribute / metadata.
Former-commit-id: ec4b640d75f2254ae178eec1e4aa6008768dd667
---
kadmos/cmdows/schemas/0.9/cmdows.xml | 6 ++----
kadmos/cmdows/schemas/0.9/cmdows.xsd | 2 +-
kadmos/graph/graph_kadmos.py | 1 -
kadmos/graph/graph_process.py | 4 ----
4 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/kadmos/cmdows/schemas/0.9/cmdows.xml b/kadmos/cmdows/schemas/0.9/cmdows.xml
index 7140719c1..cff469de9 100644
--- a/kadmos/cmdows/schemas/0.9/cmdows.xml
+++ b/kadmos/cmdows/schemas/0.9/cmdows.xml
@@ -658,6 +658,8 @@
<!--Optional:-->
<convergerStepNumber>3</convergerStepNumber>
<diagonalPosition>3</diagonalPosition>
+ <!--Optional:-->
+ <partitionID>3</partitionID>
</node>
</nodes>
<!--Optional:-->
@@ -675,10 +677,6 @@
<functionElement>string</functionElement>
</functionElements>
</loopNesting>
- <executableBlocksOrder>
- <!--1 or more repetitions:-->
- <executableBlock position="3">string</executableBlock>
- </executableBlocksOrder>
</metadata>
</processGraph>
</workflow>
diff --git a/kadmos/cmdows/schemas/0.9/cmdows.xsd b/kadmos/cmdows/schemas/0.9/cmdows.xsd
index 847f78801..86a1e455d 100644
--- a/kadmos/cmdows/schemas/0.9/cmdows.xsd
+++ b/kadmos/cmdows/schemas/0.9/cmdows.xsd
@@ -899,6 +899,7 @@
<xs:element name="processStepNumber" type="xs:int"/>
<xs:element name="convergerStepNumber" type="xs:int" minOccurs="0"/>
<xs:element name="diagonalPosition" type="xs:int"/>
+ <xs:element name="partitionID" type="xs:int" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -909,7 +910,6 @@
<xs:complexType>
<xs:sequence>
<xs:element name="loopNesting" type="loopElementType" minOccurs="0"/>
- <xs:element name="executableBlocksOrder" type="executableBlocksType"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/kadmos/graph/graph_kadmos.py b/kadmos/graph/graph_kadmos.py
index d426e2c55..86bff8a96 100644
--- a/kadmos/graph/graph_kadmos.py
+++ b/kadmos/graph/graph_kadmos.py
@@ -1496,7 +1496,6 @@ class KadmosGraph(nx.DiGraph, EquationMixin, VistomsMixin):
mpg = copy.deepcopy(mpg)
mpg.relabel_function_nodes(mapping)
mpg.graph['process_hierarchy'] = mpg.get_process_hierarchy() # Needs to be updated to meet convention
- mpg.graph['executable_blocks_order'] = mpg.get_process_order() # Needs to be updated to meet convention
# Set basic variables and create CMDOWS element
cmdows_version = str(graph.CMDOWS_VERSION)
diff --git a/kadmos/graph/graph_process.py b/kadmos/graph/graph_process.py
index f59b769d3..ebc051d18 100644
--- a/kadmos/graph/graph_process.py
+++ b/kadmos/graph/graph_process.py
@@ -70,10 +70,6 @@ class MdaoProcessGraph(ProcessGraph):
cmdows_meta = cmdows_process_graph.add('metadata')
cmdows_loop_nesting = cmdows_meta.add('loopNesting')
cmdows_loop_nesting.add_process_hierarchy(self.graph['process_hierarchy'], self)
- cmdows_executable_blocks_order = cmdows_meta.add('executableBlocksOrder')
- for index, item in enumerate(self.graph['executable_blocks_order']):
- # Create .../metadata/executableBlocksOrder/executableBlock
- cmdows_executable_blocks_order.add('executableBlock', item, attrib={'position': str(index + 1)})
return cmdows_process_graph
# ---------------------------------------------------------------------------------------------------------------- #
--
GitLab