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

refactor: remove unused AccelerationWeighting #1454

Merged
merged 2 commits into from
May 25, 2023

Conversation

sfendrich
Copy link
Contributor

@sfendrich sfendrich commented May 25, 2023

The class AccelerationWeighting is unfinished since 2017 and, therefore, removed as unused code.

Pull Request Checklist

  • 1. I have [rebased][rebase] the latest version of the master branch into my feature branch and all conflicts
    have been resolved.
  • 2. I have added information about the change/addition to functionality to the CHANGELOG.md file under the
    [Unreleased] heading.
  • 3. I have documented my code using JDocs tags.
  • 4. I have removed unnecessary commented out code, imports and System.out.println statements.
  • 5. I have written JUnit tests for any new methods/classes and ensured that they pass.
  • 6. I have created API tests for any new functionality exposed to the API.
  • 7. If changes/additions are made to the ors-config.json file, I have added these to the [ors config documentation][config]
    along with a short description of what it is for, and documented this in the Pull Request (below).
  • 8. I have built graphs with my code of the Heidelberg.osm.gz file and run the api-tests with all test passing
  • 9. I have referenced the Issue Number in the Pull Request (if the changes were from an issue).
  • 10. For new features or changes involving building of graphs, I have tested on a larger dataset
    (at least Germany), and the graphs build without problems (i.e. no out-of-memory errors).
  • 11. For new features or changes involving the graphbuilding process (i.e. changing encoders, updating the
    importer etc.), I have generated longer distance routes for the affected profiles with different options
    (avoid features, max weight etc.) and compared these with the routes of the same parameters and start/end
    points generated from the current live ORS.
    If there are differences then the reasoning for these MUST be documented in the pull request.
  • 12. I have written in the Pull Request information about the changes made including their intended usage
    and why the change was needed.
  • 13. For changes touching the API documentation, I have tested that the API playground [renders correctly][api].

@takb takb added this to To do in ors general May 25, 2023
@MichaelsJP MichaelsJP changed the title Fix: remove unused AccelerationWeighting fix: remove unused AccelerationWeighting May 25, 2023
@github-actions github-actions bot added the fix label May 25, 2023
@MichaelsJP MichaelsJP changed the title fix: remove unused AccelerationWeighting refactor: remove unused AccelerationWeighting May 25, 2023
@sfendrich
Copy link
Contributor Author

sfendrich commented May 25, 2023

This is not a refactoring because the fix changes the behavior of ORSWeightingFactory. Hence the rename from fix to refactor should be reverted.

@MichaelsJP
Copy link
Member

MichaelsJP commented May 25, 2023

@sfendrich What are your thoughts on waiting for refactorings like this after the modularization branch is merged?
I can imagine it will make merging quite difficult, and I guess your commit history will almost likely be overridden.

@takb @jlink Your thoughts on this?

@sfendrich
Copy link
Contributor Author

I'm fine with waiting. Just had a bit of time left and thought this would be a good opportunity for minor cleanup.

@jlink
Copy link
Contributor

jlink commented May 25, 2023

@sfendrich What are your thoughts on waiting for refactorings like this after the modularization branch is merged? I can imagine it will make merging quite difficult, and I guess your commit history will almost likely be overridden.

@takb @jlink Your thoughts on this?

My impression, when we discussed it last week, was that there will be a 7.x release very soon so that the modularization PR can be merged right after that. Any new change will potentially create a merge conflict because EVERY JAVA FILE (and most other files) are in a different place now and the pom(s) have also changed in subtle and not so subtle ways.

@takb
Copy link
Contributor

takb commented May 25, 2023

I don't think this needs to wait, the merge of the modularization branch will be non-trivial anyway

Copy link
Contributor

@takb takb left a comment

Choose a reason for hiding this comment

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

Yes!

@takb takb moved this from To do to Review in ors general May 25, 2023
Sascha Fendrich added 2 commits May 25, 2023 17:31
The class AccelerationWeighting is unfinished since 2017 and, therefore,
removed as unused code.
@MichaelsJP MichaelsJP force-pushed the fix/remove-unused-AccelerationWeighting branch from 6d1c3b0 to b8ae196 Compare May 25, 2023 15:31
@MichaelsJP MichaelsJP enabled auto-merge (squash) May 25, 2023 15:32
@MichaelsJP MichaelsJP merged commit 83ebc56 into master May 25, 2023
16 checks passed
ors general automation moved this from Review to Awaiting release May 25, 2023
@MichaelsJP MichaelsJP deleted the fix/remove-unused-AccelerationWeighting branch May 25, 2023 15:40
@jlink
Copy link
Contributor

jlink commented May 25, 2023

I don't think this needs to wait, the merge of the modularization branch will be non-trivial anyway

IMO. Not an argument for making it worse and worse.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
ors general
  
Awaiting release
Development

Successfully merging this pull request may close these issues.

None yet

4 participants