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

Drt implementation #10

Merged
merged 39 commits into from
Oct 10, 2024
Merged

Drt implementation #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3530b69
Add necessary setup for
luchengqi7 Aug 5, 2024
7acdaa5
upgrade matsim version
luchengqi7 Aug 9, 2024
f0c0d20
try to make first test run
simei94 Aug 29, 2024
dac0136
Add necessary setup for
luchengqi7 Aug 5, 2024
b2e1d90
upgrade matsim version
luchengqi7 Aug 9, 2024
78cbd40
try to make first test run
simei94 Aug 29, 2024
1fbd817
Merge remote-tracking branch 'origin/drt-implementation' into drt-imp…
simei94 Aug 29, 2024
c47677e
add some todos
simei94 Aug 29, 2024
700e9de
towards proper testing
simei94 Sep 2, 2024
7e56092
simplify test setups
simei94 Sep 2, 2024
414e5a3
no drt in smc (for now)
simei94 Sep 2, 2024
e894ee8
re-arrange drt configs
simei94 Sep 3, 2024
ff66b9a
complete drt test
simei94 Sep 3, 2024
cf7467b
merge latest master branch
luchengqi7 Sep 18, 2024
e26c8b1
Add intermodal stuff
luchengqi7 Sep 18, 2024
617d47d
Update DrtOptions.java
luchengqi7 Sep 18, 2024
076f028
Create PrepareIntermodalTestingPlans.java
luchengqi7 Sep 19, 2024
51d36f7
Update intermodal setup
luchengqi7 Sep 19, 2024
c4f1631
re-structure
simei94 Sep 19, 2024
c9a9e35
class to create manual drt agents WIP
simei94 Sep 19, 2024
fadbfa6
Merge branch 'main' into drt-implementation
simei94 Sep 23, 2024
db82714
re-structuring
simei94 Sep 23, 2024
00d0521
max drt walk distance 1km
simei94 Sep 23, 2024
7288adc
add TODOs
simei94 Sep 23, 2024
8c6f4ff
add intermodal area incl spremberg
simei94 Oct 1, 2024
512777d
make drt test runnable
simei94 Oct 2, 2024
cfe5e07
further improvement
simei94 Oct 2, 2024
0c01bd4
analyze waiting event and link leave event
simei94 Oct 2, 2024
e4864c9
Merge branch 'main' into drt-implementation
simei94 Oct 8, 2024
a2c61a7
re-structure
simei94 Oct 8, 2024
f37c47a
add getters, add method to check and adapt service area shp file
simei94 Oct 8, 2024
ead05fb
add test + feinschliff
simei94 Oct 8, 2024
d7baf7e
use drt area getter in all places
simei94 Oct 9, 2024
4a7be7e
make first test work
simei94 Oct 9, 2024
44f1472
only search for act link if no coord available
simei94 Oct 10, 2024
a7bd495
Merge branch 'main' into drt-implementation
simei94 Oct 10, 2024
42b5e2d
disable test
simei94 Oct 10, 2024
7723460
put new drt inputs to correct version dir
simei94 Oct 10, 2024
589925f
checkstyle
simei94 Oct 10, 2024
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
1 change: 1 addition & 0 deletions input/v2024.2/drt-area/nord-bautzen-waiting-times_utm32N.cpg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UTF-8
Binary file added input/v2024.2/drt-area/nord-bautzen-waiting-times_utm32N.dbf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions input/v2024.2/drt-area/nord-bautzen-waiting-times_utm32N.prj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PROJCS["ETRS_1989_UTM_Zone_32N",GEOGCS["GCS_ETRS_1989",DATUM["D_ETRS_1989",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",9.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
43 changes: 43 additions & 0 deletions input/v2024.2/drt-area/nord-bautzen-waiting-times_utm32N.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<!DOCTYPE qgis PUBLIC 'http://mrcc.com/qgis.dtd' 'SYSTEM'>
<qgis version="3.26.3-Buenos Aires">
<identifier></identifier>
<parentidentifier></parentidentifier>
<language></language>
<type>dataset</type>
<title></title>
<abstract></abstract>
<contact>
<name></name>
<organization></organization>
<position></position>
<voice></voice>
<fax></fax>
<email></email>
<role></role>
</contact>
<links/>
<fees></fees>
<encoding></encoding>
<crs>
<spatialrefsys nativeFormat="Wkt">
<wkt></wkt>
<proj4></proj4>
<srsid>0</srsid>
<srid>0</srid>
<authid></authid>
<description></description>
<projectionacronym></projectionacronym>
<ellipsoidacronym></ellipsoidacronym>
<geographicflag>false</geographicflag>
</spatialrefsys>
</crs>
<extent>
<spatial maxz="0" minx="0" miny="0" dimensions="2" minz="0" crs="" maxy="0" maxx="0"/>
<temporal>
<period>
<start></start>
<end></end>
</period>
</temporal>
</extent>
</qgis>
Binary file added input/v2024.2/drt-area/nord-bautzen-waiting-times_utm32N.shp
View file
Open in desktop
Binary file not shown.
Binary file added input/v2024.2/drt-area/nord-bautzen-waiting-times_utm32N.shx
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland-spremberg.cpg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UTF-8
Binary file added input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland-spremberg.dbf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland-spremberg.prj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PROJCS["ETRS_1989_UTM_Zone_32N",GEOGCS["GCS_ETRS_1989",DATUM["D_ETRS_1989",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",9.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
Binary file added input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland-spremberg.shp
View file
Open in desktop
Binary file not shown.
Binary file added input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland-spremberg.shx
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland.cpg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
UTF-8
Binary file added input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland.dbf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland.prj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
PROJCS["ETRS_1989_UTM_Zone_32N",GEOGCS["GCS_ETRS_1989",DATUM["D_ETRS_1989",SPHEROID["GRS_1980",6378137.0,298.257222101]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Transverse_Mercator"],PARAMETER["False_Easting",500000.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",9.0],PARAMETER["Scale_Factor",0.9996],PARAMETER["Latitude_Of_Origin",0.0],UNIT["Meter",1.0]]
Binary file added input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland.shp
View file
Open in desktop
Binary file not shown.
Binary file added input/v2024.2/intermodal-area/pt-intermodal-areas-ruhland.shx
View file
Open in desktop
Binary file not shown.
Binary file added input/v2024.2/lausitz-pt-case-test_plans_1person.xml.gz
View file
Open in desktop
Binary file not shown.
29 changes: 29 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,35 @@
<version>${matsim.version}</version>
</dependency>

<dependency>
<groupId>com.github.matsim-vsp</groupId>
<artifactId>pt-extensions</artifactId>
<version>ceef00ef6e</version>
<exclusions>
<!-- Will pull old drt version -->
<exclusion>
<groupId>org.matsim.contrib</groupId>
<artifactId>drt</artifactId>
</exclusion>
<exclusion>
<groupId>org.matsim</groupId>
<artifactId>matsim</artifactId>
</exclusion>
<exclusion>
<groupId>org.matsim</groupId>
<artifactId>matsim-examples</artifactId>
</exclusion>
<exclusion>
<groupId>org.matsim.contrib</groupId>
<artifactId>vsp</artifactId>
</exclusion>
<exclusion>
<groupId>org.openjfx</groupId>
<artifactId>javafx-graphics</artifactId>
</exclusion>
</exclusions>
</dependency>


<!-- Custom dependencies -->
<dependency>
Expand Down
Loading
Loading