Skip to content

Commit

Permalink
changes from lorenz branch (#2)
Browse files Browse the repository at this point in the history
* added 27 park-and-ride stations

* implemented basic parkAndRideEventHandler

* moving and simplifying PR station analysis

* added first score comparison in R + downsized population for debugging

* developed first PRActivityEventHandler with Timestamps + moved PR Station Files to own folder

* updated ScoresFromPlans2CSV + scoreComparison RScript

* scmall code improvements

* updated spatialTripsAnalysis.R

* updated ScoresFromPlans2CSV -> changed getMainMode to getLongestDistanceMode

* added InputActivityEventAnalysis + some minor changes in old R Scripts

* turned off timeMutation in Config, added scoreComparison_V2.R and TripsComparison_V2.R, minor changes in ScoresFromPlans2CSV

* updating TripsComparison_V2.R

* updated scoreComparison_V2.R, TripsComparison_V2.R +
some changes in PRActivityEventHandler & ScoresFromPlans2CSV

* minor changes in R Scripts

* some updates in R before ZWP Presentation

* merged new feat: MassConservation, DRTStopsWriter&File, ExtraPTPlan with existing lorenz branch, base for new runs

* fixed DrtStopsWriter

* pulled new shp-file from main

* automated R Scripts (part 1)

* automated R Scripts (part 2)

* edited modalShiftSankeys

* automated postprocessing in Java

* automated postprocessing - minor changes

* binding postprocessing to simulation

* minor changes

* economic analyses - initial commit

* economic analyses - some changes, now sample analyses run properly

* adding TrafficVolumeEventHandler

* adding AirPollutionEventHandler

* economic analyses - adding the analysis of differences between policy and case in R

* used DRTStopsFile

* minor changes (including adding DRTStops in analyses)

* renamed noise&accidents analysis

* added mileage to TrafficVolumeEventHandler

* new emissionAnalysis - initial commit

* deleted useless files + renamed RScripts

* prepared policyTripsPreparation.R for HPC cluster usage

* updated RScripts scoreComparison.R + tripsComparison.R

* binding all postprocessing analyses to the end of the simulation & preparing all postprocessing analyses for it (except for comparisons & economics)

* implemented a version where it´s possible to create two plans using both PR Station Choices

* translated graphs in RScripts to german

* added RScript for one runOverviewTable (+ minor changes in other RScripts)

* Semi-automated postprocessing for scores and trips in Java

* deleted buggy self-coded PostprocessingListener.java

* resolved small bugs

* Added scripts to prepare data for PR Stations further outside

* initial commit - added logic for choosing both PRStationChoice strategies & creating an extra plan for PR Stations further outside

* minor commit for bug fixing

* added carsInPRStationPerMinute

* minor commit for bug fixing

* debugging PrActivityEventHandler

* fixed bugs & tested PrActivityEventHandler

* write PR activity ends to file

* merged main into lorenz

* merged main & upstream lorenz into lorenz

* minor changes in RScripts

* initial commit for tests -> BerlinNoInnerCarTripsScenarioTest

* make IT class public

* plot visualization: changing font sizes etc

* added tests for BerlinNoInnerCarTripsScenarioTest + added PrActivityEventHandlerTest

* added another config

* updated changes from main in lorenz-method

* fixing commit

* fixing commit

* fix: fixing commit

* fix: fixing commit

* feat: do not run simulation for test (WIP)

* testbanCarAndRideFromNetworkArea

* changed ReplaceCarByDRTTest from events- to plan-based

* reduced PrActivityEventHandlerTest size

* fix: quick fix, forgot to delete a faulty line

* added tests for bothPRStationChoices & extraPrStationPlan

* cleaned up changes from main in lorenz-branch

* fix: config 1pct, numberOfThreads

* expanded TrafficVolumeEventHandler

* expanded postprocessing R Scripts

* ignore: minor changes to several files

* clean up: removed enforceMassConservation toggle, assuming massConservation = true

* clean up: removed extraPtPlan toggle, assuming extraPtPlan = true

* clean up: removed drtStopBased toggle, assuming drtStopBased = true

* clean up: removed kPrStations toggle, assuming kPrStations = 3

* clean up: removed prStationsOutside toggle, assuming prStationsOutside are not used

* clean up: removed extraPrStationChoice toggle, assuming both prStationChoice strategies are used

* clean up: deleting unused code fragments

* clean up: fixed BerlinRunOnlineAccidents after cleaning up

* postprocessing automation: bundled up all analysis scripts in RunPostprocessingAfterSim

* postprocessing automation: cleaned RScripts & added arguments

* clean up: fixed tests for ReplaceCarByDRT to new cleaned up code

* clean up: commenting previously uncommented methods & scripts

* Score Prep: adding coordinates of home activity

* Simwrapper: initial commit for simwrapper dashboard

* R: Experimental RScripts for score & modal shift

* start reorganizing package structure

* restructure PRStationChoice

* bug fixing + fixing test setup + some API changes + javadoc

---------

Co-authored-by: ln0455686 <[email protected]>
  • Loading branch information
tschlenther and ln0455686 authored Feb 20, 2024
1 parent f171755 commit bd6ae7d
Show file tree
Hide file tree
Showing 56 changed files with 35,282 additions and 34,614 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<!DOCTYPE config SYSTEM "http://www.matsim.org/files/dtd/config_v2.dtd">
<config>
<module name="TimeAllocationMutator" >
<param name="mutationAffectsDuration" value="false" />
<param name="mutationRange" value="7200.0" />
</module>
<module name="controler" >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<module name="global" >
<param name="coordinateSystem" value="EPSG:31468" />
<param name="insistingOnDeprecatedConfigVersion" value="false" />
<param name="numberOfThreads" value="8" />
<!-- <param name="numberOfThreads" value="8" />-->
</module>
<module name="berlinExperimental" >
<param name="populationDownsampleFactor" value="1.0" />
Expand Down Expand Up @@ -55,7 +55,7 @@
<param name="endTime" value="36:00:00" />
<param name="flowCapacityFactor" value="0.01" />
<param name="mainMode" value="car,freight" />
<param name="numberOfThreads" value="8" />
<!-- <param name="numberOfThreads" value="8" />-->
<param name="startTime" value="00:00:00" />
<param name="storageCapacityFactor" value="0.01" />
<param name="stuckTime" value="30.0" />
Expand Down Expand Up @@ -186,7 +186,7 @@
<!-- Mode which will be handled by PassengerEngine and VrpOptimizer (passengers'/customers' perspective) -->
<param name="mode" value="drt" />
<!-- Number of threads used for parallel evaluation of request insertion into existing schedules. Scales well up to 4, due to path data provision, the most computationally intensive part, using up to 4 threads. Default value is 'min(4, no. of cores available to JVM)' -->
<param name="numberOfThreads" value="8" />
<!-- <param name="numberOfThreads" value="8" />-->
<!-- Operational Scheme, either of door2door, stopbased or serviceAreaBased. door2door by default -->
<param name="operationalScheme" value="serviceAreaBased" />
<!-- If true, the max travel and wait times of a submitted request are considered hard constraints (the request gets rejected if one of the constraints is violated). If false, the max travel and wait times are considered soft constraints (insertion of a request that violates one of the constraints is allowed, but its cost is increased by additional penalty to make it relatively less attractive). Penalisation of insertions can be customised by injecting a customised InsertionCostCalculator.PenaltyCalculator -->
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name,x,y,linkId
Ostkreuz,4600000.480290992,5819700.802393827,85582
Suedkreuz,4592743.290166003,5816823.460886553,144360
Westkreuz/ZOB,4587018.550633609,5820077.051308585,59825
Gesundbrunnen,4594441.531831297,5824985.689612756,18796
Wedding,4592922.882076316,5824084.361963952,63685
Landsberger,4598961.639137452,5822763.996348945,147644
Neukoelln,4598122.504532557,5816022.913872137,131523
Heidelberger,4589140.6734212255,5817067.241862115,79212
Jungfernheide,4588114.078276766,5822702.604874686,66841
Schoenhauser,4596224.755560316,5824965.459438537,52866,
Prenzlauer,4597027.523012196,5824666.380226734,147541
Greifswalder,4597824.484647266,5824121.987334944,34115
Storkower,4599371.508500537,5822324.183550394,36983
Frankfurter,4600285.672450088,5821043.030039501,3501
Treptower,4599208.352993022,5818659.97753196,122012
Sonnenallee,4599099.079887119,5816525.18299938,120486
Hermann,4597334.219873768,5815855.3130829865,134367
Tempelhof,4594217.962937871,5816029.29720351,85286
Schoeneberg,4592120.82037306,5817106.7719565695,77116
Innsbrucker,4591307.485161504,5816975.928260568,23130
Bundesplatz,4590450.252520066,5816912.373348798,87243
Hohenzollerndamm,4588367.919164285,5817877.268670943,53378
Halensee,4587799.049568348,5818730.644081692,98925
Westkreuz,4587216.584412754,5819462.496298028,47623
Westend,4587130.053225656,5821423.035216866,68014
Beusselstrasse,4590288.156455565,5823096.027807781,28119
Westhafen,4591202.733601221,5823496.121972483,30501
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name,linkId
Ostkreuz,85582
Suedkreuz,144360
Westkreuz/ZOB,59825
Gesundbrunnen,18796
Wedding,63685
Landsberger,147644
Neukoelln,131523
Heidelberger,79212
Jungfernheide,66841
Schoenhauser,52866
Prenzlauer,147541
Greifswalder,34115
Storkower,36983
Frankfurter,3501
Treptower,122012
Sonnenallee,120486
Hermann,134367
Tempelhof,85286
Schoeneberg,77116
Innsbrucker,23130
Bundesplatz,87243
Hohenzollerndamm,53378
Halensee,98925
Westkreuz,47623
Westend,68014
Beusselstrasse,28119
Westhafen,30501
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name x y linkId
Ostkreuz 4600000.480290992 5819700.802393827 85582
Suedkreuz 4592743.290166003 5816823.460886553 144360
Westkreuz/ZOB 4587018.550633609 5820077.051308585 59825
Gesundbrunnen 4594441.531831297 5824985.689612756 18796
Wedding 4592922.882076316 5824084.361963952 63685
Landsberger 4598961.639137452 5822763.996348945 147644
Neukoelln 4598122.504532557 5816022.913872137 131523
Heidelberger 4589140.6734212255 5817067.241862115 79212
Jungfernheide 4588114.078276766 5822702.604874686 66841
Schoenhauser 4596224.755560316 5824965.459438537 52866
Prenzlauer 4597027.523012196 5824666.380226734 147541
Greifswalder 4597824.484647266 5824121.987334944 34115
Storkower 4599371.508500537 5822324.183550394 36983
Frankfurter 4600285.672450088 5821043.030039501 3501
Treptower 4599208.352993022 5818659.97753196 122012
Sonnenallee 4599099.079887119 5816525.18299938 120486
Hermann 4597334.219873768 5815855.3130829865 134367
Tempelhof 4594217.962937871 5816029.29720351 85286
Schoeneberg 4592120.82037306 5817106.7719565695 77116
Innsbrucker 4591307.485161504 5816975.928260568 23130
Bundesplatz 4590450.252520066 5816912.373348798 87243
Hohenzollerndamm 4588367.919164285 5817877.268670943 53378
Halensee 4587799.049568348 5818730.644081692 98925
Westkreuz 4587216.584412754 5819462.496298028 47623
Westend 4587130.053225656 5821423.035216866 68014
Beusselstrasse 4590288.156455565 5823096.027807781 28119
Westhafen 4591202.733601221 5823496.121972483 30501
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name x y linkId
Ostkreuz 4600000.480290992 5819700.802393827 85582
Suedkreuz 4592743.290166003 5816823.460886553 144360
Westkreuz/ZOB 4587018.550633609 5820077.051308585 59825
Gesundbrunnen 4594441.531831297 5824985.689612756 18796
Wedding 4592922.882076316 5824084.361963952 63685
Landsberger 4598961.639137452 5822763.996348945 147644
Neukoelln 4598122.504532557 5816022.913872137 131523
Heidelberger 4589140.6734212255 5817067.241862115 79212
Jungfernheide 4588114.078276766 5822702.604874686 66841
Schoenhauser 4596224.755560316 5824965.459438537 52866
Prenzlauer 4597027.523012196 5824666.380226734 147541
Greifswalder 4597824.484647266 5824121.987334944 34115
Storkower 4599371.508500537 5822324.183550394 36983
Frankfurter 4600285.672450088 5821043.030039501 3501
Treptower 4599208.352993022 5818659.97753196 122012
Sonnenallee 4599099.079887119 5816525.18299938 120486
Hermann 4597334.219873768 5815855.3130829865 134367
Tempelhof 4594217.962937871 5816029.29720351 85286
Schoeneberg 4592120.82037306 5817106.7719565695 77116
Innsbrucker 4591307.485161504 5816975.928260568 23130
Bundesplatz 4590450.252520066 5816912.373348798 87243
Hohenzollerndamm 4588367.919164285 5817877.268670943 53378
Halensee 4587799.049568348 5818730.644081692 98925
Westkreuz 4587216.584412754 5819462.496298028 47623
Westend 4587130.053225656 5821423.035216866 68014
Beusselstrasse 4590006.671389499 5823306.078726921 15415
Westhafen 4591202.733601221 5823496.121972483 30501
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
name x y linkId
S Lichterfelde West (Berlin) 4588100.27690725 5813041.19366402 60621
S Wannsee Bhf (Berlin) 4580380.37727269 5810427.38091679 144733
S Bernau-Friedenstal 4605946.28859416 5838424.43693385 5856
S Eichborndamm (Berlin) 4589286.25272238 5827981.37300655 58677
S Gehrenseestr. (Berlin) 4603577.30325025 5825835.33846104 4362
S+U Lichtenberg Bhf (Berlin) 4601705.0869316 5820705.16080788 85293
S Attilastr. (Berlin) 4592650.3039048 5813546.24964586 68103
S Bernau Bhf 4607773.03343546 5839250.30746861 77991
S Oberspree (Berlin) 4604691.36615774 5814341.33191991 132000
S Karlshorst (Berlin) 4603766.74932993 5817532.30090196 43377
S Stresow (Berlin) 4582153.09164875 5822783.75728479 127962
S Friedrichshagen (Berlin) 4610594.22754617 5815018.45538487 53598
S Mahlow 4596075.35311765 5803913.18390465 117535
S Wildau 4611492.41160453 5799678.17870074 124943
S Spandau Bhf (Berlin) 4581340.06523298 5823070.37837125 58509
S Neuenhagen (b Berlin) 4615496.80065043 5822192.01639047 49600
S Friedrichsfelde Ost (Berlin) 4603230.29691735 5821129.86790605 30332
S Mahlsdorf Bhf (Berlin) 4609453.1079233 5821098.9677476 34715
S Alt-Reinickendorf (Berlin) 4591601.21612245 5828071.36402283 118646
S Potsdam Hauptbahnhof 4572723.75052342 5807010.04650848 158395
S Strausberg Nord 4629464.40880972 5830344.4701043 93726
S+U Wittenau (Berlin) 4590596.20737707 5830103.29949233 100163
S Mehrower Allee (Berlin) 4605521.34209076 5826108.39962595 5465
S Poelchaustr. (Berlin) 4604329.29108034 5823515.29317208 76923
S Waßmannsdorf 4599780.32019175 5804890.50463198 128928
S Schlachtensee (Berlin) 4582657.2033004 5812534.18641998 52309
S Köllnische Heide (Berlin) 4599831.33137685 5816121.27353365 77880
S Lichterfelde Ost Bhf (Berlin) 4590483.06085402 5811533.30998194 120075
S Erkner Bhf 4619280.09907017 5811936.48833159 79433
S Lankwitz (Berlin) 4591415.28738157 5812603.28614726 31256
S Olympiastadion (Berlin) 4584365.22130465 5820502.32241351 21589
S Priesterweg (Berlin) 4592275.28862615 5814868.31960971 149011
S+U Pankow (Berlin) 4595863.25483973 5826963.31489679 30477
S+U Wuhletal (Berlin) 4606996.92569591 5821120.7844083 109433
S Röntgental 4602604.01205345 5836221.41528234 53217
S Birkenwerder Bhf 4587247.81776367 5840313.13499745 105763
S Messe Süd (Berlin) 4586381.24277225 5819161.24352709 4508
S Grünau (Berlin) 4607204.35353786 5809992.32649683 38263
S Biesdorf (Berlin) 4605672.30973343 5821129.34877837 152342
S Südende (Berlin) 4592164.25740772 5813715.31534259 125572
S Rummelsburg (Berlin) 4600517.31082224 5819702.32672 15975
S Grunewald (Berlin) 4585823.25038699 5818028.28077188 101652
S Blankenburg (Berlin) 4597891.29765032 5829651.40153966 149341
S Schöneweide Bhf (Berlin) 4602718.34210856 5814561.61703763 10299
S Oranienburg Bhf 4584461.49325948 5847549.81695397 43852
S Wartenberg (Berlin) 4602084.27829006 5827755.36370121 85344
S Marienfelde (Berlin) 4593641.32186862 5810951.29039218 160580
S Fredersdorf 4619622.69199616 5822924.0052388 157221
S Waidmannslust (Berlin) 4589563.20765663 5831244.32733202 128132
S Schönholz (Berlin) 4593681.25533555 5827435.31707229 101285
S Hoppegarten 4613718.63476718 5821840.61911834 147933
S Betriebsbahnhof Rummelsburg (Berlin) 4601855.80970068 5818882.3817238 132518
S Wilhelmsruh (Berlin) 4592488.1776319 5828468.733026 130190
S Mexikoplatz (Berlin) 4583891.23295571 5812261.2481195 122327
S Lichtenrade (Berlin) 4595087.49862565 5807161.81342843 94875
S+U Rathaus Spandau (Berlin) 4581517.80196652 5823181.74027672 27674
S Eichwalde 4610096.74171683 5805513.79529375 99951
S Wuhlheide (Berlin) 4605675.32427739 5816231.30386683 157347
S Hermsdorf (Berlin) 4588609.19855226 5832490.39929736 106142
S Nikolassee (Berlin) 4581266.23565676 5811554.26447245 49103
S Botanischer Garten (Berlin) 4588901.2639956 5813505.28593573 121181
S Altglienicke (Berlin) 4606235.33548739 5809423.29772979 155717
S Teltow Stadt 4586999.45147954 5807838.29780253 132789
S Lehnitz 4585420.96488263 5846149.83897681 149696
S Zeuthen 4610968.66234814 5803022.20425948 79
S Wilhelmshagen (Berlin) 4617145.42428318 5813115.66328995 114023
S Marzahn (Berlin) 4604683.29144553 5824471.38822054 76914
S Tegel (Berlin) 4587441.21242623 5829201.36717154 19614
S Kaulsdorf (Berlin) 4607982.3144942 5821075.37232631 79285
S Zehlendorf (Berlin) 4585750.23111053 5811630.28126389 134872
S Köpenick (Berlin) 4607468.38723129 5815116.28340736 140096
S Spindlersfeld (Berlin) 4606354.38778222 5813672.2917294 3211
S Ahrensfelde Bhf (Berlin) 4606239.59169555 5827635.3284185 76895
S Babelsberg 4574622.83904128 5807023.75647906 38097
S Sundgauer Str. (Berlin) 4586711.27083467 5812201.19920474 65237
S Pichelsberg (Berlin) 4583494.58930472 5820352.96928313 1339
S+U Rathaus Steglitz (Berlin) 4589981.28934458 5814361.29162181 50104
S Karow Bhf (Berlin) 4599672.28830554 5832435.3267818 17573
S Raoul-Wallenberg-Str. (Berlin) 4605131.33676917 5825313.31645326 76899
S Hirschgarten (Berlin) 4608960.22789908 5815056.08222811 134929
S Borgsdorf 4586385.42538849 5843219.84835545 31230
S Mühlenbeck-Mönchmühle 4594045.30988158 5836591.26359041 129271
S Feuerbachstr. (Berlin) 4590661.23513543 5815321.23140136 18317
S Heiligensee (Berlin) 4583304.2019035 5833174.3056202 36190
S Hohen Neuendorf 4587181.11819893 5838172.69706398 156280
S Adlershof (Berlin) 4604874.32146272 5812434.26206783 13192
S Hennigsdorf Bhf 4581723.75254089 5834637.7507245 14665
S Rahnsdorf (Berlin) 4615102.2413198 5814482.11335511 16121
S Bornholmer Str. (Berlin) 4594911.33986489 5825551.36227807 27557
S Hohenschönhausen Bhf (Berlin) 4602659.33293034 5826960.12190927 10029
S Schönfließ 4590795.80961931 5837698.35933947 110273
S Zepernick 4603834.40437006 5837353.74382144 154289
S Plänterwald (Berlin) 4600251.31458203 5817193.31977164 155213
S Schichauweg (Berlin) 4594675.91271264 5808159.88719799 36801
S Friedenau (Berlin) 4591204.29785486 5816046.32097648 30599
S Bergfelde 4589496.21571184 5838242.35345309 15041
S Hegermühle 4626731.42276863 5825634.40557242 26702
S Wollankstr. (Berlin) 4594571.24020469 5826681.38180607 159205
S Springpfuhl (Berlin) 4604411.29080373 5822521.30066193 29614
S Griebnitzsee Bhf 4576881.05765744 5807360.31899615 140665
S Blankenfelde (TF) Bhf 4596634.43335028 5801334.62833861 128948
S Königs Wusterhausen Bhf 4611396.44071062 5797166.66217366 22758
S Schulzendorf (Berlin) 4584475.20733031 5831899.37374987 49965
S Pankow-Heinersdorf (Berlin) 4596980.29661473 5828134.29950017 25888
S Strausberg Bhf 4624608.40188866 5823723.39396748 10092
S Birkenstein 4612096.5670225 5821576.4904013 20960
S Johannisthal (Berlin) 4603723.33170726 5813700.32892687 98305
S Nöldnerplatz (Berlin) 4600892.32450809 5819958.36873501 80235
S Buch (Berlin) 4601134.41835636 5834752.06110468 75423
S Grünbergallee (Berlin) 4605140.34930445 5808481.20521601 87572
S Osdorfer Str. (Berlin) 4589492.25188562 5810268.23095446 56038
S Buckower Chaussee (Berlin) 4594175.16956351 5809538.85102896 63510
S Lichterfelde Süd (Berlin) 4589155.24782277 5809325.26121982 114119
S Petershagen Nord 4621625.66257861 5823272.68514461 66957
S Baumschulenweg (Berlin) 4601328.29166496 5815975.27568777 22170
S Frohnau (Berlin) 4587412.17664464 5834115.41234001 156271
S+U Karl-Bonhoeffer-Nervenklinik (Berlin) 4590460.24657233 5828072.39585757 79680
S Strausberg Stadt 4628105.85298267 5828849.46284123 71096
S Heerstr. (Berlin) 4585546.92420817 5820229.39385028 5962
74 changes: 74 additions & 0 deletions simwrapper/custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
html {
font-size: 16px !important;
}

h2 {
font-size: 2rem;
}

#dashboard {
width: 80%;
margin: auto;
}

.up-link {
display: none;
}

.tabs ul li:last-child {
display: none;
}

.tabs.is-centered ul {
justify-content: left !important;
padding-left: 170px;
}

.row-scenarios .dash-card-frame {
margin-bottom: 0 !important;
}

img.project-logo {
position: absolute;
height: 48px;
}

.tabs a {
font-size: 1.4rem;
}

.project-header {
margin: 0 !important;
padding-bottom: 0 !important;
}

.project-footer {
padding: 0 !important;
margin-bottom: 0 !important;
}

footer {
background-color: #262626;
}

.logos img {
height: 45px;
}

footer .logos {
display: flex;
justify-content: left;
gap: 15px;
align-items: center;
padding: 36px 0 24px;
border-bottom: 1px solid #4b4b4b;
margin-bottom: 24px;
}

footer .menu {
display: flex;
align-items: flex-start;
justify-content: space-between;
padding-bottom: 36px;
color: #b2b2b2;
}
Loading

0 comments on commit bd6ae7d

Please sign in to comment.