Feature/nav 17 simple algorithm implementation #15

munterfi · 2024-05-19T10:04:33Z

Not ready to merge:

Needs fix of footpath only test case of raptor.

org.opentest4j.AssertionFailedError: 
Expected :1
Actual   :0
<Click to see difference>


	at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151)
	at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132)
	at org.junit.jupiter.api.AssertEquals.failNotEqual(AssertEquals.java:197)
	at org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:150)
	at org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:145)
	at org.junit.jupiter.api.Assertions.assertEquals(Assertions.java:531)
	at ch.naviqore.raptor.model.RaptorTest$EarliestArrival.shouldFindConnectionBetweenOnlyFootpath(RaptorTest.java:128)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1596)

Needs fix of benchmark:

Exception in thread "main" java.lang.NullPointerException: Cannot read field "stopIdx" because "arrival.previous" is null
	at ch.naviqore.raptor.model.Raptor.reconstructParetoOptimalSolutions(Raptor.java:243)
	at ch.naviqore.raptor.model.Raptor.routeEarliestArrival(Raptor.java:58)
	at ch.naviqore.Benchmark.processRequests(Benchmark.java:98)
	at ch.naviqore.Benchmark.main(Benchmark.java:53)

# Conflicts: # src/test/java/ch/naviqore/Benchmark.java

…acefully.

…ections without duplicates.

…s greater than best arrival time.

…or all stops or target stop.

…tor build for testing.

- Connection and Leg implement comparable, change to sorting based on this class property. Connections are sorted according to the earliest arrival time. Legs are sorted according to departure time. - Change access of Raptor.Leg and Raptor.ArrivalType to private since they are not needed from outside the class. - Refactor the connections class, make it initializable and immutable. Hide building methods outside the package.

- Introduce raptor test builder with test extension for parameter injection. - Refactor input validation in raptor and add test cases.

- Introduce generic value object cache in the utils package. - Memory usage stays the same. Closes: #9

…-cache ENH: NAV-43 - Generic value object cache

- Add trip validator wit test cases. - Add validation in stop time construction. - Place todo in raptor builder.

…footpath.

…ound (entering to earlier trip not possible in same round)

…r builder - Raptor builder validates trips and stop times. The order of adding trips and stop times does not matter anymore. - Adjusted GtfsToRaptorConverter to new Raptor builder.

…le-algorithm-implementation' into feature/NAV-42-input-validation-raptor-builder-trip-id

- Some cosmetics: Remove sys.out.print call and correct log config file path in benchmark javadoc.

…ucture

munterfi · 2024-05-22T19:28:19Z

@clukas1 @Brunner246

Wait for #18 and a fix of the benchmark. Then we should merge and tag our first algorithm version 🚀

…e found.

…or looking for next trip departures.

…on' into feature/NAV-42-input-validation-raptor-builder-trip-id

- Only request valid stop ids from raptor. - Write more information to the results. - Add converters to ServiceDayTime.

- Check for invalid minute (0,60) and seconds (0, 60) in service day time constructor. Update tests. - Rename non-existent trips in route builder test.

…raptor-builder-trip-id Feature/nav 42 input validation raptor builder trip

clukas1 · 2024-05-23T14:24:49Z

Would say this branch is ready for a final review @munterfi, @Brunner246

Open Tasks for new Issues:

Refactoring Core Algorithm in smaller methods
Add more test cases (circular, self intersecting routes, overlapping routes)
Figure out why so many connections not possible in Switzerland GTFS Benchmark (maybe missing footpath transfers?)
Add feature to reverse direction of Raptor (Start from Arrival Time at target and go backwards to best departure time at source stop)
Add feature to define minimum transfertime by user and use maximum value of requested minimum transfertime and same station transfer)
Multi Constraint Raptor (McRaptor)
Range Raptor (rRaptor)

munterfi · 2024-05-23T14:31:19Z

Perfect, thanks.

from my side the PR is ready. Should we tag after merge with v1.0.0 to mark this initial walking skeleton of the algoritm?

Brunner246 · 2024-05-23T15:00:27Z

@clukas1 i will review it tonight or early tomorrow tomorrow morning.
Thanks both of you (@munterfi) for your incredible effort!!

Brunner246

@munterfi @clukas1
I have left two minor suggestions for modifications. If you think this is unnecessary, please ingore it and merge.

src/main/java/ch/naviqore/gtfs/schedule/type/ServiceDayTime.java

munterfi and others added 30 commits April 29, 2024 21:21

Format

6e9d5c4

Merge branch 'main' into feature/NAV-17-simple-algorithm-implementation

9b2f37e

# Conflicts: # src/test/java/ch/naviqore/Benchmark.java

ENH: NAV-17 - First raptor implementation

ae186ad

ENH: NAV-17 - Reconstruction of pareto optimal solutions

85317b6

FIX: NAV-17 - Fix reconstruct connections.

193e7e3

FIX: NAV-17 - Fix number per trips per route and handle end of day gr…

d0632d0

…acefully.

FIX: NAV-17 - Return empty list when invalid stops requested.

d3a1dad

ENH: NAV-17 - Adapt benchmark

8beefb4

ENH: NAV-17 - Make routeEarliestArrival return only paretoOptimalConn…

dcfd0de

…ections without duplicates.

ENH: NAV-17 - Add flag to make algorithm quit if improved time mark i…

193ed7a

…s greater than best arrival time.

ENH: NAV-17 - Don't check for trips to enter on last stop of route.

331fd7d

ENH: NAV-17 - Seperate methods to allow getting earliestConnections f…

82e2177

…or all stops or target stop.

ENH: NAV-17 - Implement footpaths in RAPTOR.

e5fde89

ENH: NAV-17 - Add departure/arrival times to connection leg records.

6e1ec84

TEST: NAV-17 - Refactor test utilities to add more versatility to rap…

ba1f0cf

…tor build for testing.

ENH: NAV-17 - Add connection class.

3f48079

TEST: NAV-17 - Add first Raptor test with asserts.

acc0941

TEST: NAV-17 - Add some more raptor tests.

46d12e5

TEST: NAV-17 - Add raptor test extension

dff4cb4

- Introduce raptor test builder with test extension for parameter injection. - Refactor input validation in raptor and add test cases.

FIX: NAV-17 - Ignore missing stops in benchmark

35539f1

ENH: NAV-43 - Generic value object cache

0529582

- Introduce generic value object cache in the utils package. - Memory usage stays the same. Closes: #9

Merge pull request #16 from naviqore/feature/NAV-43-introduce-generic…

f7feef2

…-cache ENH: NAV-43 - Generic value object cache

ENH: NAV-42 - Trip validation

7fe10c3

- Add trip validator wit test cases. - Add validation in stop time construction. - Place todo in raptor builder.

FIX: NAV-17 - Fix case where targetStop can be reached in round 0 by …

a6e7adf

…footpath.

FIX: NAV-17 - Fix case where stop arrival time was improved in same r…

a4f2266

…ound (entering to earlier trip not possible in same round)

ENH: NAV-42 - Use route builder to validate consistent trips in rapto…

4c53f55

…r builder - Raptor builder validates trips and stop times. The order of adding trips and stop times does not matter anymore. - Adjusted GtfsToRaptorConverter to new Raptor builder.

Merge remote-tracking branch 'refs/remotes/origin/feature/NAV-17-simp…

616c0a8

…le-algorithm-implementation' into feature/NAV-42-input-validation-raptor-builder-trip-id

ENH: NAV-42 - Make raptor internal classes package-private

d59277e

- Some cosmetics: Remove sys.out.print call and correct log config file path in benchmark javadoc.

TEST: NAV-42 - Move GTFS integration test data to correct package str…

100a78b

…ucture

DOC: NAV-42 - Informative javadoc of raptor builder

12114ef

clukas1 and others added 8 commits May 23, 2024 00:00

FIX: NAV-17 - Make sure that trip is not entered if no valid trips ar…

000a21f

…e found.

FIX: NAV-17 - Make sure that only last round arrival times are used f…

20dfb65

…or looking for next trip departures.

FIX: NAV-17 - Do not write null results to csv in benchmark.

936037f

Merge branch 'refs/heads/feature/NAV-17-simple-algorithm-implementati…

63eea82

…on' into feature/NAV-42-input-validation-raptor-builder-trip-id

DOC: TEST-42 - Enhance benchmark runs

285ddc2

- Only request valid stop ids from raptor. - Write more information to the results. - Add converters to ServiceDayTime.

TEST: TEST-42 - Remove the now superfluous null check in benchmark

46e22e3

ENH: NAV-42 - Service day time input validation, route builder tests

ee9f55c

- Check for invalid minute (0,60) and seconds (0, 60) in service day time constructor. Update tests. - Rename non-existent trips in route builder test.

Merge pull request #18 from naviqore/feature/NAV-42-input-validation-…

4548eab

…raptor-builder-trip-id Feature/nav 42 input validation raptor builder trip

Brunner246 requested changes May 23, 2024

View reviewed changes

src/main/java/ch/naviqore/gtfs/schedule/type/ServiceDayTime.java Show resolved Hide resolved

src/main/java/ch/naviqore/gtfs/schedule/type/ServiceDayTime.java Outdated Show resolved Hide resolved

REFACTOR: NAV-17 - Replace numbers in code with constants.

a793177

clukas1 approved these changes May 23, 2024

View reviewed changes

clukas1 merged commit c60524e into main May 23, 2024
1 check passed

clukas1 deleted the feature/NAV-17-simple-algorithm-implementation branch May 23, 2024 18:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/nav 17 simple algorithm implementation #15

Feature/nav 17 simple algorithm implementation #15

munterfi commented May 19, 2024 •

edited

Loading

munterfi commented May 22, 2024

clukas1 commented May 23, 2024

munterfi commented May 23, 2024

Brunner246 commented May 23, 2024

Brunner246 left a comment

Feature/nav 17 simple algorithm implementation #15

Feature/nav 17 simple algorithm implementation #15

Conversation

munterfi commented May 19, 2024 • edited Loading

munterfi commented May 22, 2024

clukas1 commented May 23, 2024

munterfi commented May 23, 2024

Brunner246 commented May 23, 2024

Brunner246 left a comment

Choose a reason for hiding this comment

munterfi commented May 19, 2024 •

edited

Loading