Clean up octiva pm for demo

examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/octiva_corr.oml

@@ -171,15 +171,15 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_corr#> as octiva_co
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-21_activity_3_port_4 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-21
-    to my_pm:activity_3_port_4
+  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-27_activity_3_port_6 : cs_as:CS_AS_Link [
+    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-27
+    to my_pm:activity_3_port_6
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-24_activity_3_port_5 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-24
-    to my_pm:activity_3_port_5
+  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-28_activity_3_port_7 : cs_as:CS_AS_Link [
+    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-28
+    to my_pm:activity_3_port_7
     object_diagram:inModel model
   ]
 
@@ -189,15 +189,15 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_corr#> as octiva_co
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-27_activity_3_port_6 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-27
-    to my_pm:activity_3_port_6
+  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-21_activity_3_port_4 : cs_as:CS_AS_Link [
+    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-21
+    to my_pm:activity_3_port_4
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-28_activity_3_port_7 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-28
-    to my_pm:activity_3_port_7
+  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-24_activity_3_port_5 : cs_as:CS_AS_Link [
+    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-24
+    to my_pm:activity_3_port_5
     object_diagram:inModel model
   ]
 
@@ -225,8 +225,8 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_corr#> as octiva_co
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-22_data_flow_0 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-22
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-17_data_flow_0 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-17
     to my_pm:data_flow_0
     object_diagram:inModel model
   ]
@@ -249,90 +249,90 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_corr#> as octiva_co
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_zTgetw4k2piVkwadfdbE-42_data_flow_2 : cs_as:CS_AS_Link [
-    from my_drawio:cell_zTgetw4k2piVkwadfdbE-42
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-14_data_flow_2 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-14
     to my_pm:data_flow_2
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_zTgetw4k2piVkwadfdbE-43_data_flow_3 : cs_as:CS_AS_Link [
-    from my_drawio:cell_zTgetw4k2piVkwadfdbE-43
-    to my_pm:data_flow_3
+  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-5_ctrl_flow_3 : cs_as:CS_AS_Link [
+    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-5
+    to my_pm:ctrl_flow_3
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_zTgetw4k2piVkwadfdbE-45_ctrl_flow_3 : cs_as:CS_AS_Link [
-    from my_drawio:cell_zTgetw4k2piVkwadfdbE-45
-    to my_pm:ctrl_flow_3
+  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-9_data_flow_3 : cs_as:CS_AS_Link [
+    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-9
+    to my_pm:data_flow_3
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_zTgetw4k2piVkwadfdbE-53_data_flow_4 : cs_as:CS_AS_Link [
-    from my_drawio:cell_zTgetw4k2piVkwadfdbE-53
-    to my_pm:data_flow_4
+  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-19_ctrl_flow_4 : cs_as:CS_AS_Link [
+    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-19
+    to my_pm:ctrl_flow_4
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_zTgetw4k2piVkwadfdbE-52_data_flow_5 : cs_as:CS_AS_Link [
-    from my_drawio:cell_zTgetw4k2piVkwadfdbE-52
-    to my_pm:data_flow_5
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-10_data_flow_4 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-10
+    to my_pm:data_flow_4
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-5_ctrl_flow_4 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-5
-    to my_pm:ctrl_flow_4
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-11_data_flow_5 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-11
+    to my_pm:data_flow_5
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-9_data_flow_6 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-9
+  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-31_data_flow_6 : cs_as:CS_AS_Link [
+    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-31
     to my_pm:data_flow_6
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-12_data_flow_7 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-12
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-2_data_flow_7 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-2
     to my_pm:data_flow_7
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-19_ctrl_flow_5 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-19
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-8_ctrl_flow_5 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-8
     to my_pm:ctrl_flow_5
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-20_ctrl_flow_6 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-20
-    to my_pm:ctrl_flow_6
-    object_diagram:inModel model
-  ]
-
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-36_data_flow_8 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-36
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-9_data_flow_8 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-9
     to my_pm:data_flow_8
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-37_data_flow_9 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-37
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-13_data_flow_9 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-13
     to my_pm:data_flow_9
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-31_data_flow_10 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-31
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-15_data_flow_10 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-15
     to my_pm:data_flow_10
     object_diagram:inModel model
   ]
 
-  ri trace_drawio_s_cVC5ZGoSJ6GyRvvS3W-32_data_flow_11 : cs_as:CS_AS_Link [
-    from my_drawio:cell_s_cVC5ZGoSJ6GyRvvS3W-32
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-16_data_flow_11 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-16
     to my_pm:data_flow_11
     object_diagram:inModel model
   ]
 
+  ri trace_drawio_nvHg0gSzVTrOdK5xUUfs-18_ctrl_flow_6 : cs_as:CS_AS_Link [
+    from my_drawio:cell_nvHg0gSzVTrOdK5xUUfs-18
+    to my_pm:ctrl_flow_6
+    object_diagram:inModel model
+  ]
+
   ri trace_drawio_1_model : cs_as:CS_AS_Link [
     from my_drawio:cell_1
     to my_pm:model

examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/octiva_drawio.oml

@@ -93,24 +93,24 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
 
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-22 : drawio:Edge [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-22"
+  ci cell_nvHg0gSzVTrOdK5xUUfs-17 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-17"
     drawio:hasParent cell_1
     object_diagram:inModel model
     drawio:hasSource cell_zTgetw4k2piVkwadfdbE-4
     drawio:hasTarget cell_s_cVC5ZGoSJ6GyRvvS3W-21
   ]
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-22_prop_label : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-17_prop_label : drawio:CellProperty [
     dict:hasKey "label"
     dict:hasValue ""
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-22
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-17
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-22_prop_pmRole : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-17_prop_pmRole : drawio:CellProperty [
     dict:hasKey "pmRole"
     dict:hasValue "data_flow"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-22
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-17
     object_diagram:inModel model
   ]
 
@@ -141,7 +141,7 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
   ci cell_zTgetw4k2piVkwadfdbE-4_prop_name : drawio:CellProperty [
     dict:hasKey "name"
-    dict:hasValue "parameters"
+    dict:hasValue "rail_image"
     drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-4
     object_diagram:inModel model
   ]
@@ -629,7 +629,7 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
   ci cell_zTgetw4k2piVkwadfdbE-12_prop_name : drawio:CellProperty [
     dict:hasKey "name"
-    dict:hasValue "rail_detection_algorythm"
+    dict:hasValue "rail_detection_algorithm"
     drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-12
     object_diagram:inModel model
   ]
@@ -685,90 +685,24 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
 
   
-  ci cell_zTgetw4k2piVkwadfdbE-42 : drawio:Edge [
-    drawio:hasDrawioId "zTgetw4k2piVkwadfdbE-42"
-    drawio:hasParent cell_1
-    object_diagram:inModel model
-    drawio:hasSource cell_zTgetw4k2piVkwadfdbE-41
-    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-12
-  ]
-  
-  ci cell_zTgetw4k2piVkwadfdbE-42_prop_label : drawio:CellProperty [
-    dict:hasKey "label"
-    dict:hasValue ""
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-42
-    object_diagram:inModel model
-  ]
-  ci cell_zTgetw4k2piVkwadfdbE-42_prop_pmRole : drawio:CellProperty [
-    dict:hasKey "pmRole"
-    dict:hasValue "data_flow"
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-42
-    object_diagram:inModel model
-  ]
-
-  
-  ci cell_zTgetw4k2piVkwadfdbE-43 : drawio:Edge [
-    drawio:hasDrawioId "zTgetw4k2piVkwadfdbE-43"
-    drawio:hasParent cell_1
-    object_diagram:inModel model
-    drawio:hasSource cell_zTgetw4k2piVkwadfdbE-29
-    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-4
-  ]
-  
-  ci cell_zTgetw4k2piVkwadfdbE-43_prop_label : drawio:CellProperty [
-    dict:hasKey "label"
-    dict:hasValue ""
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-43
-    object_diagram:inModel model
-  ]
-  ci cell_zTgetw4k2piVkwadfdbE-43_prop_pmRole : drawio:CellProperty [
-    dict:hasKey "pmRole"
-    dict:hasValue "data_flow"
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-43
-    object_diagram:inModel model
-  ]
-
-  
-  ci cell_zTgetw4k2piVkwadfdbE-45 : drawio:Edge [
-    drawio:hasDrawioId "zTgetw4k2piVkwadfdbE-45"
-    drawio:hasParent cell_1
-    object_diagram:inModel model
-    drawio:hasSource cell_zTgetw4k2piVkwadfdbE-44
-    drawio:hasTarget cell_s_cVC5ZGoSJ6GyRvvS3W-26
-  ]
-  
-  ci cell_zTgetw4k2piVkwadfdbE-45_prop_label : drawio:CellProperty [
-    dict:hasKey "label"
-    dict:hasValue ""
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-45
-    object_diagram:inModel model
-  ]
-  ci cell_zTgetw4k2piVkwadfdbE-45_prop_pmRole : drawio:CellProperty [
-    dict:hasKey "pmRole"
-    dict:hasValue "ctrl_flow"
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-45
-    object_diagram:inModel model
-  ]
-
-  
-  ci cell_zTgetw4k2piVkwadfdbE-53 : drawio:Edge [
-    drawio:hasDrawioId "zTgetw4k2piVkwadfdbE-53"
+  ci cell_nvHg0gSzVTrOdK5xUUfs-14 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-14"
     drawio:hasParent cell_1
     object_diagram:inModel model
     drawio:hasSource cell_zTgetw4k2piVkwadfdbE-51
     drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-31
   ]
   
-  ci cell_zTgetw4k2piVkwadfdbE-53_prop_label : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-14_prop_label : drawio:CellProperty [
     dict:hasKey "label"
     dict:hasValue ""
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-53
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-14
     object_diagram:inModel model
   ]
-  ci cell_zTgetw4k2piVkwadfdbE-53_prop_pmRole : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-14_prop_pmRole : drawio:CellProperty [
     dict:hasKey "pmRole"
     dict:hasValue "data_flow"
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-53
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-14
     object_diagram:inModel model
   ]
 
@@ -811,28 +745,6 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
 
   
-  ci cell_zTgetw4k2piVkwadfdbE-52 : drawio:Edge [
-    drawio:hasDrawioId "zTgetw4k2piVkwadfdbE-52"
-    drawio:hasParent cell_1
-    object_diagram:inModel model
-    drawio:hasSource cell_zTgetw4k2piVkwadfdbE-30
-    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-51
-  ]
-  
-  ci cell_zTgetw4k2piVkwadfdbE-52_prop_label : drawio:CellProperty [
-    dict:hasKey "label"
-    dict:hasValue ""
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-52
-    object_diagram:inModel model
-  ]
-  ci cell_zTgetw4k2piVkwadfdbE-52_prop_pmRole : drawio:CellProperty [
-    dict:hasKey "pmRole"
-    dict:hasValue "data_flow"
-    drawio:propertyOf cell_zTgetw4k2piVkwadfdbE-52
-    object_diagram:inModel model
-  ]
-
-  
   ci cell_s_cVC5ZGoSJ6GyRvvS3W-1 : drawio:Vertex [
     drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-1"
     drawio:hasParent cell_1
@@ -1043,28 +955,6 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
 
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-12 : drawio:Edge [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-12"
-    drawio:hasParent cell_1
-    object_diagram:inModel model
-    drawio:hasSource cell_s_cVC5ZGoSJ6GyRvvS3W-11
-    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-12
-  ]
-  
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-12_prop_label : drawio:CellProperty [
-    dict:hasKey "label"
-    dict:hasValue ""
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-12
-    object_diagram:inModel model
-  ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-12_prop_pmRole : drawio:CellProperty [
-    dict:hasKey "pmRole"
-    dict:hasValue "data_flow"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-12
-    object_diagram:inModel model
-  ]
-
-  
   ci cell_s_cVC5ZGoSJ6GyRvvS3W-13 : drawio:Vertex [
     drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-13"
     drawio:hasParent cell_1
@@ -1211,66 +1101,66 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
 
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21 : drawio:Vertex [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-21"
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27 : drawio:Vertex [
+    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-27"
     drawio:hasParent cell_s_cVC5ZGoSJ6GyRvvS3W-13
     object_diagram:inModel model
   ]
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21_prop_label : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27_prop_label : drawio:CellProperty [
     dict:hasKey "label"
     dict:hasValue "%portname%"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-21
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-27
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21_prop_portname : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27_prop_portname : drawio:CellProperty [
     dict:hasKey "portname"
-    dict:hasValue "image"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-21
+    dict:hasValue "data"
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-27
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21_prop_placeholders : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27_prop_placeholders : drawio:CellProperty [
     dict:hasKey "placeholders"
     dict:hasValue "1"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-21
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-27
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21_prop_pmRole : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27_prop_pmRole : drawio:CellProperty [
     dict:hasKey "pmRole"
-    dict:hasValue "data_in"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-21
+    dict:hasValue "data_out"
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-27
     object_diagram:inModel model
   ]
 
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24 : drawio:Vertex [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-24"
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28 : drawio:Vertex [
+    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-28"
     drawio:hasParent cell_s_cVC5ZGoSJ6GyRvvS3W-13
     object_diagram:inModel model
   ]
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24_prop_label : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28_prop_label : drawio:CellProperty [
     dict:hasKey "label"
     dict:hasValue "%portname%"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-24
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-28
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24_prop_portname : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28_prop_portname : drawio:CellProperty [
     dict:hasKey "portname"
-    dict:hasValue "algorithm"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-24
+    dict:hasValue "image"
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-28
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24_prop_placeholders : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28_prop_placeholders : drawio:CellProperty [
     dict:hasKey "placeholders"
     dict:hasValue "1"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-24
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-28
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24_prop_pmRole : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28_prop_pmRole : drawio:CellProperty [
     dict:hasKey "pmRole"
-    dict:hasValue "data_in"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-24
+    dict:hasValue "data_out"
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-28
     object_diagram:inModel model
   ]
 
@@ -1307,66 +1197,66 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
 
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27 : drawio:Vertex [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-27"
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21 : drawio:Vertex [
+    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-21"
     drawio:hasParent cell_s_cVC5ZGoSJ6GyRvvS3W-13
     object_diagram:inModel model
   ]
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27_prop_label : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21_prop_label : drawio:CellProperty [
     dict:hasKey "label"
     dict:hasValue "%portname%"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-27
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-21
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27_prop_portname : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21_prop_portname : drawio:CellProperty [
     dict:hasKey "portname"
-    dict:hasValue "data"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-27
+    dict:hasValue "image"
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-21
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27_prop_placeholders : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21_prop_placeholders : drawio:CellProperty [
     dict:hasKey "placeholders"
     dict:hasValue "1"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-27
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-21
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-27_prop_pmRole : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-21_prop_pmRole : drawio:CellProperty [
     dict:hasKey "pmRole"
-    dict:hasValue "data_out"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-27
+    dict:hasValue "data_in"
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-21
     object_diagram:inModel model
   ]
 
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28 : drawio:Vertex [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-28"
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24 : drawio:Vertex [
+    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-24"
     drawio:hasParent cell_s_cVC5ZGoSJ6GyRvvS3W-13
     object_diagram:inModel model
   ]
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28_prop_label : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24_prop_label : drawio:CellProperty [
     dict:hasKey "label"
     dict:hasValue "%portname%"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-28
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-24
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28_prop_portname : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24_prop_portname : drawio:CellProperty [
     dict:hasKey "portname"
-    dict:hasValue "image"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-28
+    dict:hasValue "algorithm"
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-24
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28_prop_placeholders : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24_prop_placeholders : drawio:CellProperty [
     dict:hasKey "placeholders"
     dict:hasValue "1"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-28
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-24
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-28_prop_pmRole : drawio:CellProperty [
+  ci cell_s_cVC5ZGoSJ6GyRvvS3W-24_prop_pmRole : drawio:CellProperty [
     dict:hasKey "pmRole"
-    dict:hasValue "data_out"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-28
+    dict:hasValue "data_in"
+    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-24
     object_diagram:inModel model
   ]
 
@@ -1393,46 +1283,24 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
 
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-20 : drawio:Edge [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-20"
-    drawio:hasParent cell_1
-    object_diagram:inModel model
-    drawio:hasSource cell_s_cVC5ZGoSJ6GyRvvS3W-16
-    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-27
-  ]
-  
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-20_prop_label : drawio:CellProperty [
-    dict:hasKey "label"
-    dict:hasValue ""
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-20
-    object_diagram:inModel model
-  ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-20_prop_pmRole : drawio:CellProperty [
-    dict:hasKey "pmRole"
-    dict:hasValue "ctrl_flow"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-20
-    object_diagram:inModel model
-  ]
-
-  
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-36 : drawio:Edge [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-36"
+  ci cell_nvHg0gSzVTrOdK5xUUfs-10 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-10"
     drawio:hasParent cell_1
     object_diagram:inModel model
     drawio:hasSource cell_s_cVC5ZGoSJ6GyRvvS3W-29
     drawio:hasTarget cell_s_cVC5ZGoSJ6GyRvvS3W-34
   ]
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-36_prop_label : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-10_prop_label : drawio:CellProperty [
     dict:hasKey "label"
     dict:hasValue ""
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-36
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-10
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-36_prop_pmRole : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-10_prop_pmRole : drawio:CellProperty [
     dict:hasKey "pmRole"
     dict:hasValue "data_flow"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-36
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-10
     object_diagram:inModel model
   ]
 
@@ -1475,24 +1343,24 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
 
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-37 : drawio:Edge [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-37"
+  ci cell_nvHg0gSzVTrOdK5xUUfs-11 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-11"
     drawio:hasParent cell_1
     object_diagram:inModel model
     drawio:hasSource cell_s_cVC5ZGoSJ6GyRvvS3W-30
     drawio:hasTarget cell_s_cVC5ZGoSJ6GyRvvS3W-33
   ]
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-37_prop_label : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-11_prop_label : drawio:CellProperty [
     dict:hasKey "label"
     dict:hasValue ""
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-37
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-11
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-37_prop_pmRole : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-11_prop_pmRole : drawio:CellProperty [
     dict:hasKey "pmRole"
     dict:hasValue "data_flow"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-37
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-11
     object_diagram:inModel model
   ]
 
@@ -1557,24 +1425,156 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_drawio#> as octiva_
   ]
 
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-32 : drawio:Edge [
-    drawio:hasDrawioId "s_cVC5ZGoSJ6GyRvvS3W-32"
+  ci cell_nvHg0gSzVTrOdK5xUUfs-2 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-2"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+    drawio:hasSource cell_s_cVC5ZGoSJ6GyRvvS3W-11
+    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-12
+  ]
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-2_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-2
+    object_diagram:inModel model
+  ]
+  ci cell_nvHg0gSzVTrOdK5xUUfs-2_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "data_flow"
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-2
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-8 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-8"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+    drawio:hasSource cell_s_cVC5ZGoSJ6GyRvvS3W-16
+    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-27
+  ]
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-8_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-8
+    object_diagram:inModel model
+  ]
+  ci cell_nvHg0gSzVTrOdK5xUUfs-8_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "ctrl_flow"
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-8
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-9 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-9"
     drawio:hasParent cell_1
     object_diagram:inModel model
     drawio:hasSource cell_s_cVC5ZGoSJ6GyRvvS3W-27
     drawio:hasTarget cell_s_cVC5ZGoSJ6GyRvvS3W-29
   ]
   
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-32_prop_label : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-9_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-9
+    object_diagram:inModel model
+  ]
+  ci cell_nvHg0gSzVTrOdK5xUUfs-9_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "data_flow"
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-9
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-13 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-13"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+    drawio:hasSource cell_zTgetw4k2piVkwadfdbE-30
+    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-51
+  ]
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-13_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-13
+    object_diagram:inModel model
+  ]
+  ci cell_nvHg0gSzVTrOdK5xUUfs-13_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "data_flow"
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-13
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-15 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-15"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+    drawio:hasSource cell_zTgetw4k2piVkwadfdbE-41
+    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-12
+  ]
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-15_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-15
+    object_diagram:inModel model
+  ]
+  ci cell_nvHg0gSzVTrOdK5xUUfs-15_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "data_flow"
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-15
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-16 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-16"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+    drawio:hasSource cell_zTgetw4k2piVkwadfdbE-29
+    drawio:hasTarget cell_zTgetw4k2piVkwadfdbE-4
+  ]
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-16_prop_label : drawio:CellProperty [
     dict:hasKey "label"
     dict:hasValue ""
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-32
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-16
     object_diagram:inModel model
   ]
-  ci cell_s_cVC5ZGoSJ6GyRvvS3W-32_prop_pmRole : drawio:CellProperty [
+  ci cell_nvHg0gSzVTrOdK5xUUfs-16_prop_pmRole : drawio:CellProperty [
     dict:hasKey "pmRole"
     dict:hasValue "data_flow"
-    drawio:propertyOf cell_s_cVC5ZGoSJ6GyRvvS3W-32
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-16
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-18 : drawio:Edge [
+    drawio:hasDrawioId "nvHg0gSzVTrOdK5xUUfs-18"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+    drawio:hasSource cell_zTgetw4k2piVkwadfdbE-44
+    drawio:hasTarget cell_s_cVC5ZGoSJ6GyRvvS3W-26
+  ]
+  
+  ci cell_nvHg0gSzVTrOdK5xUUfs-18_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-18
+    object_diagram:inModel model
+  ]
+  ci cell_nvHg0gSzVTrOdK5xUUfs-18_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "ctrl_flow"
+    drawio:propertyOf cell_nvHg0gSzVTrOdK5xUUfs-18
     object_diagram:inModel model
   ]
 

examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/octiva_pm.oml

@@ -25,14 +25,14 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_pm#> as octiva_pm {
   ]
 
   ci artifact_0 : pm:Artifact [
-    pm:hasName "parameters"
+    pm:hasName "rail_image"
     pm:hasType ftg_instance:f_file
     object_diagram:inModel model
     pm:dataTo activity_3_port_4 // for some reason, we have to explicitly create the unreified relations on top of the reified relations (at the end of this file) or we get a reasoner error
   ]
 
   ci artifact_1 : pm:Artifact [
-    pm:hasName "rail_detection_algorythm"
+    pm:hasName "rail_detection_algorithm"
     pm:hasType ftg_instance:f_file
     object_diagram:inModel model
     pm:dataTo activity_3_port_5 // for some reason, we have to explicitly create the unreified relations on top of the reified relations (at the end of this file) or we get a reasoner error
@@ -276,29 +276,29 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_pm#> as octiva_pm {
   ]
 
   ri ctrl_flow_3 : pm:CtrlFlow [
-    from activity_1_port_1
-    to activity_3_port_1
-    object_diagram:inModel model
-  ]
-
-  ri ctrl_flow_4 : pm:CtrlFlow [
     from activity_2_port_1
     to activity_3_port_0
     object_diagram:inModel model
   ]
 
-  ri ctrl_flow_5 : pm:CtrlFlow [
+  ri ctrl_flow_4 : pm:CtrlFlow [
     from activity_3_port_2
     to final
     object_diagram:inModel model
   ]
 
-  ri ctrl_flow_6 : pm:CtrlFlow [
+  ri ctrl_flow_5 : pm:CtrlFlow [
     from activity_3_port_3
     to activity_0_port_0
     object_diagram:inModel model
   ]
 
+  ri ctrl_flow_6 : pm:CtrlFlow [
+    from activity_1_port_1
+    to activity_3_port_1
+    object_diagram:inModel model
+  ]
+
   ri data_flow_0 : pm:DataFlow [
     from artifact_0
     to activity_3_port_4
@@ -312,32 +312,32 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_pm#> as octiva_pm {
   ]
 
   ri data_flow_2 : pm:DataFlow [
-    from activity_1_port_4
-    to artifact_1
+    from artifact_2
+    to activity_1_port_2
     object_diagram:inModel model
   ]
 
   ri data_flow_3 : pm:DataFlow [
-    from activity_1_port_3
+    from activity_2_port_2
     to artifact_0
     object_diagram:inModel model
   ]
 
   ri data_flow_4 : pm:DataFlow [
-    from artifact_2
-    to activity_1_port_2
+    from artifact_3
+    to activity_0_port_3
     object_diagram:inModel model
   ]
 
   ri data_flow_5 : pm:DataFlow [
-    from activity_0_port_5
-    to artifact_2
+    from artifact_4
+    to activity_0_port_4
     object_diagram:inModel model
   ]
 
   ri data_flow_6 : pm:DataFlow [
-    from activity_2_port_2
-    to artifact_0
+    from activity_3_port_7
+    to artifact_4
     object_diagram:inModel model
   ]
 
@@ -348,26 +348,26 @@ description <http://ua.be/sdo2l/description/artifacts/octiva_pm#> as octiva_pm {
   ]
 
   ri data_flow_8 : pm:DataFlow [
-    from artifact_3
-    to activity_0_port_3
+    from activity_3_port_6
+    to artifact_3
     object_diagram:inModel model
   ]
 
   ri data_flow_9 : pm:DataFlow [
-    from artifact_4
-    to activity_0_port_4
+    from activity_0_port_5
+    to artifact_2
     object_diagram:inModel model
   ]
 
   ri data_flow_10 : pm:DataFlow [
-    from activity_3_port_7
-    to artifact_4
+    from activity_1_port_4
+    to artifact_1
     object_diagram:inModel model
   ]
 
   ri data_flow_11 : pm:DataFlow [
-    from activity_3_port_6
-    to artifact_3
+    from activity_1_port_3
+    to artifact_0
     object_diagram:inModel model
   ]
 

examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/bundle.oml

@@ -1,32 +1,31 @@
 description bundle <http://ua.be/sdo2l/description/bundle#> as ^bundle {
   uses <http://ua.be/sdo2l/vocabulary/bundle#>
-  includes <http://ua.be/sdo2l/description/artifacts/MyPM_corr#>
   includes <http://ua.be/sdo2l/description/artifacts/Drawing_drawio#>
-  includes <http://ua.be/sdo2l/description/artifacts/FTG_drawio#>
-  includes <http://ua.be/sdo2l/description/artifacts/springDamper_drawio#>
-  includes <http://ua.be/sdo2l/description/artifacts/springDamper_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/drivetrain_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/drivetrain_drawio#>
   includes <http://ua.be/sdo2l/description/artifacts/drivetrain_pm#>
-  includes <http://ua.be/sdo2l/description/artifacts/MinimalPM_pm#>
   includes <http://ua.be/sdo2l/description/artifacts/EarlyDesignSketching_corr#>
-  includes <http://ua.be/sdo2l/description/artifacts/MyPM_drawio#>
-  includes <http://ua.be/sdo2l/description/artifacts/operations#>
-  includes <http://ua.be/sdo2l/description/artifacts/springDamper_pm#>
-  includes <http://ua.be/sdo2l/description/artifacts/octiva_pm#>
-  includes <http://ua.be/sdo2l/description/artifacts/FTG_corr#>
   includes <http://ua.be/sdo2l/description/artifacts/EarlyDesignSketching_drawio#>
-  includes <http://ua.be/sdo2l/description/artifacts/traceabilityLinks#>
-  includes <http://ua.be/sdo2l/description/artifacts/drivetrain_drawio#>
-  includes <http://ua.be/sdo2l/description/artifacts/RecPM_pm#>
-  includes <http://ua.be/sdo2l/description/artifacts/drivetrain_corr#>
-  includes <http://ua.be/sdo2l/description/artifacts/MinimalPM_corr#>
   includes <http://ua.be/sdo2l/description/artifacts/EarlyDesignSketching_pm#>
-  includes <http://ua.be/sdo2l/description/artifacts/RecPM_corr#>
-  includes <http://ua.be/sdo2l/description/artifacts/octiva_drawio#>
-  includes <http://ua.be/sdo2l/description/artifacts/imabox_drawio#>
+  includes <http://ua.be/sdo2l/description/artifacts/FTG_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/FTG_drawio#>
   includes <http://ua.be/sdo2l/description/artifacts/FTG_ftg#>
+  includes <http://ua.be/sdo2l/description/artifacts/imabox_drawio#>
+  includes <http://ua.be/sdo2l/description/artifacts/MinimalPM_corr#>
   includes <http://ua.be/sdo2l/description/artifacts/MinimalPM_drawio#>
-  includes <http://ua.be/sdo2l/description/artifacts/RecPM_drawio#>
-  includes <http://ua.be/sdo2l/description/artifacts/octiva_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/MinimalPM_pm#>
+  includes <http://ua.be/sdo2l/description/artifacts/MyPM_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/MyPM_drawio#>
   includes <http://ua.be/sdo2l/description/artifacts/MyPM_pm#>
-  includes <http://ua.be/sdo2l/description/artifacts/example_xopp#>
+  includes <http://ua.be/sdo2l/description/artifacts/octiva_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/octiva_drawio#>
+  includes <http://ua.be/sdo2l/description/artifacts/octiva_pm#>
+  includes <http://ua.be/sdo2l/description/artifacts/operations#>
+  includes <http://ua.be/sdo2l/description/artifacts/RecPM_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/RecPM_drawio#>
+  includes <http://ua.be/sdo2l/description/artifacts/RecPM_pm#>
+  includes <http://ua.be/sdo2l/description/artifacts/springDamper_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/springDamper_drawio#>
+  includes <http://ua.be/sdo2l/description/artifacts/springDamper_pm#>
+  includes <http://ua.be/sdo2l/description/artifacts/traceabilityLinks#>
 }