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

feat(charging): provide the charging stations within a certain area #446

Merged
merged 20 commits into from
Feb 19, 2025
Merged

feat(charging): provide the charging stations within a certain area #446

merged 20 commits into from
Feb 19, 2025

Conversation

kschrab
Copy link
Contributor

@kschrab kschrab commented Dec 12, 2024 •
edited by schwepmo
Loading

Description

  • New method to provide a list of available charging stations within the vicinity of the vehicle (only for Electric Vehicles).

Issue(s) related to this PR

  • Resolves internal issue 950

Affected parts of the online documentation

Changes in the documentation required?

Definition of Done

Prerequisites

  • You have read CONTRIBUTING.md carefully.
  • You have signed the Contributor License Agreement.
  • Your GitHub user id is linked with your Eclipse Account.

Required

  • The title of this merge request follows the scheme type(scope): description (in the style of Conventional Commits)
  • You have assigned a suitable label to this pull request (e.g., enhancement, or bugfix)
  • origin/main has been merged into your Fork.
  • Coding guidelines have been followed (see CONTRIBUTING.md).
  • All checks on GitHub pass.
  • All tests on Jenkins pass.

Requested (can be enforced by maintainers)

  • New functionality is covered by unit tests or integration tests. Code coverage must not decrease.
  • If a bug has been fixed, a new unit test has been written (beforehand) to prove misbehavior
  • There are no new SpotBugs warnings.

Special notes to reviewer

kschrab
kschrab commented Jan 21, 2025
View reviewed changes
...n/java/org/eclipse/mosaic/fed/application/ambassador/util/EventNicenessPriorityRegister.java Outdated Show resolved Hide resolved
...ic-objects/src/main/java/org/eclipse/mosaic/lib/objects/electricity/ChargingStationData.java Outdated Show resolved Hide resolved
.../main/java/org/eclipse/mosaic/fed/application/app/api/os/ElectricVehicleOperatingSystem.java Outdated Show resolved Hide resolved
...pse/mosaic/fed/application/ambassador/simulation/electric/objects/ChargingStationObject.java Outdated Show resolved Hide resolved
...pse/mosaic/fed/application/ambassador/simulation/electric/objects/ChargingStationObject.java Show resolved Hide resolved
...pse/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationTree.java Outdated Show resolved Hide resolved
@kschrab kschrab added the enhancement New feature or request label Jan 21, 2025
@kschrab kschrab marked this pull request as ready for review January 21, 2025 12:58
@iwillitried
Merge branch 'main' into 950-Provide-Charging-Stations-around-a-GeoPoint
83137fa
@iwillitried
- Removed the file: ChargingStationTree.java
a0cf89b 
- Merged contents of ChargingStationTree into ChargingStationIndex
- ChargingStationIndex is not abstract anymore
- small changes regarding function naming and removal of empty lines
kschrab
kschrab commented Feb 3, 2025
View reviewed changes
Copy link
Contributor Author

@kschrab kschrab left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor changes required. Also, please check if all unit tests are green, currently, ApplicationAmbassadorTest.processInteraction_ChargingStationRegistration fails

...se/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationIndex.java Outdated Show resolved Hide resolved
...se/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationIndex.java Outdated Show resolved Hide resolved
...se/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationIndex.java Outdated Show resolved Hide resolved
.../main/java/org/eclipse/mosaic/fed/application/ambassador/simulation/ElectricVehicleUnit.java Outdated Show resolved Hide resolved
...pplication/src/main/java/org/eclipse/mosaic/fed/application/ambassador/SimulationKernel.java Show resolved Hide resolved
schwepmo
schwepmo requested changes Feb 10, 2025
View reviewed changes
.gitignore Outdated Show resolved Hide resolved
...ation/src/main/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassador.java Outdated Show resolved Hide resolved
...ation/src/main/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassador.java Outdated Show resolved Hide resolved
...ation/src/main/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassador.java Outdated Show resolved Hide resolved
...ation/src/main/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassador.java Outdated Show resolved Hide resolved
.../main/java/org/eclipse/mosaic/fed/application/ambassador/simulation/ElectricVehicleUnit.java Show resolved Hide resolved
...pse/mosaic/fed/application/ambassador/simulation/electric/objects/ChargingStationObject.java Show resolved Hide resolved
...se/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationIndex.java Outdated Show resolved Hide resolved
.../main/java/org/eclipse/mosaic/fed/application/app/api/os/ElectricVehicleOperatingSystem.java Show resolved Hide resolved
@iwillitried
- implement lazy updates in ChargingStationIndex.java, tree is re-con…
d64cf82 
…struced when the tree is queried IF a CS was added

- implement KdTree.size() (returned constant 0)
- udpated Unitest to insert, update and query three CSs
@schwepmo
Copy link
Contributor

I've resolved all threads regarding the ChargingStationObject except #446 (comment), in case @hoelger wants to add something.

Please look into the remaining open threads and also fix the spotbugs and checkstyle warnings (https://ci.eclipse.org/mosaic/job/mosaic/job/PR-446/).

Afterwards, we can go on and finalize this PR

hoelger
hoelger suggested changes Feb 17, 2025
View reviewed changes
...se/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationIndex.java Outdated Show resolved Hide resolved
...se/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationIndex.java Outdated Show resolved Hide resolved
...n/src/test/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassadorTest.java Outdated Show resolved Hide resolved
...n/src/test/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassadorTest.java Outdated Show resolved Hide resolved
.../eclipse/mosaic/fed/application/ambassador/simulation/electric/ChargingStationIndexTest.java Show resolved Hide resolved
.../eclipse/mosaic/fed/application/ambassador/simulation/electric/ChargingStationIndexTest.java Show resolved Hide resolved
...n/src/test/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassadorTest.java Outdated Show resolved Hide resolved
...se/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationIndex.java Outdated Show resolved Hide resolved
schwepmo
schwepmo requested changes Feb 17, 2025
View reviewed changes
Copy link
Contributor

@schwepmo schwepmo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is some final cleanup todo

...n/src/test/java/org/eclipse/mosaic/fed/application/ambassador/ApplicationAmbassadorTest.java Outdated Show resolved Hide resolved
...ation/src/test/java/org/eclipse/mosaic/fed/application/ambassador/InteractionTestHelper.java Outdated Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
...se/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationIndex.java Outdated Show resolved Hide resolved
...se/mosaic/fed/application/ambassador/simulation/electric/providers/ChargingStationIndex.java Outdated Show resolved Hide resolved
.../eclipse/mosaic/fed/application/ambassador/simulation/electric/ChargingStationIndexTest.java Outdated Show resolved Hide resolved
.../eclipse/mosaic/fed/application/ambassador/simulation/electric/ChargingStationIndexTest.java Outdated Show resolved Hide resolved
schwepmo
schwepmo requested changes Feb 18, 2025
View reviewed changes
.tileCache/grid/tiles.index Outdated Show resolved Hide resolved
@schwepmo schwepmo merged commit b1840be into eclipse:main Feb 19, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iwillitried iwillitried iwillitried left review comments

@hoelger hoelger hoelger requested changes

@schwepmo schwepmo schwepmo approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kschrab @schwepmo @hoelger @iwillitried