Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rework model #1444 #1707

Merged
merged 24 commits into from
Oct 24, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
276aa04
relabel model to numerical computer model #1444
stap-m Oct 2, 2023
6442e0d
add new class model and model role to oeo-shared #1444
stap-m Oct 2, 2023
0ad350e
add new class scale model and mathematical model, add term tracker #1444
stap-m Oct 2, 2023
6819546
make mathematical model an information content entity #1444 #1707
stap-m Oct 23, 2023
cce5d1b
change domain of models #1444 #1707
stap-m Oct 23, 2023
4d143b2
change domain of has contributor #1444 #1707
stap-m Oct 23, 2023
72b6ea5
change domain of has contributor subclasses #1444 #1707
stap-m Oct 23, 2023
e0a2407
changelog #1444
stap-m Oct 23, 2023
5d137fe
Merge branch 'dev' into feature-1399-rework-model
stap-m Oct 23, 2023
3af2290
Merge branch 'dev' of https://github.com/OpenEnergyPlatform/ontology …
stap-m Oct 23, 2023
ed7f837
Update src/ontology/edits/oeo-model.omn
stap-m Oct 23, 2023
8de3688
Update src/ontology/edits/oeo-model.omn
stap-m Oct 23, 2023
314a0d3
Update src/ontology/edits/oeo-shared.omn
stap-m Oct 23, 2023
6d6fd49
Update src/ontology/edits/oeo-shared.omn
stap-m Oct 23, 2023
a1956ce
Merge branch 'dev' into feature-1399-rework-model
stap-m Oct 23, 2023
80eda3b
copy organisation role and client to oeo-shared
stap-m Oct 23, 2023
57cb1ff
remove client from oeo-social
stap-m Oct 23, 2023
4907b3c
remove organisational role from oeo-social
stap-m Oct 23, 2023
a86e060
move back client
stap-m Oct 24, 2023
7f0b986
clean axioms of has contributor, has author, has client
stap-m Oct 24, 2023
6147ca2
clean axioms of has contact person, has organisation
stap-m Oct 24, 2023
1bf8d55
clean client
stap-m Oct 24, 2023
6d81013
clean has member and member of
stap-m Oct 24, 2023
1e5af79
Update src/ontology/edits/oeo-shared.omn
stap-m Oct 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ and the versioning aims to respect [Semantic Versioning](http://semver.org/spec/
- economy, economic scenario, target driven scenario, explorative scenario, policy scenario (#1642)
- regionalisation (#1644)
- oeo.omn imports (#1649)
- model relabeled to numerical computer model, model, has contributor and subclasses (#1707)
- study (#1711)
- person, organisational role, organisation (#1716)
- energy balance -> energy balance data set (#1717)
Expand Down
44 changes: 40 additions & 4 deletions src/ontology/edits/oeo-model.omn
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,8 @@ Class: OEO_00000274

Annotations:
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared",
<http://purl.obolibrary.org/obo/IAO_0000115> "A model is a generically dependent continuant that is used for computing an idealised reproduction of a system and its behaviours."@en,
<http://purl.obolibrary.org/obo/IAO_0000115> "A numerical computer model is a mathematical model that is calculated by a computer."@en,
<http://purl.obolibrary.org/obo/IAO_0000116> "formerly called \"model\"",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/180
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/349

Expand All @@ -962,11 +963,15 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1113

rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
rdfs:label "model"
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652

rename and reclassify
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "numerical computer model"

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000031>
OEO_00020354


Class: OEO_00000275
Expand Down Expand Up @@ -2510,6 +2515,37 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1648",
OEO_00000364


Class: OEO_00020352


Class: OEO_00020353


Class: OEO_00020354

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A mathematical model is a information content artifact that represents a system and its behaviours mathematically.",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "mathematical model"

SubClassOf:
<http://purl.obolibrary.org/obo/IAO_0000030>,
<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00020353


Class: OEO_00020355

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A scale model is model comprising of a spatial pattern of components arranged in such a way for them to represent a system.",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "scale model"

SubClassOf:
OEO_00020352


Class: OEO_00030007

Annotations:
Expand Down
150 changes: 141 additions & 9 deletions src/ontology/edits/oeo-shared.omn
Original file line number Diff line number Diff line change
Expand Up @@ -452,48 +452,80 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/852",
ObjectProperty: OEO_00000506

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an information content entity / model and its author."@en,
<http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an information content entity and its author."@en,
<http://purl.obolibrary.org/obo/IAO_0000116> "The construct 'has author' some ('has role' some author) is necessary, because 'has author' has the range 'has role some author' (PR https://github.com/OpenEnergyPlatform/ontology/pull/871). That is an independent continuant, i.e. a person, that takes over writing a text and as such the role of an author.",
<http://purl.obolibrary.org/obo/IAO_0000233> "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity)
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared)

rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652

change domain and def
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "has author"

SubPropertyOf:
OEO_00140008

Domain:
<http://purl.obolibrary.org/obo/IAO_0000030>

Range:
<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00000064


ObjectProperty: OEO_00000507

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an information content entity / model and the client that requested its creation."@en,
<http://purl.obolibrary.org/obo/IAO_0000233> "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity)
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared)

rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652

change domain
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "has client"

SubPropertyOf:
OEO_00140008

Domain:
OEO_00020352 or <http://purl.obolibrary.org/obo/IAO_0000030>

Range:
<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00000087


ObjectProperty: OEO_00000508

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an information content entity / model and the person to contact with issues about it."@en,
<http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an information content entity and the person to contact with issues about it."@en,
<http://purl.obolibrary.org/obo/IAO_0000233> "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity)
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared)

rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652

change domain and definition
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "has contact person"

SubPropertyOf:
OEO_00140008

Domain:
OEO_00020352 or <http://purl.obolibrary.org/obo/IAO_0000030>

Range:
<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00000107

ObjectProperty: OEO_00000509

Expand All @@ -516,26 +548,49 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871"
ObjectProperty: OEO_00000510

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an information content entity or model and the organisation in which it was created."@en,
<http://purl.obolibrary.org/obo/IAO_0000115> "A relation that holds between an information content entity and the organisation in which it was created."@en,
<http://purl.obolibrary.org/obo/IAO_0000233> "pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity)
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared)

improve definition:
https://github.com/OpenEnergyPlatform/ontology/issues/1038
https://github.com/OpenEnergyPlatform/ontology/pull/1042

Replace `institution` as range by `organisation role`
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1161
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1200

Relabel to `has organisation`
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1161
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1226

rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652

change domain and definition
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "has organisation"

SubPropertyOf:
OEO_00140008

Domain:
<http://purl.obolibrary.org/obo/IAO_0000030>

Range:
<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00000315


ObjectProperty: OEO_00000514


ObjectProperty: OEO_00000515


ObjectProperty: OEO_00000516


ObjectProperty: OEO_00000522

Expand Down Expand Up @@ -826,11 +881,19 @@ ObjectProperty: OEO_00140008
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/556
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/626 (extend def for information content entity)
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/871 (domain and range; move to oeo-shared)

rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652

change domain
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "has contributor"@en

Domain:
OEO_00020352 or <http://purl.obolibrary.org/obo/IAO_0000030>

Range:
<http://purl.obolibrary.org/obo/BFO_0000002>

Expand Down Expand Up @@ -884,9 +947,16 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/821

rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652

change domain
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "models"@en

Domain:
OEO_00020352

Range:
<http://purl.obolibrary.org/obo/BFO_0000004>

Expand Down Expand Up @@ -1010,6 +1080,20 @@ issue: https://github.com/OpenEnergyPlatform/ontology/issues/1275
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1547"


Class: OEO_00000087

Annotations:
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared",
<http://purl.obolibrary.org/obo/IAO_0000115> "A client is an agent that receives a product or service.",
<http://purl.obolibrary.org/obo/IAO_0000233> "rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
rdfs:label "client"

SubClassOf:
OEO_00000051


Class: <http://purl.obolibrary.org/obo/IAO_0000088>


Expand Down Expand Up @@ -1174,7 +1258,27 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/810"
<http://purl.obolibrary.org/obo/BFO_0000019>,
OEO_00010121 some <http://purl.obolibrary.org/obo/BFO_0000040>


Class: OEO_00000315

Annotations:
OEO_00040001 "http://openenergy-platform.org/ontology/oeo/oeo-shared",
<http://purl.obolibrary.org/obo/IAO_0000115> "An organisation role is a role of an aggregate of people that has a collective goal and a set of organisation rules.",
<http://purl.obolibrary.org/obo/IAO_0000118> "organization role",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/314
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/370
rework module structure
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1592
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652
remove disjointness with person
issue: https://github.com/OpenEnergyPlatform/ontology/issues/1702
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1716",
rdfs:label "organisation role"

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000023>


Class: OEO_00000323

Annotations:
Expand Down Expand Up @@ -1473,6 +1577,34 @@ pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1652",
<http://purl.obolibrary.org/obo/BFO_0000015>


Class: OEO_00020352

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A model is a continuant to represent a system and its behaviours in a simplified or idealised way.",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue:https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "model"

EquivalentTo:
<http://purl.obolibrary.org/obo/BFO_0000002>
and (<http://purl.obolibrary.org/obo/RO_0000087> some OEO_00020353)

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000002>


Class: OEO_00020353

Annotations:
<http://purl.obolibrary.org/obo/IAO_0000115> "A model role is a a role of a continuant for representing a system and its behaviours in a simplified or idealised way.",
<http://purl.obolibrary.org/obo/IAO_0000233> "issue: https://github.com/OpenEnergyPlatform/ontology/issues/1444
pull request: https://github.com/OpenEnergyPlatform/ontology/pull/1707",
rdfs:label "model role"

SubClassOf:
<http://purl.obolibrary.org/obo/BFO_0000023>


Class: OEO_00030019

Annotations:
Expand Down
Loading