Improve model

EuroCRIS · Jul 13, 2022 · 84764c2 · 84764c2
1 parent f5e25d9
commit 84764c2
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 30 deletions.
diff --git a/diagrams/CRediT.puml b/diagrams/CRediT.puml
@@ -2,9 +2,11 @@
 
     !includesub ../../CERIF-Core/diagrams/core.puml!common
 
-
+    !includesub ../../CERIF-Core/diagrams/core.puml!Resource
     !includesub ../../CERIF-Core/diagrams/core.puml!Document
+    !includesub ../../CERIF-Core/diagrams/core.puml!Activity
     !includesub ../../CERIF-Core/diagrams/core.puml!Contribution
+    !includesub ../../CERIF-Core/diagrams/core.puml!Contribution_to_Document
     !includesub ../../CERIF-Core/diagrams/core.puml!Agent
 
     !includesub ./module.puml!CRediT

diff --git a/diagrams/coarAccessibilitySpecification.puml b/diagrams/coarAccessibilitySpecification.puml
@@ -2,8 +2,10 @@
 
     !includesub ../../CERIF-Core/diagrams/core.puml!common
 
-    !includesub ../../CERIF-Core/diagrams/core.puml!TDAS
+    !includesub ../../CERIF-Core/diagrams/core.puml!Document
+    !includesub ../../CERIF-Core/diagrams/core.puml!Textual_Document
+    !includesub ../../CERIF-Core/diagrams/core.puml!Textual_Document_Accessibility_Specification
 
-    !includesub ./module.puml!Coar
+    !includesub ./module.puml!COAR_Accessibility_Specification
 
 @enduml
diff --git a/diagrams/example.puml b/diagrams/example.puml
@@ -4,15 +4,15 @@
 !include ../../CERIF-Core/diagrams/example.puml
 
 
-    object "<u>Open Access: Open Access COAR v.1.0 Accessibility Specification</u>" as OpenAccess #00ff00
+    object "<u>Open Access: Open Access COAR v.1.0 Accessibility Specification</u>" as OpenAccess #ddeedd
 
-    object "<u>EJOR : Journal</u>" as journalEJOR #00ff00 {
+    object "<u>EJOR : Journal</u>" as journalEJOR #ddeedd {
         title = "European Journal of Operational Research"@en
         issn = "0377-2217" ^^ ISSN
         publishers = [ Elsevier ] ^^ List<Agent>
         }
 
-    object "<u>10.1016/j.ejor.2020.09.020: Journal Article</u>" as article09020 #00ff00 {
+    object "<u>10.1016/j.ejor.2020.09.020: Journal Article</u>" as article09020 #ddeedd {
             DOI = "10.1016/j.ejor.2020.09.020" ^^ DOI_Type
             title = "The responsibility of social media in times of
             \t societal and political manipulation"@en

diff --git a/diagrams/journalArticle.puml b/diagrams/journalArticle.puml
@@ -2,9 +2,8 @@
 
     !includesub ../../CERIF-Core/diagrams/core.puml!common
 
-
     !includesub ../../CERIF-Core/diagrams/core.puml!Document
-
+    !includesub ../../CERIF-Core/diagrams/core.puml!Textual_Document
 
     !includesub ./module.puml!Journal
 

diff --git a/diagrams/module.puml b/diagrams/module.puml
@@ -2,22 +2,22 @@
 
     !include ../../CERIF-Core/diagrams/core.puml
 
-    !startsub Coar
-        class "COAR_Accessibility_Specification_v_1_0" #00ff00
+    !startsub COAR_Accessibility_Specification
+        class "COAR_Accessibility_Specification_v_1_0" #ddeedd
 
-        class "Open_Access_COAR_Accessibility_Specification_v_1_0" #00ff00
+        class "Open_Access_COAR_Accessibility_Specification_v_1_0" #ddeedd
 
-        class "Restricted_Access_COAR_Accessibility_Specification_v_1_0" #00ff00
+        class "Restricted_Access_COAR_Accessibility_Specification_v_1_0" #ddeedd
 
-        class "Metadata_Only_Access_COAR_Accessibility_Specification_v_1_0" #00ff00
+        class "Metadata_Only_Access_COAR_Accessibility_Specification_v_1_0" #ddeedd
 
-        class "Embargoed_Access_COAR_Accessibility_Specification_v_1_0" #00ff00{
+        class "Embargoed_Access_COAR_Accessibility_Specification_v_1_0" #ddeedd {
             embargoEndDate : Date
         }
     !endsub
 
     !startsub Journal
-        class "Journal" #00ff00{
+        class "Journal" #ddeedd {
             DOI : DOI_Type
             title : Multilingual_String
             ISSN : ISSN_Type
@@ -27,34 +27,34 @@
             endDate : Date
         }
 
-        class "Journal_Article" #00ff00{
+        class "Journal_Article" #ddeedd {
             startPage : String
             endPage : String
             volume : String
             number : String
         }
     !endsub
 
-    class "Monograph" #00ff00{
+    class "Monograph" #ddeedd {
         ISBN : ISBN_Type
         eISBN : ISBN_Type
     }
-    class "Editorship" #00ff00{
+    class "Editorship" #ddeedd {
         leadingEditorFlag : Boolean
     }
-    class "Publishership" #00ff00{
+    class "Publishership" #ddeedd {
         leadingPublisherFlag : Boolean
     }
 
     !startsub CRediT
-        class "CRediT_Contribution_Statement" #00ff00{
+        class "CRediT_Contribution_Statement" #ddeedd {
         }
-        enum "CRediT_Degree_of_Contribution" #00ff00{
+        enum "CRediT_Degree_of_Contribution" #ddeedd {
             Lead
             Supporting
             Equal
         }
-        enum "CRediT_Role_Type" #00ff00{
+        enum "CRediT_Role_Type" #ddeedd {
             Conceptualization
             Data curation
             Formal analysis
@@ -72,19 +72,19 @@
         }
     !endsub
 
-    !startsub Coar
+    !startsub COAR_Accessibility_Specification
         "Textual_Document_Accessibility_Specification" <|-- "COAR_Accessibility_Specification_v_1_0"
     !endsub
-    !startsub Coar
+    !startsub COAR_Accessibility_Specification
         "COAR_Accessibility_Specification_v_1_0" <|-- "Open_Access_COAR_Accessibility_Specification_v_1_0"
     !endsub
-    !startsub Coar
+    !startsub COAR_Accessibility_Specification
         "COAR_Accessibility_Specification_v_1_0" <|-- "Restricted_Access_COAR_Accessibility_Specification_v_1_0"
     !endsub
-    !startsub Coar
+    !startsub COAR_Accessibility_Specification
         "COAR_Accessibility_Specification_v_1_0" <|-- "Embargoed_Access_COAR_Accessibility_Specification_v_1_0"
     !endsub
-    !startsub Coar
+    !startsub COAR_Accessibility_Specification
         "COAR_Accessibility_Specification_v_1_0" <|-- "Metadata_Only_Access_COAR_Accessibility_Specification_v_1_0"
     !endsub
     !startsub Journal
@@ -104,14 +104,14 @@
         "Journal_Article" "0..*" o-- "source" "Journal"
     !endsub
     "Editorship" --> "editor" "Agent"
-    note on link #yellow: editor == contributor
+    note on link #ddeedd: editor == contributor
     "Publishership" --> "publisher" "Agent"
-    note on link #yellow: publisher == contributor
+    note on link #ddeedd: publisher == contributor
     !startsub CRediT
         "CRediT_Contribution_Statement" ..> "roleType" "CRediT_Role_Type"
     !endsub
     !startsub CRediT
         "CRediT_Contribution_Statement" ..> "degreeOfContribution" "CRediT_Degree_of_Contribution"
     !endsub
-    note right of CRediT_Role_Type: The CRediT is currently not expressed as Linked Open Data. \nWe hope it will be in the future. We estimate it will be more \nstraightforward for it to be exposed as a list of terms (perhaps \na SKOS concept scheme), rather than a class hierarchy. \nThis justifies our choice to model it as an enumeration rather \nthan a class hierarchy in our model.
+    note right of CRediT_Role_Type #ddeedd: The CRediT is currently not expressed as Linked Open Data. \nWe hope it will be in the future. We estimate it will be more \nstraightforward for it to be exposed as a list of terms (perhaps \na SKOS concept scheme), rather than a class hierarchy. \nThis justifies our choice to model it as an enumeration rather \nthan a class hierarchy in our model.
 @enduml