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.

Sign up for GitHub

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

Jump to bottom

restructure Generator and ArtificialObject classes #273

Merged
merged 45 commits into from
Mar 31, 2020
Merged

restructure Generator and ArtificialObject classes #273

merged 45 commits into from
Mar 31, 2020

Conversation

akleinau
Copy link
Contributor

@akleinau akleinau commented Mar 5, 2020 •
edited
Loading

closes #173 and hopefully almost every other issue in the generator project:
closes #275, closes #264, closes #162, closes #136, closes #161, closes #159

Restructures the widely distributed generator and powerplant classes as discussed in the 4. OntoHack

  • Technology has no subclasses anymore as they weren't needed
  • its now differentiated between EnergyConvertingDevice, PowerGeneratingUnit and Powerplant
    • An energy converting device is an artificial object that transforms or changes a certain type of energy.
      - A generator is an energy converting device that converts other forms of energy into electrical energy.
      - A Heater is an energy converting device that converts other forms of energy into useful heat.
      - A turbine is an energy converting device that converts energy from a moving fluid flow into rotational energy.
    • A power generating unit is an artificial object that contains a generator, among other parts.
    • A Powerplant is an aggregate of EnergyConverters that is connected to an electric grid.

akleinau added 2 commits March 5, 2020 11:08
@akleinau
implement outer structure
bfeb943 
implement
- EnergyTransformer
- PowerGneratingUnit
- Powerplant
@akleinau
add defs to generators etc
96effe5
@akleinau akleinau added [A] new term Including new term(s) in the ontology [B] restructure Restructuring existing parts of the ontology [C] definition update Update an ontology definition labels Mar 5, 2020
akleinau added 23 commits March 5, 2020 11:58
@akleinau
reorder generators and powerplants
81aac05
@akleinau
delete Technology subclasses
8f13544 
delete all Technology subclasses with -Technology suffix, the rest already got moved to ArtificialObject.
@akleinau
merge ElectricityGenerator and ElectromotiveGenerator
4a3644c
@akleinau
Update CHANGELOG.md
b499f41
@akleinau
delete reactivePowerplant
1f11713
@akleinau
rename FieldPhotovoltaicGenerator to SolarPark
b8aefcd
@akleinau
add PowerUnit subclasses
09dba41 
- add PowerUnits for all Perplant classes
- add 'has part' relations
@akleinau
update and unify Powerplant definitions
152eb4f
@akleinau
restructure generator and add 'has part' relations
7ecf240
@akleinau
take hydroGenerator out of the hierarchy to discuss it later
68bd998
@akleinau
restructure Generator class
7798edb 
- make Biomass, Biogass etc PowerPlants
- restructure to subclasses: ElectromotiveGenerator, PVCell, FuelCell
@akleinau
add term tracker item
4ac0747
@akleinau
rename HeatGenerator
f6beed1 
HeatGenerator: Heater
HeatPumpHeatGenerator: HeatPump
@akleinau
change solarThermalCollector, turbine defs
2c2bdb8
@akleinau
add definitions to Heater, FuelCell
3922cc5
@akleinau
add PowerGeneratingUnit definitions
9f73852
@akleinau
update definitions of turbine, heatpump, electricheatpump
e734868
@akleinau
Update CHANGELOG.md
a10111f
@akleinau
add missing definitions
27a7e91 
- BiofuelPowerplant and subclasses
- correct PVCell def
@akleinau
Merge branch 'dev' into feature/Generator-#173
72cd2dc
@akleinau
fix merge errors
3fc8ad8
@akleinau
fix merge errors #2
0dcb94d
@akleinau
fix merge errors #3
112ebcd
stap-m
stap-m requested changes Mar 25, 2020
View reviewed changes
src/ontology/edits/oeo-physical.omn Show resolved Hide resolved
src/ontology/edits/oeo-physical.omn Outdated Show resolved Hide resolved
src/ontology/edits/oeo-physical.omn Outdated Show resolved Hide resolved
src/ontology/edits/oeo-physical.omn Outdated Show resolved Hide resolved
src/ontology/edits/oeo-physical.omn Outdated Show resolved Hide resolved
src/ontology/edits/oeo-physical.omn Outdated Show resolved Hide resolved
@stap-m
Copy link
Contributor

stap-m commented Mar 25, 2020

Please also add term trackers :)

@akleinau
Copy link
Contributor Author

akleinau commented Mar 26, 2020 •
edited
Loading

Please also add term trackers :)

I have term trackers on Heater, Generator, EnergyConvertingDevice, PowerGeneratingUnit and Powerplant

@akleinau
rename WindEnergyConverter and Solarpark
e2de87f 
- WindEnergyConverter to WindEnergyConvertingUnit
- SolarPark to FieldPhotovolaicPowerplant
@akleinau
Copy link
Contributor Author

@stap-m do you have any more comments or can your approve?

@akleinau
Copy link
Contributor Author

@l-emele any more comments?

@akleinau
Copy link
Contributor Author

I'll merge this to have it implemented for the 5. Ontohack, further changes can be made in #292

@akleinau akleinau merged commit d36ecd2 into dev Mar 31, 2020
@akleinau akleinau deleted the feature/Generator-#173 branch March 31, 2020 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@l-emele l-emele l-emele left review comments

@stap-m stap-m stap-m approved these changes

Assignees
No one assigned
Labels
[A] new term Including new term(s) in the ontology [B] restructure Restructuring existing parts of the ontology [C] definition update Update an ontology definition
Projects
None yet
Milestone
No milestone
3 participants
@akleinau @l-emele @stap-m