Merge branch 'dev' into feature-636-envo-skos-mappings

OpenEnergyPlatform · Jul 1, 2024 · ee53076 · ee53076
2 parents ad8533c + df53579
commit ee53076
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,11 +7,13 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
 ## [2.X.X] - 20XX-XX-XX
 ### Added
 - subsector, has subsector, subsector of (#1788)
+- Matlab programming language (#1869)
 - SKOS annotations: skos:closeMatch, skos:exactMatch, skos:relatedMatch (#1874)
 
 ### Changed
 - electricity sector, industry sector, CRF sector (IPCC 2006) individuals (#1788)
 - German alternative labels (#1862, #1868)
+- C++, Fortran, Java, Matlab, PHP, Python, R, Ruby, VBA (#1869)
 - ENVO mappings (#1879)
 
 ### Removed

diff --git a/src/ontology/edits/catalog-v001.xml b/src/ontology/edits/catalog-v001.xml
@@ -9,7 +9,7 @@
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/ro-extracted.owl" uri="../imports/ro-extracted.owl"/>
     <uri id="Imports Wizard Entry" name="http://openenergy-platform.org/ontology/oeo/dev/imports/uo-extracted.owl" uri="../imports/uo-extracted.owl"/>
     <group id="Folder Repository, directory=, recursive=true, Auto-Update=true, version=2" prefer="public" xml:base="">
-        <uri id="Automatically generated entry, Timestamp=1714049102654" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
-        <uri id="Automatically generated entry, Timestamp=1714049102654" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1719595580542" name="http://openenergy-platform.org/ontology/oeo/oeo-import-edits.owl" uri="oeo-import-edits.owl"/>
+        <uri id="Automatically generated entry, Timestamp=1719595580542" name="http://openenergy-platform.org/ontology/oeo/oeo-physical-axioms/" uri="oeo-physical-axioms.owl"/>
     </group>
 </catalog>
diff --git a/src/ontology/edits/oeo-model.omn b/src/ontology/edits/oeo-model.omn
@@ -102,6 +102,9 @@ ObjectProperty: <http://purl.obolibrary.org/obo/RO_0002234>
 ObjectProperty: <http://purl.obolibrary.org/obo/RO_0002353>
 
 
+ObjectProperty: OEO_00000501
+
+
 ObjectProperty: OEO_00000503
 
 
@@ -564,6 +567,9 @@ Class: <http://purl.obolibrary.org/obo/IAO_0000010>
         OEO_00020188 some OEO_00020187
 
 
+Class: <http://purl.obolibrary.org/obo/IAO_0000025>
+
+
 Class: <http://purl.obolibrary.org/obo/IAO_0000027>
 
 
@@ -2607,7 +2613,6 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1842",
         OEO_00000275
 
 
-
 Class: OEO_00020411
 
     Annotations: 
@@ -2648,8 +2653,8 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1843",
 
     SubClassOf: 
         <http://purl.obolibrary.org/obo/BFO_0000023>
-
-
+    
+    
 Class: OEO_00020416
 
     Annotations: 
@@ -3496,10 +3501,14 @@ Individual: OEO_00000049
 Individual: OEO_00000081
 
     Annotations: 
-        rdfs:label "c++"@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "C++ is a programming languages designed by Bjarne Stroustrup and standardised by ISO/IEC."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "C++"@en,
+        skos:closeMatch <http://www.ebi.ac.uk/swo/SWO_0000097>
 
     Types: 
-        OEO_00000382
+        <http://purl.obolibrary.org/obo/IAO_0000025>
 
 
 Individual: OEO_00000092
@@ -3558,11 +3567,15 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1255",
 Individual: OEO_00000170
 
     Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Fortran is a programming language designed by John Backus, developed by IBM and standardised by ISO/IEC."@en,
         <http://purl.obolibrary.org/obo/IAO_0000118> "Fortran"@de,
-        rdfs:label "fortran"@en
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "Fortran"@en,
+        skos:closeMatch <http://www.ebi.ac.uk/swo/SWO_0000105>
 
     Types: 
-        OEO_00000382
+        <http://purl.obolibrary.org/obo/IAO_0000025>
 
 
 Individual: OEO_00000180
@@ -3624,10 +3637,14 @@ Individual: OEO_00000225
 Individual: OEO_00000244
 
     Annotations: 
-        rdfs:label "java"@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Java is a programming language designed by James Gosling and developed by Oracle."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "Java"@en,
+        skos:closeMatch <http://www.ebi.ac.uk/swo/SWO_0000012>
 
     Types: 
-        OEO_00000382
+        <http://purl.obolibrary.org/obo/IAO_0000025>
 
 
 Individual: OEO_00000266
@@ -3642,11 +3659,18 @@ Individual: OEO_00000266
 Individual: OEO_00000267
 
     Annotations: 
-        rdfs:label "matlab"@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "The Matlab software framework is a proprietary software framework developed by MathWorks that uses the Matlab programming language."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000118> "Matlab"@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "Matlab software framework"@en
 
     Types: 
         OEO_00000382
 
+    Facts:  
+     OEO_00000503  OEO_00010487
+
 
 Individual: OEO_00000280
 
@@ -3678,10 +3702,15 @@ Individual: OEO_00000287
 Individual: OEO_00000288
 
     Annotations: 
-        rdfs:label "vba"@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Visual Basic for Applications (VBA) is a programming language based on Visual Basic and developed by Microsoft for use within the Microsoft Office software package."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000118> "VBA"@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "Visual Basic for Applications"@en,
+        skos:relatedMatch <http://www.ebi.ac.uk/swo/SWO_0000130>
 
     Types: 
-        OEO_00000382
+        <http://purl.obolibrary.org/obo/IAO_0000025>
 
 
 Individual: OEO_00000319
@@ -3696,37 +3725,53 @@ Individual: OEO_00000319
 Individual: OEO_00000325
 
     Annotations: 
-        rdfs:label "php"@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "PHP is a programming language designed by Rasmus Lerdorf."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "PHP"@en,
+        skos:closeMatch <http://www.ebi.ac.uk/swo/SWO_0000116>
 
     Types: 
-        OEO_00000382
+        <http://purl.obolibrary.org/obo/IAO_0000025>
 
 
 Individual: OEO_00000349
 
     Annotations: 
-        rdfs:label "python"@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Python is a programming language designed by Guido van Rossum and developed by the Python Software Foundation."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "Python"@en,
+        skos:closeMatch <http://www.ebi.ac.uk/swo/SWO_0000118>
 
     Types: 
-        OEO_00000382
+        <http://purl.obolibrary.org/obo/IAO_0000025>
 
 
 Individual: OEO_00000351
 
     Annotations: 
-        rdfs:label "r"@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "R is a programming language designed by Ross Ihaka and Robert Gentleman and the R Core Team.",
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "R"@en,
+        skos:closeMatch <http://www.ebi.ac.uk/swo/SWO_0000415>
 
     Types: 
-        OEO_00000382
+        <http://purl.obolibrary.org/obo/IAO_0000025>
 
 
 Individual: OEO_00000362
 
     Annotations: 
-        rdfs:label "ruby"@en
+        <http://purl.obolibrary.org/obo/IAO_0000115> "Ruby is a programming language designed by Yukihiro Matsumoto."@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "Ruby"@en,
+        skos:closeMatch <http://www.ebi.ac.uk/swo/SWO_0000120>
 
     Types: 
-        OEO_00000382
+        <http://purl.obolibrary.org/obo/IAO_0000025>
 
 
 Individual: OEO_00000424
@@ -3764,6 +3809,23 @@ Individual: OEO_00000451
         OEO_00000120
 
 
+Individual: OEO_00010487
+
+    Annotations: 
+        <http://purl.obolibrary.org/obo/IAO_0000118> "Matlab"@en,
+        <http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/859
+pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1869",
+        rdfs:label "Matlab programming language"@en,
+        rdfs:label "The Matlab programming language is a programming language developed by MathWorks for use in the Matlab software framework."@en,
+        skos:closeMatch <http://www.ebi.ac.uk/swo/SWO_0000274>
+
+    Types: 
+        <http://purl.obolibrary.org/obo/IAO_0000025>
+
+    Facts:  
+     OEO_00000501  OEO_00000267
+
+
 Individual: OEO_00020027
 
     Annotations: