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

Implements PASSENGER AT STOP TIME and TimetabledTime constraints #678

Merged
merged 8 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/functions/newModes/NewModes-CarPoolingExample.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1003,11 +1003,11 @@ This Shows sample Purchases
<DepartureTime>07:00:00</DepartureTime>
<OperatingDayRef version="any" ref="2020-08-10"/>
<datedPassingTimes>
<TargetPassingTime version="any" id="rydt:Cust777@trans001@ride1234">
<TargetPassingTime version="any" id="rydt:Cust777@trans001@ride1234@070000">
<PointInSingleJourneyPathRef version="any" ref="rydt:Cust777@trans001@ride1234" order="1"/>
<AimedDepartureTime>07:00:00</AimedDepartureTime>
</TargetPassingTime>
<TargetPassingTime version="any" id="rydt:Cust777@trans001@ride1234">
<TargetPassingTime version="any" id="rydt:Cust777@trans001@ride1234@091500">
<PointInSingleJourneyPathRef version="any" ref="rydt:Cust777@trans001@ride1234" order="2"/>
<AimedArrivalTime>09:15:00</AimedArrivalTime>
</TargetPassingTime>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1136,11 +1136,11 @@ This Shows sample Purchases
<DepartureTime>10:15:00</DepartureTime>
<OperatingDayRef versionRef="EXTERNAL" ref="opday_7656"/>
<datedPassingTimes>
<TargetPassingTime version="any" id="hjmt:anon@trans005@ride5163">
<TargetPassingTime version="any" id="hjmt:anon@trans005@ride5163@101500">
<PointInSingleJourneyPathRef version="any" ref="hmjt:anon@trans005@ride5163" order="1"/>
<AimedDepartureTime>10:15:00</AimedDepartureTime>
</TargetPassingTime>
<TargetPassingTime version="any" id="hjmt:anon@trans005@ride5163">
<TargetPassingTime version="any" id="hjmt:anon@trans005@ride5163@111000">
<PointInSingleJourneyPathRef version="any" ref="hmjt:anon@trans005@ride5163" order="2"/>
<AimedArrivalTime>11:10:00</AimedArrivalTime>
</TargetPassingTime>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -788,27 +788,27 @@ Two GROUP of SERVICEs groups two sets of journeys.
C 1 | 15:15 | 16:30 | C to B: 15mn
B 1 | 15:30 | 16:45 | B to A 15mn
A 2 | 15:45 | 17:00 | -->
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Alpha1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@01-Alpha1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@01"/>
<DepartureTime>14:30:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Bravo1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@02-Bravo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@02"/>
<DepartureTime>14:40:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Charley1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@03-Charley1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@03"/>
<DepartureTime>15:00:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Delta1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@04-Delta1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@04"/>
<DepartureTime>15:15:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Echo1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@05-Echo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@05"/>
<DepartureTime>15:30:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@Alpha2">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@01@06-Alpha2">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@06"/>
<ArrivalTime>15:45:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand Down Expand Up @@ -923,27 +923,27 @@ Two GROUP of SERVICEs groups two sets of journeys.
C 1 | 15:15 | 16:30 | C to B: 15mn
B 1 | 15:30 | 16:45 | B to A 15mn
A 2 | 15:45 | 17:00 | -->
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Alpha1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@01-Alpha1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@01"/>
<DepartureTime>15:45:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Bravo1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@02-Bravo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@02"/>
<DepartureTime>16:00:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Charley1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@03-Charley1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@03"/>
<DepartureTime>16:15:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Delta1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@04-Delta1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@04"/>
<DepartureTime>16:30:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Echo1">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@05-Echo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@05"/>
<DepartureTime>16:45:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@Alpha2">
<TimetabledPassingTime version="any" id="mybus:tpt_42c@A+E@02@06-Alpha2">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42c@A+E@06"/>
<ArrivalTime>17:00:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand Down Expand Up @@ -1058,27 +1058,27 @@ Two GROUP of SERVICEs groups two sets of journeys.
B 1 | 15:30 | 16:45 | A to E 15mn
E 2 | 15:45 | 17:00 |
-->
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Echo1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@01-Echo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@01"/>
<DepartureTime>14:30:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Delta1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@02-Delta1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@02"/>
<DepartureTime>14:45:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Charley1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@03-Charley1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@03"/>
<DepartureTime>15:00:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Bravo1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@04-Bravo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@04"/>
<DepartureTime>15:15:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Alpha2">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@05-Alpha2">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@05"/>
<DepartureTime>15:30:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@03@Echo1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@03@06-Echo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@06"/>
<ArrivalTime>15:45:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand Down Expand Up @@ -1194,27 +1194,27 @@ Two GROUP of SERVICEs groups two sets of journeys.
B 1 | 15:30 | 16:45 | A to E 15mn
E 2 | 15:45 | 17:00 |
-->
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Echo1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_01-Echo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@01"/>
<DepartureTime>15:45:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Delta1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_02=Delta1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@02"/>
<DepartureTime>16:00:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Charley1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_03-Charley1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@03"/>
<DepartureTime>16:15:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Bravo1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_04-Bravo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@04"/>
<DepartureTime>16:30:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Alpha2">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_05-Alpha2">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@05"/>
<DepartureTime>16:45:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any" id="mybus:tpt_42a@E+A@04_Echo1">
<TimetabledPassingTime version="any" id="hde:sj_42a@E+A@04_06-Echo1">
<StopPointInJourneyPatternRef version="any" ref="hde:spijp_42a@E+A@06"/>
<ArrivalTime>17:00:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -899,11 +899,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS
<TimeDemandTypeRef version="any" ref="kx:tdt_45_Day"/>
<BlockRef version="any" ref="ops:blk_L24_01"/>
<passingTimes>
<TimetabledPassingTime id="kx:tpt_dr_L24_01o_001">
<TimetabledPassingTime id="kx:tpt_dr_L24_01o_001" version="any">
<TimingPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_01o_001"/>
<DepartureTime>11:00:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime id="kx:tpt_dr_L24_01o_002">
<TimetabledPassingTime id="kx:tpt_dr_L24_01o_002" version="any">
<StopPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_01o_002"/>
<ArrivalTime>11:10:00.0Z</ArrivalTime>
<WaitingTime>PT5M</WaitingTime>
Expand Down Expand Up @@ -1074,11 +1074,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS
<TimeDemandTypeRef version="any" ref="kx:tdt_45_Day"/>
<BlockRef version="any" ref="ops:blk_L24_01"/>
<passingTimes>
<TimetabledPassingTime id="kx:tpt_dr_L24_03o_001">
<TimetabledPassingTime id="kx:tpt_dr_L24_03o_001" version="any">
<StopPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_02o_001"/>
<DepartureTime>12:50:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime id="kx:tpt_dr_L24_03o_002">
<TimetabledPassingTime id="kx:tpt_dr_L24_03o_002" version="any">
<TimingPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_02o_002"/>
<ArrivalTime>12:55:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand All @@ -1103,11 +1103,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS
<TimeDemandTypeRef version="any" ref="kx:tdt_45_Day"/>
<BlockRef version="any" ref="ops:blk_L24_02"/>
<passingTimes>
<TimetabledPassingTime id="kx:tpt_dr_L24_04i_001">
<TimetabledPassingTime id="kx:tpt_dr_L24_04i_001" version="any">
<TimingPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_03i_001"/>
<DepartureTime>13:00:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime id="kx:tpt_dr_L24_04i_002">
<TimetabledPassingTime id="kx:tpt_dr_L24_04i_002" version="any">
<StopPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_03i_002"/>
<ArrivalTime>13:05:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand Down Expand Up @@ -1324,11 +1324,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS
<TimeDemandTypeRef version="any" ref="kx:tdt_45_Day"/>
<BlockRef version="any" ref="ops:blk_L24_02"/>
<passingTimes>
<TimetabledPassingTime id="kx:tpt_dr_L24_07o_001">
<TimetabledPassingTime id="kx:tpt_dr_L24_07o_001" version="any">
<StopPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_02o_001"/>
<DepartureTime>16:25:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime id="kx:tpt_dr_L24_07o_002">
<TimetabledPassingTime id="kx:tpt_dr_L24_07o_002" version="any">
<TimingPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_02o_002"/>
<ArrivalTime>16:30:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand All @@ -1353,11 +1353,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS
<TimeDemandTypeRef version="any" ref="kx:tdt_45_Day"/>
<BlockRef version="any" ref="ops:blk_L24_03"/>
<passingTimes>
<TimetabledPassingTime id="kx:tpt_dr_L24_08i_001">
<TimetabledPassingTime id="kx:tpt_dr_L24_08i_001" version="any">
<TimingPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_03i_001"/>
<DepartureTime>16:50:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime id="kx:tpt_dr_L24_08i_002">
<TimetabledPassingTime id="kx:tpt_dr_L24_08i_002" version="any">
<StopPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_03i_002"/>
<ArrivalTime>16:55:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand Down Expand Up @@ -1528,11 +1528,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS
<TimeDemandTypeRef version="any" ref="kx:tdt_45_Day"/>
<BlockRef version="any" ref="ops:blk_L24_03"/>
<passingTimes>
<TimetabledPassingTime id="kx:tpt_dr_L24_10i_001">
<TimetabledPassingTime id="kx:tpt_dr_L24_10i_001" version="any">
<StopPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_04i_001"/>
<DepartureTime>16:35:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime id="kx:tpt_dr_L24_10i_002">
<TimetabledPassingTime id="kx:tpt_dr_L24_10i_002" version="any">
<TimingPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_04i_002"/>
<ArrivalTime>16:45:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand All @@ -1557,11 +1557,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS
<TimeDemandTypeRef version="any" ref="kx:tdt_46_Night"/>
<BlockRef version="any" ref="ops:blk_L24N_04"/>
<passingTimes>
<TimetabledPassingTime id="kx:tpt_dr_L24N_11o_001">
<TimetabledPassingTime id="kx:tpt_dr_L24N_11o_001" version="any">
<TimingPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_01o_001"/>
<DepartureTime>16:25:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime id="kx:tpt_dr_L24N_11o_002">
<TimetabledPassingTime id="kx:tpt_dr_L24N_11o_002" version="any">
<StopPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_01o_002"/>
<ArrivalTime>16:30:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand Down Expand Up @@ -1683,11 +1683,11 @@ There is one DUTY ops:Duty:dty_01 with TWO DUTY PARTS
<TimeDemandTypeRef version="any" ref="kx:tdt_46_Night"/>
<BlockRef version="any" ref="ops:blk_L24N_04"/>
<passingTimes>
<TimetabledPassingTime id="kx:tpt_dr_L24_10i_001">
<TimetabledPassingTime id="kx:tpt_dr_L24N_10i_001" version="any">
<StopPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_04i_001"/>
<DepartureTime>21:15:00.0Z</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime id="kx:tpt_dr_L24_10i_002">
<TimetabledPassingTime id="kx:tpt_dr_L24N_10i_002" version="any">
<TimingPointInJourneyPatternRef version="any" ref="kx:pijp_drjp_L24_04i_002"/>
<ArrivalTime>21:25:00.0Z</ArrivalTime>
</TimetabledPassingTime>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2389,16 +2389,16 @@
<TrainNumberRef ref="ch:1:TrainNumber:10:" version="any"/>
</trainNumbers>
<passingTimes>
<TimetabledPassingTime version="any">
<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:10:91YYY_.j21-1-0020101">
<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0020101:" version="any"/>
<DepartureTime>08:00:00</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any">
<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:10:91YYY_.j21-1-0020102">
<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0020102:" version="any"/>
<ArrivalTime>08:15:00</ArrivalTime>
<DepartureTime>08:15:00</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any">
<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:10:91YYY_.j21-1-0020103">
<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0020103:" version="any"/>
<ArrivalTime>08:30:00</ArrivalTime>
</TimetabledPassingTime>
Expand All @@ -2419,16 +2419,16 @@
<TrainNumberRef ref="ch:1:TrainNumber:20:" version="any"/>
</trainNumbers>
<passingTimes>
<TimetabledPassingTime version="any">
<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:91YYY-SBB-2-1-28800:TA:91YYY_.j21-1-0030101">
<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0030101:" version="any"/>
<DepartureTime>08:00:00</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any">
<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:91YYY-SBB-2-1-28800:TA:91YYY_.j21-1-0030102">
<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0030102:" version="any"/>
<ArrivalTime>08:15:00</ArrivalTime>
<DepartureTime>08:15:00</DepartureTime>
</TimetabledPassingTime>
<TimetabledPassingTime version="any">
<TimetabledPassingTime version="any" id="ch:1:TimetabledPassingTime:91YYY-SBB-2-1-28800:TA:91YYY_.j21-1-0030103">
<PointInJourneyPatternRef ref="ch:1:StopPointInJourneyPattern:91YYY_.j21-1-0030103:" version="any"/>
<ArrivalTime>08:30:00</ArrivalTime>
</TimetabledPassingTime>
Expand Down
Loading