浏览代码

Add examples diagrams and generated OML files

Joeri Exelmans 2 年之前
父节点
当前提交
d56627ff8a
共有 24 个文件被更改,包括 831 次插入33 次删除
  1. 65 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/AnotherPM_corr.oml
  2. 312 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/AnotherPM_drawio.oml
  3. 81 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/AnotherPM_pm.oml
  4. 102 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/Drawing_drawio.oml
  5. 3 4
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/FTG_corr.oml
  6. 1 2
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/FTG_drawio.oml
  7. 2 3
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/FTG_ftg.oml
  8. 41 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MinimalPM_corr.oml
  9. 96 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MinimalPM_drawio.oml
  10. 33 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MinimalPM_pm.oml
  11. 3 4
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MyPM_corr.oml
  12. 2 3
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MyPM_drawio.oml
  13. 8 3
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MyPM_pm.oml
  14. 51 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/imabox_drawio.oml
  15. 19 11
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/bundle.oml
  16. 1 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/AnotherPM:pm
  17. 1 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/Drawing
  18. 1 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/FTG:ftg
  19. 1 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/MinimalPM:pm
  20. 1 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/MyPM:ftg
  21. 1 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/MyPM:pm
  22. 1 0
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/imabox
  23. 4 2
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/vocabulary/base/ftg.oml
  24. 1 1
      examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/vocabulary/formalisms/pm.oml

+ 65 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/AnotherPM_corr.oml

@@ -0,0 +1,65 @@
+// Warning: Generated Code! Do not edit!
+// Input: http://localhost:5000/diagrams/AnotherPM:pm
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/pm/oml_generator.py
+
+// This file contains the correspondence links between concrete syntax (Drawio) and abstract syntax (Process Model).
+description <http://ua.be/sdo2l/description/artifacts/AnotherPM_corr#> as AnotherPM_corr {
+
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/cs_as#> as cs_as
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+
+  extends <http://ua.be/sdo2l/description/artifacts/AnotherPM_drawio#> as my_drawio
+  extends <http://ua.be/sdo2l/description/artifacts/AnotherPM_pm#> as my_pm
+
+  ci model : cs_as:CorrespondenceModel [
+    object_diagram:hasName "AnotherPM_corr"
+  ]
+
+  ri trace_drawio_0v6vhYM9hFzFfcc7qPzW-3_initial : cs_as:CS_AS_Link [
+    from my_drawio:cell_0v6vhYM9hFzFfcc7qPzW-3
+    to my_pm:initial
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_0v6vhYM9hFzFfcc7qPzW-4_final : cs_as:CS_AS_Link [
+    from my_drawio:cell_0v6vhYM9hFzFfcc7qPzW-4
+    to my_pm:final
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_OMHYlqIPrFl9iUvyUxSD-0_artifact_0 : cs_as:CS_AS_Link [
+    from my_drawio:cell_OMHYlqIPrFl9iUvyUxSD-0
+    to my_pm:artifact_0
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_OMHYlqIPrFl9iUvyUxSD-1_activity_0 : cs_as:CS_AS_Link [
+    from my_drawio:cell_OMHYlqIPrFl9iUvyUxSD-1
+    to my_pm:activity_0
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_OMHYlqIPrFl9iUvyUxSD-6_ctrl_flow_0 : cs_as:CS_AS_Link [
+    from my_drawio:cell_OMHYlqIPrFl9iUvyUxSD-6
+    to my_pm:ctrl_flow_0
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_OMHYlqIPrFl9iUvyUxSD-3_data_flow_0 : cs_as:CS_AS_Link [
+    from my_drawio:cell_OMHYlqIPrFl9iUvyUxSD-3
+    to my_pm:data_flow_0
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_OMHYlqIPrFl9iUvyUxSD-7_ctrl_flow_1 : cs_as:CS_AS_Link [
+    from my_drawio:cell_OMHYlqIPrFl9iUvyUxSD-7
+    to my_pm:ctrl_flow_1
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_0v6vhYM9hFzFfcc7qPzW-1_model : cs_as:CS_AS_Link [
+    from my_drawio:cell_0v6vhYM9hFzFfcc7qPzW-1
+    to my_pm:model
+    object_diagram:inModel model
+  ]
+}

+ 312 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/AnotherPM_drawio.oml

@@ -0,0 +1,312 @@
+// Warning: Generated code! Do not edit!
+// Input: http://localhost:5000/diagrams/AnotherPM:pm
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/oml_generator.py
+// Minimal mode enabled: Pgae/cell attributes, style, and geometries have been omitted (making the drawio-> OML conversion lossy).
+
+description <http://ua.be/sdo2l/description/artifacts/AnotherPM_drawio#> as AnotherPM_drawio {
+
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/dict#> as dict
+
+  ci model : drawio:Model [
+    drawio:hasDrawioId "isBpO64vPvADqoAOVkyf"
+    object_diagram:hasName "AnotherPM:pm_drawio"
+  ]
+
+  
+  ci cell_0v6vhYM9hFzFfcc7qPzW-0 : drawio:Cell [
+    drawio:hasDrawioId "0v6vhYM9hFzFfcc7qPzW-0"
+    drawio:isRootOf model
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_0v6vhYM9hFzFfcc7qPzW-1 : drawio:Cell [
+    drawio:hasDrawioId "0v6vhYM9hFzFfcc7qPzW-1"
+    drawio:hasParent cell_0v6vhYM9hFzFfcc7qPzW-0
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-6 : drawio:Edge [
+    drawio:hasDrawioId "OMHYlqIPrFl9iUvyUxSD-6"
+    drawio:hasParent cell_0v6vhYM9hFzFfcc7qPzW-1
+    object_diagram:inModel model
+    drawio:hasSource cell_0v6vhYM9hFzFfcc7qPzW-3
+    drawio:hasTarget cell_OMHYlqIPrFl9iUvyUxSD-4
+  ]
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-6_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-6
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-6_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "ctrl_flow"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-6
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_0v6vhYM9hFzFfcc7qPzW-3 : drawio:Vertex [
+    drawio:hasDrawioId "0v6vhYM9hFzFfcc7qPzW-3"
+    drawio:hasParent cell_0v6vhYM9hFzFfcc7qPzW-1
+    object_diagram:inModel model
+  ]
+  
+  ci cell_0v6vhYM9hFzFfcc7qPzW-3_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_0v6vhYM9hFzFfcc7qPzW-3
+    object_diagram:inModel model
+  ]
+  ci cell_0v6vhYM9hFzFfcc7qPzW-3_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "initial"
+    drawio:propertyOf cell_0v6vhYM9hFzFfcc7qPzW-3
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_0v6vhYM9hFzFfcc7qPzW-4 : drawio:Vertex [
+    drawio:hasDrawioId "0v6vhYM9hFzFfcc7qPzW-4"
+    drawio:hasParent cell_0v6vhYM9hFzFfcc7qPzW-1
+    object_diagram:inModel model
+  ]
+  
+  ci cell_0v6vhYM9hFzFfcc7qPzW-4_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_0v6vhYM9hFzFfcc7qPzW-4
+    object_diagram:inModel model
+  ]
+  ci cell_0v6vhYM9hFzFfcc7qPzW-4_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "final"
+    drawio:propertyOf cell_0v6vhYM9hFzFfcc7qPzW-4
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-0 : drawio:Vertex [
+    drawio:hasDrawioId "OMHYlqIPrFl9iUvyUxSD-0"
+    drawio:hasParent cell_0v6vhYM9hFzFfcc7qPzW-1
+    object_diagram:inModel model
+  ]
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-0_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue "%name% : %type%"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-0
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-0_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "artifact"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-0
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-0_prop_placeholders : drawio:CellProperty [
+    dict:hasKey "placeholders"
+    dict:hasValue "1"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-0
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-0_prop_name : drawio:CellProperty [
+    dict:hasKey "name"
+    dict:hasValue "sketch"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-0
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-0_prop_type : drawio:CellProperty [
+    dict:hasKey "type"
+    dict:hasValue "xopp"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-0
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-1 : drawio:Vertex [
+    drawio:hasDrawioId "OMHYlqIPrFl9iUvyUxSD-1"
+    drawio:hasParent cell_0v6vhYM9hFzFfcc7qPzW-1
+    object_diagram:inModel model
+  ]
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-1_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue "<u style=\"color: rgb(0 , 0 , 0)\">%name%<br>: %type%</u>"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-1
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-1_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "activity"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-1
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-1_prop_name : drawio:CellProperty [
+    dict:hasKey "name"
+    dict:hasValue "lol"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-1
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-1_prop_type : drawio:CellProperty [
+    dict:hasKey "type"
+    dict:hasValue ""
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-1
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-1_prop_placeholders : drawio:CellProperty [
+    dict:hasKey "placeholders"
+    dict:hasValue "1"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-1
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-2 : drawio:Vertex [
+    drawio:hasDrawioId "OMHYlqIPrFl9iUvyUxSD-2"
+    drawio:hasParent cell_OMHYlqIPrFl9iUvyUxSD-1
+    object_diagram:inModel model
+  ]
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-2_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue "%portname%"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-2
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-2_prop_portname : drawio:CellProperty [
+    dict:hasKey "portname"
+    dict:hasValue "dout"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-2
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-2_prop_placeholders : drawio:CellProperty [
+    dict:hasKey "placeholders"
+    dict:hasValue "1"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-2
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-2_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "data_out"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-2
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-4 : drawio:Vertex [
+    drawio:hasDrawioId "OMHYlqIPrFl9iUvyUxSD-4"
+    drawio:hasParent cell_OMHYlqIPrFl9iUvyUxSD-1
+    object_diagram:inModel model
+  ]
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-4_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue "%portname%"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-4
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-4_prop_portname : drawio:CellProperty [
+    dict:hasKey "portname"
+    dict:hasValue "cin"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-4
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-4_prop_placeholders : drawio:CellProperty [
+    dict:hasKey "placeholders"
+    dict:hasValue "1"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-4
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-4_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "ctrl_in"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-4
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-5 : drawio:Vertex [
+    drawio:hasDrawioId "OMHYlqIPrFl9iUvyUxSD-5"
+    drawio:hasParent cell_OMHYlqIPrFl9iUvyUxSD-1
+    object_diagram:inModel model
+  ]
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-5_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue "%portname%"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-5
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-5_prop_portname : drawio:CellProperty [
+    dict:hasKey "portname"
+    dict:hasValue "cout"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-5
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-5_prop_placeholders : drawio:CellProperty [
+    dict:hasKey "placeholders"
+    dict:hasValue "1"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-5
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-5_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "ctrl_out"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-5
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-3 : drawio:Edge [
+    drawio:hasDrawioId "OMHYlqIPrFl9iUvyUxSD-3"
+    drawio:hasParent cell_0v6vhYM9hFzFfcc7qPzW-1
+    object_diagram:inModel model
+    drawio:hasSource cell_OMHYlqIPrFl9iUvyUxSD-2
+    drawio:hasTarget cell_OMHYlqIPrFl9iUvyUxSD-0
+  ]
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-3_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-3
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-3_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "data_flow"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-3
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-7 : drawio:Edge [
+    drawio:hasDrawioId "OMHYlqIPrFl9iUvyUxSD-7"
+    drawio:hasParent cell_0v6vhYM9hFzFfcc7qPzW-1
+    object_diagram:inModel model
+    drawio:hasSource cell_OMHYlqIPrFl9iUvyUxSD-5
+    drawio:hasTarget cell_0v6vhYM9hFzFfcc7qPzW-4
+  ]
+  
+  ci cell_OMHYlqIPrFl9iUvyUxSD-7_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-7
+    object_diagram:inModel model
+  ]
+  ci cell_OMHYlqIPrFl9iUvyUxSD-7_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "ctrl_flow"
+    drawio:propertyOf cell_OMHYlqIPrFl9iUvyUxSD-7
+    object_diagram:inModel model
+  ]
+
+  
+}

+ 81 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/AnotherPM_pm.oml

@@ -0,0 +1,81 @@
+// Warning: Generated Code! Do not edit!
+// Input: http://localhost:5000/diagrams/AnotherPM:pm
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/pm/oml_generator.py
+
+description <http://ua.be/sdo2l/description/artifacts/AnotherPM_pm#> as AnotherPM_pm {
+
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/pm#> as pm
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+  uses <http://ua.be/sdo2l/vocabulary/base/ftg#> as ftg
+
+  extends <http://ua.be/sdo2l/description/artifacts/FTG_ftg#> as ftg_instance
+
+  ci model : pm:Model [
+    object_diagram:hasName "AnotherPM_pm"
+  ]
+
+  ci initial : pm:Initial [
+    object_diagram:inModel model
+    pm:ctrlTo activity_0_port_0 // 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 final : pm:Final [
+    object_diagram:inModel model
+    //pm:ctrlFrom activity_0_port_1 // 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_0 : pm:Artifact [
+    pm:hasName "sketch"
+    pm:hasType ftg_instance:f_xopp
+    object_diagram:inModel model
+    
+  ]
+
+  ci activity_0 : pm:Activity [
+    pm:hasName "lol"
+    object_diagram:inModel model
+  ]
+
+  ci activity_0_port_1 : pm:CtrlOutputPort [
+    pm:hasName "cout"
+    pm:ofActivity activity_0
+    object_diagram:inModel model
+    pm:ctrlTo final // 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 activity_0_port_0 : pm:CtrlInputPort [
+    pm:hasName "cin"
+    pm:ofActivity activity_0
+    object_diagram:inModel model
+    //pm:ctrlFrom initial // 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 activity_0_port_2 : pm:DataOutputPort [
+    pm:hasName "dout"
+    pm:ofActivity activity_0
+    object_diagram:inModel model
+    pm:dataTo artifact_0 // 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
+  ]
+  
+
+  ri ctrl_flow_0 : pm:CtrlFlow [
+    from initial
+    to activity_0_port_0
+    object_diagram:inModel model
+  ]
+
+  ri ctrl_flow_1 : pm:CtrlFlow [
+    from activity_0_port_1
+    to final
+    object_diagram:inModel model
+  ]
+
+  ri data_flow_0 : pm:DataFlow [
+    from activity_0_port_2
+    to artifact_0
+    object_diagram:inModel model
+  ]
+
+}

+ 102 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/Drawing_drawio.oml

@@ -0,0 +1,102 @@
+// Warning: Generated code! Do not edit!
+// Input: http://localhost:5000/diagrams/Drawing
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/oml_generator.py
+// Minimal mode enabled: Pgae/cell attributes, style, and geometries have been omitted (making the drawio-> OML conversion lossy).
+
+description <http://ua.be/sdo2l/description/artifacts/Drawing_drawio#> as Drawing_drawio {
+
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/dict#> as dict
+
+  ci model : drawio:Model [
+    drawio:hasDrawioId "LgIOMtHxWmRO3Oc9vvxL"
+    object_diagram:hasName "Drawing_drawio"
+  ]
+
+  
+  ci cell_0 : drawio:Cell [
+    drawio:hasDrawioId "0"
+    drawio:isRootOf model
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_1 : drawio:Cell [
+    drawio:hasDrawioId "1"
+    drawio:hasParent cell_0
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_qzttm6LrCUpeeJGvPEF2-1 : drawio:Vertex [
+    drawio:hasDrawioId "qzttm6LrCUpeeJGvPEF2-1"
+    drawio:hasValue "Actor"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_qzttm6LrCUpeeJGvPEF2-2 : drawio:Vertex [
+    drawio:hasDrawioId "qzttm6LrCUpeeJGvPEF2-2"
+    drawio:hasValue "Actor"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_qzttm6LrCUpeeJGvPEF2-3 : drawio:Vertex [
+    drawio:hasDrawioId "qzttm6LrCUpeeJGvPEF2-3"
+    drawio:hasValue "Actor"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_qzttm6LrCUpeeJGvPEF2-4 : drawio:Vertex [
+    drawio:hasDrawioId "qzttm6LrCUpeeJGvPEF2-4"
+    drawio:hasValue "Actor"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_qzttm6LrCUpeeJGvPEF2-6 : drawio:Vertex [
+    drawio:hasDrawioId "qzttm6LrCUpeeJGvPEF2-6"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_qzttm6LrCUpeeJGvPEF2-7 : drawio:Vertex [
+    drawio:hasDrawioId "qzttm6LrCUpeeJGvPEF2-7"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_qzttm6LrCUpeeJGvPEF2-8 : drawio:Vertex [
+    drawio:hasDrawioId "qzttm6LrCUpeeJGvPEF2-8"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_qzttm6LrCUpeeJGvPEF2-9 : drawio:Vertex [
+    drawio:hasDrawioId "qzttm6LrCUpeeJGvPEF2-9"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+}

+ 3 - 4
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/FTG_corr.oml

@@ -1,9 +1,8 @@
 // Warning: Generated Code! Do not edit!
-// This file contains the correspondence links between concrete syntax (Drawio) and abstract syntax (FTG).
-// Input file: /home/maestro/repos/drawio2oml/test/data/pm/MyFTGPM.drawio
-// Page: FTG
-// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml
+// Input: http://localhost:5000/diagrams/FTG:ftg
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/ftg/oml_generator.py
 
+// This file contains the correspondence links between concrete syntax (Drawio) and abstract syntax (FTG).
 description <http://ua.be/sdo2l/description/artifacts/FTG_corr#> as FTG_corr {
 
   uses <http://ua.be/sdo2l/vocabulary/formalisms/cs_as#> as cs_as

+ 1 - 2
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/FTG_drawio.oml

@@ -1,6 +1,5 @@
 // Warning: Generated code! Do not edit!
-// Input: '/home/maestro/repos/drawio2oml/test/data/pm/MyFTGPM.drawio'
-// Page: 'FTG:ftg'
+// Input: http://localhost:5000/diagrams/FTG:ftg
 // Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/oml_generator.py
 // Minimal mode enabled: Pgae/cell attributes, style, and geometries have been omitted (making the drawio-> OML conversion lossy).
 

+ 2 - 3
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/FTG_ftg.oml

@@ -1,7 +1,6 @@
 // Warning: Generated Code! Do not edit!
-// Input file: /home/maestro/repos/drawio2oml/test/data/pm/MyFTGPM.drawio
-// Page: FTG
-// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml
+// Input: http://localhost:5000/diagrams/FTG:ftg
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/ftg/oml_generator.py
 
 description <http://ua.be/sdo2l/description/artifacts/FTG_ftg#> as FTG_ftg {
 

+ 41 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MinimalPM_corr.oml

@@ -0,0 +1,41 @@
+// Warning: Generated Code! Do not edit!
+// Input: http://localhost:5000/diagrams/MinimalPM:pm
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/pm/oml_generator.py
+
+// This file contains the correspondence links between concrete syntax (Drawio) and abstract syntax (Process Model).
+description <http://ua.be/sdo2l/description/artifacts/MinimalPM_corr#> as MinimalPM_corr {
+
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/cs_as#> as cs_as
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+
+  extends <http://ua.be/sdo2l/description/artifacts/MinimalPM_drawio#> as my_drawio
+  extends <http://ua.be/sdo2l/description/artifacts/MinimalPM_pm#> as my_pm
+
+  ci model : cs_as:CorrespondenceModel [
+    object_diagram:hasName "MinimalPM_corr"
+  ]
+
+  ri trace_drawio_kPhmW1dwLuky_b0boUTp-1_initial : cs_as:CS_AS_Link [
+    from my_drawio:cell_kPhmW1dwLuky_b0boUTp-1
+    to my_pm:initial
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_kPhmW1dwLuky_b0boUTp-2_final : cs_as:CS_AS_Link [
+    from my_drawio:cell_kPhmW1dwLuky_b0boUTp-2
+    to my_pm:final
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_kPhmW1dwLuky_b0boUTp-3_ctrl_flow_0 : cs_as:CS_AS_Link [
+    from my_drawio:cell_kPhmW1dwLuky_b0boUTp-3
+    to my_pm:ctrl_flow_0
+    object_diagram:inModel model
+  ]
+
+  ri trace_drawio_1_model : cs_as:CS_AS_Link [
+    from my_drawio:cell_1
+    to my_pm:model
+    object_diagram:inModel model
+  ]
+}

+ 96 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MinimalPM_drawio.oml

@@ -0,0 +1,96 @@
+// Warning: Generated code! Do not edit!
+// Input: http://localhost:5000/diagrams/MinimalPM:pm
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/oml_generator.py
+// Minimal mode enabled: Pgae/cell attributes, style, and geometries have been omitted (making the drawio-> OML conversion lossy).
+
+description <http://ua.be/sdo2l/description/artifacts/MinimalPM_drawio#> as MinimalPM_drawio {
+
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/dict#> as dict
+
+  ci model : drawio:Model [
+    drawio:hasDrawioId "k7m7Ebu8EXRkVeQowzfr"
+    object_diagram:hasName "MinimalPM:pm_drawio"
+  ]
+
+  
+  ci cell_0 : drawio:Cell [
+    drawio:hasDrawioId "0"
+    drawio:isRootOf model
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_1 : drawio:Cell [
+    drawio:hasDrawioId "1"
+    drawio:hasParent cell_0
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_kPhmW1dwLuky_b0boUTp-3 : drawio:Edge [
+    drawio:hasDrawioId "kPhmW1dwLuky_b0boUTp-3"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+    drawio:hasSource cell_kPhmW1dwLuky_b0boUTp-1
+    drawio:hasTarget cell_kPhmW1dwLuky_b0boUTp-2
+  ]
+  
+  ci cell_kPhmW1dwLuky_b0boUTp-3_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_kPhmW1dwLuky_b0boUTp-3
+    object_diagram:inModel model
+  ]
+  ci cell_kPhmW1dwLuky_b0boUTp-3_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "ctrl_flow"
+    drawio:propertyOf cell_kPhmW1dwLuky_b0boUTp-3
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_kPhmW1dwLuky_b0boUTp-1 : drawio:Vertex [
+    drawio:hasDrawioId "kPhmW1dwLuky_b0boUTp-1"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+  ci cell_kPhmW1dwLuky_b0boUTp-1_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_kPhmW1dwLuky_b0boUTp-1
+    object_diagram:inModel model
+  ]
+  ci cell_kPhmW1dwLuky_b0boUTp-1_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "initial"
+    drawio:propertyOf cell_kPhmW1dwLuky_b0boUTp-1
+    object_diagram:inModel model
+  ]
+
+  
+  ci cell_kPhmW1dwLuky_b0boUTp-2 : drawio:Vertex [
+    drawio:hasDrawioId "kPhmW1dwLuky_b0boUTp-2"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+  ci cell_kPhmW1dwLuky_b0boUTp-2_prop_label : drawio:CellProperty [
+    dict:hasKey "label"
+    dict:hasValue ""
+    drawio:propertyOf cell_kPhmW1dwLuky_b0boUTp-2
+    object_diagram:inModel model
+  ]
+  ci cell_kPhmW1dwLuky_b0boUTp-2_prop_pmRole : drawio:CellProperty [
+    dict:hasKey "pmRole"
+    dict:hasValue "final"
+    drawio:propertyOf cell_kPhmW1dwLuky_b0boUTp-2
+    object_diagram:inModel model
+  ]
+
+  
+}

+ 33 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MinimalPM_pm.oml

@@ -0,0 +1,33 @@
+// Warning: Generated Code! Do not edit!
+// Input: http://localhost:5000/diagrams/MinimalPM:pm
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/pm/oml_generator.py
+
+description <http://ua.be/sdo2l/description/artifacts/MinimalPM_pm#> as MinimalPM_pm {
+
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/pm#> as pm
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+  uses <http://ua.be/sdo2l/vocabulary/base/ftg#> as ftg
+
+  extends <http://ua.be/sdo2l/description/artifacts/FTG_ftg#> as ftg_instance
+
+  ci model : pm:Model [
+    object_diagram:hasName "MinimalPM_pm"
+  ]
+
+  ci initial : pm:Initial [
+    object_diagram:inModel model
+    pm:ctrlTo final // 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 final : pm:Final [
+    object_diagram:inModel model
+    //pm:ctrlFrom initial // 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
+  ]
+
+  ri ctrl_flow_0 : pm:CtrlFlow [
+    from initial
+    to final
+    object_diagram:inModel model
+  ]
+
+}

+ 3 - 4
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MyPM_corr.oml

@@ -1,9 +1,8 @@
 // Warning: Generated Code! Do not edit!
-// This file contains the correspondence links between concrete syntax (Drawio) and abstract syntax (Process Model).
-// Input file: /home/maestro/repos/drawio2oml/test/data/pm/MyFTGPM.drawio
-// Page: MyPM
-// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml
+// Input: http://localhost:5000/diagrams/MyPM:pm
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/pm/oml_generator.py
 
+// This file contains the correspondence links between concrete syntax (Drawio) and abstract syntax (Process Model).
 description <http://ua.be/sdo2l/description/artifacts/MyPM_corr#> as MyPM_corr {
 
   uses <http://ua.be/sdo2l/vocabulary/formalisms/cs_as#> as cs_as

+ 2 - 3
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MyPM_drawio.oml

@@ -1,6 +1,5 @@
 // Warning: Generated code! Do not edit!
-// Input: '/home/maestro/repos/drawio2oml/test/data/pm/MyFTGPM.drawio'
-// Page: 'MyPM:pm'
+// Input: http://localhost:5000/diagrams/MyPM:pm
 // Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/oml_generator.py
 // Minimal mode enabled: Pgae/cell attributes, style, and geometries have been omitted (making the drawio-> OML conversion lossy).
 
@@ -78,7 +77,7 @@ description <http://ua.be/sdo2l/description/artifacts/MyPM_drawio#> as MyPM_draw
   ]
   ci cell_CvR4PfVCJDiI6bvIUUvl-2_prop_type : drawio:CellProperty [
     dict:hasKey "type"
-    dict:hasValue "Sketch"
+    dict:hasValue "Sketch2"
     drawio:propertyOf cell_CvR4PfVCJDiI6bvIUUvl-2
     object_diagram:inModel model
   ]

+ 8 - 3
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/MyPM_pm.oml

@@ -1,12 +1,14 @@
 // Warning: Generated Code! Do not edit!
-// Input file: /home/maestro/repos/drawio2oml/test/data/pm/MyFTGPM.drawio
-// Page: MyPM
-// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml
+// Input: http://localhost:5000/diagrams/MyPM:pm
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/pm/oml_generator.py
 
 description <http://ua.be/sdo2l/description/artifacts/MyPM_pm#> as MyPM_pm {
 
   uses <http://ua.be/sdo2l/vocabulary/formalisms/pm#> as pm
   uses <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+  uses <http://ua.be/sdo2l/vocabulary/base/ftg#> as ftg
+
+  extends <http://ua.be/sdo2l/description/artifacts/FTG_ftg#> as ftg_instance
 
   ci model : pm:Model [
     object_diagram:hasName "MyPM_pm"
@@ -24,12 +26,14 @@ description <http://ua.be/sdo2l/description/artifacts/MyPM_pm#> as MyPM_pm {
 
   ci artifact_0 : pm:Artifact [
     pm:hasName "sketch"
+    pm:hasType ftg_instance:f_xopp
     object_diagram:inModel model
     pm:dataTo activity_1_port_2 // 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 activity_0 : pm:Activity [
     pm:hasName "sketch"
+    pm:isTransformation ftg_instance:t_Sketch2
     object_diagram:inModel model
   ]
 
@@ -59,6 +63,7 @@ description <http://ua.be/sdo2l/description/artifacts/MyPM_pm#> as MyPM_pm {
 
   ci activity_1 : pm:Activity [
     pm:hasName "look_at_sketch"
+    pm:isTransformation ftg_instance:t_LookAtSketch
     object_diagram:inModel model
   ]
 

+ 51 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/artifacts/imabox_drawio.oml

@@ -0,0 +1,51 @@
+// Warning: Generated code! Do not edit!
+// Input: http://localhost:5000/diagrams/imabox
+// Generator: https://msdl.uantwerpen.be/git/jexelmans/drawio2oml/drawio2oml/oml_generator.py
+// Minimal mode enabled: Pgae/cell attributes, style, and geometries have been omitted (making the drawio-> OML conversion lossy).
+
+description <http://ua.be/sdo2l/description/artifacts/imabox_drawio#> as imabox_drawio {
+
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/drawio#> as drawio
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+  uses <http://ua.be/sdo2l/vocabulary/formalisms/dict#> as dict
+
+  ci model : drawio:Model [
+    drawio:hasDrawioId "zrtIvTJA7dqCUAPr35Tx"
+    object_diagram:hasName "imabox_drawio"
+  ]
+
+  
+  ci cell_0 : drawio:Cell [
+    drawio:hasDrawioId "0"
+    drawio:isRootOf model
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_1 : drawio:Cell [
+    drawio:hasDrawioId "1"
+    drawio:hasParent cell_0
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_9icA3CxboUUVQeyL5Ov7-1 : drawio:Vertex [
+    drawio:hasDrawioId "9icA3CxboUUVQeyL5Ov7-1"
+    drawio:hasValue "Hello, I'm a box!"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+  ci cell_9icA3CxboUUVQeyL5Ov7-2 : drawio:Vertex [
+    drawio:hasDrawioId "9icA3CxboUUVQeyL5Ov7-2"
+    drawio:hasParent cell_1
+    object_diagram:inModel model
+  ]
+  
+
+  
+}

+ 19 - 11
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/description/bundle.oml

@@ -1,12 +1,20 @@
 description bundle <http://ua.be/sdo2l/description/bundle#> as ^bundle {
-	uses <http://ua.be/sdo2l/vocabulary/bundle#>
-	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/my_xopp_to_drawio#>
-	includes <http://ua.be/sdo2l/description/artifacts/my_xopp#>
-	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/traces/my_pt#>
-}
+  uses <http://ua.be/sdo2l/vocabulary/bundle#>
+  includes <http://ua.be/sdo2l/description/traces/my_pt#>
+  includes <http://ua.be/sdo2l/description/artifacts/AnotherPM_drawio#>
+  includes <http://ua.be/sdo2l/description/artifacts/FTG_ftg#>
+  includes <http://ua.be/sdo2l/description/artifacts/AnotherPM_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/MyPM_pm#>
+  includes <http://ua.be/sdo2l/description/artifacts/my_xopp#>
+  includes <http://ua.be/sdo2l/description/artifacts/FTG_drawio#>
+  includes <http://ua.be/sdo2l/description/artifacts/imabox_drawio#>
+  includes <http://ua.be/sdo2l/description/artifacts/AnotherPM_pm#>
+  includes <http://ua.be/sdo2l/description/artifacts/MinimalPM_pm#>
+  includes <http://ua.be/sdo2l/description/artifacts/MinimalPM_drawio#>
+  includes <http://ua.be/sdo2l/description/artifacts/MinimalPM_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/FTG_corr#>
+  includes <http://ua.be/sdo2l/description/artifacts/MyPM_drawio#>
+  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/my_xopp_to_drawio#>
+}

文件差异内容过多而无法显示
+ 1 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/AnotherPM:pm


文件差异内容过多而无法显示
+ 1 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/Drawing


文件差异内容过多而无法显示
+ 1 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/FTG:ftg


文件差异内容过多而无法显示
+ 1 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/MinimalPM:pm


文件差异内容过多而无法显示
+ 1 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/MyPM:ftg


文件差异内容过多而无法显示
+ 1 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/MyPM:pm


文件差异内容过多而无法显示
+ 1 - 0
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/diagrams/imabox


+ 4 - 2
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/vocabulary/base/ftg.oml

@@ -3,9 +3,11 @@ vocabulary <http://ua.be/sdo2l/vocabulary/base/ftg#> as ftg {
 	extends <http://ua.be/sdo2l/vocabulary/base/base#> as base
 	extends <http://www.w3.org/2001/XMLSchema#> as xsd
 
+	extends <http://ua.be/sdo2l/vocabulary/formalisms/object_diagram#> as object_diagram
+
 	// Definitions for Activities
 	@rdfs:comment "The types of activities performed during the system design process. This concept should be used in the FTG."
-	concept Transformation :> base:ImmutableThing, base:DefinitionThing [
+	concept Transformation :> base:ImmutableThing, base:DefinitionThing, object_diagram:Object [
 		restricts scalar property hasCtrlInput to min 1
 		restricts scalar property hasCtrlOutput to min 1
 	]
@@ -22,7 +24,7 @@ vocabulary <http://ua.be/sdo2l/vocabulary/base/ftg#> as ftg {
 
 	// Definitions for Artifacts
 	@rdfs:comment "The types of artifacts generated during the system design process. This concept should be used in the FTG."
-	concept Formalism :> base:ImmutableThing, base:DefinitionThing []
+	concept Formalism :> base:ImmutableThing, base:DefinitionThing, object_diagram:Object []
 
 	// Data inputs/outputs are named:
 	aspect InputOrOutput [

+ 1 - 1
examples/oml/SystemDesignOntology2Layers/src/oml/ua.be/sdo2l/vocabulary/formalisms/pm.oml

@@ -91,7 +91,7 @@ vocabulary <http://ua.be/sdo2l/vocabulary/formalisms/pm#> as pm {
 	
 	concept Artifact :> element, Named, DataSource, DataSink [
 		// an artifact must come from somewhere :)
-		restricts relation dataTo to min 1
+		restricts relation dataFrom to min 1
 	]
 	
 	relation entity HasType [