feature 1592 moving classes to physical part 4

OpenEnergyPlatform / ontology

Repository for the Open Energy Ontology (OEO)

Creative Commons Zero v1.0 Universal

111 stars 23 forks source link

feature 1592 moving classes to physical part 4 #1685

Closed nelekoehler closed 1 year ago

nelekoehler commented 1 year ago

Workflow checklist

Automation

Closes #

PR-Assignee

[ ] 🐙 Follow the Pull Request Workflow
[ ] 📝 Update the CHANGELOG.md
[ ] 📙 Add #'s to term tracker item

Reviewer

[ ] 🐙 Follow the Reviewer Guide
[ ] 🐙 Provided feedback and show sufficient appreciation for the work done

nelekoehler commented 1 year ago

It seems like there is a merge conflict, because of the physical part 3 PR I just merged. I am not sure, what I have to change now, so it works.

l-emele commented 1 year ago

The problem is in the class OEO_00260001 in oeo-physical.

In line 12404ff. class OEO_00260001 is declared as personal living space.
In line 12421ff. class OEO_00260001 is declared as ramping.

The correct one for OEO_00260001 is ramping while personal living space is OEO_00240038. OEO_00240038 is declared correctly directly in lines 12388.

I suggest to delete the whole declaration of OEO_00260001 in lines 12404 to 12420.