-
Notifications
You must be signed in to change notification settings - Fork 475
refactor: Remove old network routing module #3655
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
base: main
Are you sure you want to change the base?
Conversation
… will now crash, errors will be fixed in the next commits)
…P: Some test will fail)
… into remove_old_NetworkRoutingModule
bfb50ac
to
2ba9dca
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for doing this! I think some code needs to be restored as we decided not to delete the NetworkRountingModule as a whole, but just set the default to accessEgressModeToLink.
matsim/src/main/java/org/matsim/core/router/NetworkRoutingInclAccessEgressModule.java
Outdated
Show resolved
Hide resolved
matsim/src/main/java/org/matsim/core/config/groups/RoutingConfigGroup.java
Show resolved
Hide resolved
matsim/src/main/java/org/matsim/core/router/NetworkRoutingInclAccessEgressModule.java
Outdated
Show resolved
Hide resolved
@@ -120,18 +120,17 @@ public RoutingModule get() { | |||
); | |||
|
|||
// see NetworkRoutingProvider for some notes | |||
if (!routingConfigGroup.getAccessEgressType().equals(RoutingConfigGroup.AccessEgressType.none)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since we still have the "none" option, we still need this distinction
} | ||
|
||
// pure inverted router | ||
// TODO: I have disabled this Link2Link Router and instead make it 100% use AccessEgress. Make sure, that this is okay #aleks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See comment above. I might discuss that in the next hackathon
matsim/src/test/java/org/matsim/modules/ScoreStatsModuleTest.java
Outdated
Show resolved
Hide resolved
contribs/noise/src/test/java/org/matsim/contrib/noise/NoiseIT.java
Outdated
Show resolved
Hide resolved
contribs/shared_mobility/src/test/java/org/matsim/contrib/shared_mobility/RunIT.java
Outdated
Show resolved
Hide resolved
contribs/informed-mode-choice/src/test/java/org/matsim/modechoice/ScenarioTest.java
Outdated
Show resolved
Hide resolved
matsim/src/main/java/org/matsim/core/config/consistency/VspConfigConsistencyCheckerImpl.java
Show resolved
Hide resolved
contribs/multimodal/src/main/java/org/matsim/contrib/multimodal/RunMultimodalExample.java
Outdated
Show resolved
Hide resolved
...s/multimodal/src/test/java/org/matsim/contrib/multimodal/pt/MultiModalPTCombinationTest.java
Outdated
Show resolved
Hide resolved
contribs/multimodal/src/test/java/org/matsim/contrib/multimodal/simengine/StuckAgentTest.java
Outdated
Show resolved
Hide resolved
.../multimodal/src/test/java/org/matsim/contrib/multimodal/MultiModalControlerListenerTest.java
Outdated
Show resolved
Hide resolved
contribs/roadpricing/src/test/java/org/matsim/contrib/roadpricing/ModuleTest.java
Outdated
Show resolved
Hide resolved
contribs/roadpricing/src/test/java/org/matsim/contrib/roadpricing/ModuleTest.java
Outdated
Show resolved
Hide resolved
contribs/roadpricing/src/test/java/org/matsim/contrib/roadpricing/ModuleTest.java
Outdated
Show resolved
Hide resolved
...s/roadpricing/src/test/java/org/matsim/contrib/roadpricing/TollTravelCostCalculatorTest.java
Outdated
Show resolved
Hide resolved
…ustomConvergenceCriterion
#3354 (still WIP)
The default RoutingModule has now been set to bet the "accessEgressType". The NetworkRoutingModule was not fully removed, since it caused to many problems. However all core tests and most contrib-tests have been adapted to work with the new AccessEgressRouter. Following tests are still running on the old NetworkRoutingModule:
Most of these tests come from the "ev"-contrib which is considered incompatible with the AccessEgressRouter.