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

Update MATSim #100

Merged
merged 72 commits into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
f16ab0a
combined distribution of tour start and duration
rakow May 8, 2024
ca38361
add routing test with multiple same options
paulheinr May 8, 2024
0177cbf
Merge pull request #3259 from matsim-org/add-routing-test
paulheinr May 8, 2024
9f92c11
build(deps): bump info.picocli:picocli from 4.7.5 to 4.7.6
dependabot[bot] May 8, 2024
e3fd2fc
Merge pull request #3260 from matsim-org/dependabot/maven/info.picocl…
michalmac May 8, 2024
4e03121
build(deps-dev): bump net.bytebuddy:byte-buddy from 1.14.14 to 1.14.15
dependabot[bot] May 8, 2024
208bc3a
Merge pull request #3261 from matsim-org/dependabot/maven/net.bytebud…
michalmac May 8, 2024
0f8e482
add javadoc comment to constructor of OTFVisLiveModule
kainagel May 9, 2024
0e36d76
Merge branch 'master' into otfvis-module-protection-hint
kainagel May 9, 2024
588741b
Merge pull request #3262 from matsim-org/otfvis-module-protection-hint
kainagel May 9, 2024
138f63a
factor out drt optimization constraint params from drt config group …
nkuehnel May 10, 2024
f2ef7a2
add python script to analysis kid data
rakow May 13, 2024
3777451
add new events for new times distribution
rewertvsp May 13, 2024
4aa48e2
add todo
rewertvsp May 13, 2024
032e9aa
Merge branch 'master' into ssct-durations
rewertvsp May 13, 2024
31c23c9
Merge pull request #3265 from matsim-org/ssct-durations
rewertvsp May 13, 2024
0c89132
change format of list creation
rewertvsp May 14, 2024
d7ad71d
make output files of the class configurable
rewertvsp May 14, 2024
e8458ed
Merge pull request #3268 from matsim-org/ssct-improvements-for-compil…
rewertvsp May 14, 2024
f623322
add trip filter for trip start OR end in shp area (#3269)
simei94 May 15, 2024
1a75b4d
read first 5 lines of csv to check delimiter (#3271)
simei94 May 15, 2024
a9cdc5b
inline abstract module attributes and get rid of them
paulheinr May 16, 2024
47369c7
Merge pull request #3273 from matsim-org/guice-clean-up
paulheinr May 16, 2024
48bda59
Allow for storing multiple DrtOptimizationConstraintsParams
marecabo May 16, 2024
543191c
recognize EPSG:4326 as equal to WGS84 when using special coordinate t…
rakow May 16, 2024
07ba389
Add test
marecabo May 17, 2024
e9e8ce0
update to geotools 31 (resolve transitive dependency conflicts) (#3272)
nkuehnel May 17, 2024
1f92c5d
build(deps): bump io.grpc:grpc-all from 1.63.0 to 1.64.0
dependabot[bot] May 17, 2024
067cb2f
Merge pull request #3274 from matsim-org/dependabot/maven/io.grpc-grp…
michalmac May 17, 2024
ffeb556
build(deps): bump org.mockito:mockito-core from 5.11.0 to 5.12.0
dependabot[bot] May 17, 2024
21a4ff0
Merge pull request #3267 from matsim-org/dependabot/maven/org.mockito…
michalmac May 17, 2024
7182f71
build(deps): bump org.mockito:mockito-junit-jupiter
dependabot[bot] May 17, 2024
618da2f
Merge pull request #3266 from matsim-org/dependabot/maven/org.mockito…
michalmac May 17, 2024
b5efabd
update gtfs2matsim in application contrib (#3278)
vsp-gleich May 17, 2024
24cbb34
build(deps): bump com.google.code.gson:gson from 2.10.1 to 2.11.0
dependabot[bot] May 20, 2024
d4d7cd5
Merge pull request #3279 from matsim-org/dependabot/maven/com.google.…
michalmac May 20, 2024
70eec34
Move optimization constraints params to optimizer package
nkuehnel May 21, 2024
12ca6a5
add middleman for drt optimization constraints
nkuehnel May 21, 2024
6a359cc
Merge branch 'master' into multiple-drt-optimization-params
nkuehnel May 21, 2024
a4a112b
re-order replanning parameter comments to make them more understandab…
simei94 May 22, 2024
f6396f8
---
dependabot[bot] May 22, 2024
b867f8c
Merge pull request #3282 from matsim-org/dependabot/maven/jakarta.val…
michalmac May 22, 2024
64b2943
---
dependabot[bot] May 22, 2024
599714f
Merge pull request #3281 from matsim-org/dependabot/maven/net.bytebud…
michalmac May 22, 2024
a23186e
Merge branch 'master' into multiple-drt-optimization-params
nkuehnel May 23, 2024
04a66fb
Merge pull request #3275 from marecabo/multiple-drt-optimization-params
marecabo May 24, 2024
c0149d6
Bump org.apache.commons:commons-compress from 1.26.1 to 1.26.2
dependabot[bot] May 24, 2024
6a12bd5
Merge pull request #3287 from matsim-org/dependabot/maven/org.apache.…
michalmac May 24, 2024
6c6a2e3
Bump com.google.protobuf:protobuf-java from 4.26.1 to 4.27.0
dependabot[bot] May 24, 2024
de96dbd
Merge pull request #3286 from matsim-org/dependabot/maven/com.google.…
michalmac May 24, 2024
9b101a0
Fix bug in bicycle score handler (#3288)
rakow May 27, 2024
4796104
fix: prebooked drt with variable stop durations and group sizes (#3290)
sebhoerl May 27, 2024
7bb99a7
Documentation mode choice + make mode choice analysis standard (#3285)
simei94 May 27, 2024
7efc308
Bump org.assertj:assertj-core from 3.25.3 to 3.26.0
dependabot[bot] May 27, 2024
dc32fad
Merge pull request #3291 from matsim-org/dependabot/maven/org.assertj…
michalmac May 27, 2024
9c92c4b
MATSim Application: Improve network params estimators (#3292)
rakow May 28, 2024
f4e4a6f
Added a test scenario for a construction site between Morges and Rene…
NicDul May 28, 2024
0992cf3
add corrections for inaccuracies in some of the calculations (#3263)
rakow May 28, 2024
1c2cf78
add backwards compatibility for dvrp matrix and drt zone system confi…
nkuehnel May 28, 2024
d5b1700
add back service area filter for drt zones (#3295)
nkuehnel May 29, 2024
870a0f7
Add late diversion constraint for drt detours (#2455)
nkuehnel May 30, 2024
d51a608
Bump net.bytebuddy:byte-buddy from 1.14.16 to 1.14.17
dependabot[bot] May 30, 2024
ad0f87c
Merge pull request #3298 from matsim-org/dependabot/maven/net.bytebud…
michalmac May 30, 2024
72b81d6
Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0
dependabot[bot] May 30, 2024
3e375bc
Merge pull request #3297 from matsim-org/dependabot/maven/org.apache.…
michalmac May 30, 2024
2ce5164
add dependency for geotools-api (#3302)
simei94 Jun 3, 2024
5b27550
Bump org.hsqldb:hsqldb from 2.7.2 to 2.7.3
dependabot[bot] Jun 3, 2024
fd2955e
Merge pull request #3301 from matsim-org/dependabot/maven/org.hsqldb-…
michalmac Jun 3, 2024
1bb2968
Bump com.google.errorprone:error_prone_annotations from 2.27.1 to 2.28.0
dependabot[bot] Jun 3, 2024
eb5940e
Merge pull request #3305 from matsim-org/dependabot/maven/com.google.…
jfbischoff Jun 4, 2024
d3742de
make header of detailed_distance_stats listen to custom delimiter (#3…
nkuehnel Jun 7, 2024
261cf9e
Merge branch 'moia-deployment' into master
nkuehnel Jun 7, 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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,11 @@ private enum LanduseConfiguration {
useOnlyOSMLanduse, useOSMBuildingsAndLanduse
}

@CommandLine.Option(names = "--pathOutput", description = "Path for the output", defaultValue = "output/TestDistributionClass")
private Path output;
@CommandLine.Option(names = "--outputFacilityFile", description = "Path for the outputFacilityFile", defaultValue = "output/TestDistributionClass/commercialFacilities.xml.gz")
private Path outputFacilityFile;

@CommandLine.Option(names = "--outputDataDistributionFile", description = "Path for the outputDataDistributionFile", defaultValue = "output/TestDistributionClass/dataDistributionPerZone.csv")
private Path outputDataDistributionFile;

@CommandLine.Option(names = "--landuseConfiguration", description = "Set option of used OSM data. Options: useOnlyOSMLanduse, useOSMBuildingsAndLanduse, useExistingDataDistribution", defaultValue = "useOSMBuildingsAndLanduse")
private LanduseConfiguration usedLanduseConfiguration;
Expand Down Expand Up @@ -112,13 +115,13 @@ public Integer call() throws Exception {
ShpOptions.Index indexInvestigationAreaRegions = SmallScaleCommercialTrafficUtils.getIndexRegions(shapeFileRegionsPath, shapeCRS,
regionsShapeRegionColumn);

if(Files.notExists(output))
new File(output.toString()).mkdir();
if(Files.notExists(outputFacilityFile.getParent()))
new File(outputFacilityFile.toString()).mkdir();

landuseCategoriesAndDataConnection = landuseDataConnectionCreator.createLanduseDataConnection();

Map<String, Object2DoubleMap<String>> resultingDataPerZone = LanduseBuildingAnalysis
.createInputDataDistribution(output, landuseCategoriesAndDataConnection,
.createInputDataDistribution(outputDataDistributionFile, landuseCategoriesAndDataConnection,
usedLanduseConfiguration.toString(), indexLanduse, indexZones,
indexBuildings, indexInvestigationAreaRegions, shapeFileZoneNameColumn, buildingsPerZone, pathToInvestigationAreaData, shapeFileBuildingTypeColumn);

Expand All @@ -127,11 +130,10 @@ public Integer call() throws Exception {
ActivityFacilitiesFactory facilitiesFactory = facilities.getFactory();

calculateAreaSharesOfTheFacilities(facilities, facilitiesFactory);
Path facilityOutput = output.resolve("commercialFacilities.xml.gz");
log.info("Created {} facilities, writing to {}", facilities.getFacilities().size(), facilityOutput);
log.info("Created {} facilities, writing to {}", facilities.getFacilities().size(), outputFacilityFile);

FacilitiesWriter writer = new FacilitiesWriter(facilities);
writer.write(facilityOutput.toString());
writer.write(outputFacilityFile.toString());

return 0;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@ public class LanduseBuildingAnalysis {
* Creates a distribution of the given input data for each zone based on the
* used OSM data.
*/
public static Map<String, Object2DoubleMap<String>> createInputDataDistribution(Path output,
public static Map<String, Object2DoubleMap<String>> createInputDataDistribution(Path outputDataDistributionFile,
Map<String, List<String>> landuseCategoriesAndDataConnection,
String usedLanduseConfiguration, Index indexLanduse,
Index indexZones,
Index indexBuildings, Index indexInvestigationAreaRegions,
String shapeFileZoneNameColumn,
Map<String, Map<String, List<SimpleFeature>>> buildingsPerZone,
Path pathToInvestigationAreaData, String shapeFileBuildingTypeColumn)
Path pathToInvestigationAreaData,
String shapeFileBuildingTypeColumn)
throws IOException {

Map<String, Object2DoubleMap<String>> resultingDataPerZone = new HashMap<>();
Map<String, String> zoneIdRegionConnection = new HashMap<>();
Path outputFileInOutputFolder = output.resolve("dataDistributionPerZone.csv");

log.info("New analyze for data distribution is started. The used method is: {}", usedLanduseConfiguration);
Map<String, Object2DoubleMap<String>> landuseCategoriesPerZone = new HashMap<>();
Expand All @@ -83,7 +83,7 @@ public static Map<String, Object2DoubleMap<String>> createInputDataDistribution(
createResultingDataForLanduseInZones(landuseCategoriesPerZone, investigationAreaData, resultingDataPerZone,
landuseCategoriesAndDataConnection, zoneIdRegionConnection);

writeResultOfDataDistribution(resultingDataPerZone, outputFileInOutputFolder,
writeResultOfDataDistribution(resultingDataPerZone, outputDataDistributionFile,
zoneIdRegionConnection);


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ void testTrafficVolumeGenerationCommercialPersonTraffic() throws IOException {

Map<String, Map<String, List<SimpleFeature>>> buildingsPerZone = new HashMap<>();

Path output = Path.of(utils.getOutputDirectory());
assert(new File(output.resolve("calculatedData").toString()).mkdir());
Path outputDataDistributionFile = Path.of(utils.getOutputDirectory()).resolve("dataDistributionPerZone.csv");
assert(new File(outputDataDistributionFile.getParent().resolve("calculatedData").toString()).mkdir());
Path inputDataDirectory = Path.of(utils.getPackageInputDirectory());
String usedLanduseConfiguration = "useOSMBuildingsAndLanduse";
String shapeFileZoneNameColumn = "name";
Expand All @@ -70,7 +70,7 @@ void testTrafficVolumeGenerationCommercialPersonTraffic() throws IOException {
Map<String, List<String>> landuseCategoriesAndDataConnection = landuseDataConnectionCreator.createLanduseDataConnection();

Map<String, Object2DoubleMap<String>> resultingDataPerZone = LanduseBuildingAnalysis
.createInputDataDistribution(output, landuseCategoriesAndDataConnection,
.createInputDataDistribution(outputDataDistributionFile, landuseCategoriesAndDataConnection,
usedLanduseConfiguration,
SCTUtils.getIndexLanduse(inputDataDirectory), SCTUtils.getZoneIndex(inputDataDirectory), SCTUtils.getIndexBuildings(inputDataDirectory),
SCTUtils.getIndexRegions(inputDataDirectory), shapeFileZoneNameColumn, buildingsPerZone, pathToInvestigationAreaData, shapeFileBuildingTypeColumn);
Expand All @@ -83,9 +83,9 @@ void testTrafficVolumeGenerationCommercialPersonTraffic() throws IOException {
TrafficVolumeGeneration.setInputParameters(usedTrafficType);

Map<TrafficVolumeKey, Object2DoubleMap<Integer>> trafficVolumePerTypeAndZone_start = TrafficVolumeGeneration
.createTrafficVolume_start(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_start(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);
Map<TrafficVolumeKey, Object2DoubleMap<Integer>> trafficVolumePerTypeAndZone_stop = TrafficVolumeGeneration
.createTrafficVolume_stop(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_stop(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);

Assertions.assertEquals(3, trafficVolumePerTypeAndZone_start.size());
Assertions.assertEquals(3, trafficVolumePerTypeAndZone_stop.size());
Expand Down Expand Up @@ -138,9 +138,9 @@ void testTrafficVolumeGenerationCommercialPersonTraffic() throws IOException {
//test with different sample
sample = 0.25;
trafficVolumePerTypeAndZone_start = TrafficVolumeGeneration
.createTrafficVolume_start(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_start(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);
trafficVolumePerTypeAndZone_stop = TrafficVolumeGeneration
.createTrafficVolume_stop(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_stop(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);

Assertions.assertEquals(3, trafficVolumePerTypeAndZone_start.size());
Assertions.assertEquals(3, trafficVolumePerTypeAndZone_stop.size());
Expand Down Expand Up @@ -190,8 +190,8 @@ void testTrafficVolumeGenerationGoodsTraffic() throws IOException {

Map<String, Map<String, List<SimpleFeature>>> buildingsPerZone = new HashMap<>();

Path output = Path.of(utils.getOutputDirectory());
assert(new File(output.resolve("calculatedData").toString()).mkdir());
Path outputDataDistributionFile = Path.of(utils.getOutputDirectory()).resolve("dataDistributionPerZone.csv");
assert(new File(outputDataDistributionFile.getParent().resolve("calculatedData").toString()).mkdir());
Path inputDataDirectory = Path.of(utils.getPackageInputDirectory());
String usedLanduseConfiguration = "useOSMBuildingsAndLanduse";
String shapeFileZoneNameColumn = "name";
Expand All @@ -201,7 +201,7 @@ void testTrafficVolumeGenerationGoodsTraffic() throws IOException {
Map<String, List<String>> landuseCategoriesAndDataConnection = landuseDataConnectionCreator.createLanduseDataConnection();

Map<String, Object2DoubleMap<String>> resultingDataPerZone = LanduseBuildingAnalysis
.createInputDataDistribution(output, landuseCategoriesAndDataConnection,
.createInputDataDistribution(outputDataDistributionFile, landuseCategoriesAndDataConnection,
usedLanduseConfiguration,
SCTUtils.getIndexLanduse(inputDataDirectory), SCTUtils.getZoneIndex(inputDataDirectory), SCTUtils.getIndexBuildings(inputDataDirectory),
SCTUtils.getIndexRegions(inputDataDirectory), shapeFileZoneNameColumn, buildingsPerZone, pathToInvestigationAreaData, shapeFileBuildingTypeColumn);
Expand All @@ -213,9 +213,9 @@ void testTrafficVolumeGenerationGoodsTraffic() throws IOException {
TrafficVolumeGeneration.setInputParameters(usedTrafficType);

Map<TrafficVolumeKey, Object2DoubleMap<Integer>> trafficVolumePerTypeAndZone_start = TrafficVolumeGeneration
.createTrafficVolume_start(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_start(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);
Map<TrafficVolumeKey, Object2DoubleMap<Integer>> trafficVolumePerTypeAndZone_stop = TrafficVolumeGeneration
.createTrafficVolume_stop(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_stop(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);

Assertions.assertEquals(15, trafficVolumePerTypeAndZone_start.size());
Assertions.assertEquals(15, trafficVolumePerTypeAndZone_stop.size());
Expand Down Expand Up @@ -514,8 +514,8 @@ void testAddingExistingScenariosWithSample() throws Exception {
void testReducingDemandAfterAddingExistingScenarios_goods() throws Exception {
Map<String, Map<String, List<SimpleFeature>>> buildingsPerZone = new HashMap<>();

Path output = Path.of(utils.getOutputDirectory());
assert(new File(output.resolve("calculatedData").toString()).mkdir());
Path outputDataDistributionFile = Path.of(utils.getOutputDirectory()).resolve("dataDistributionPerZone.csv");
assert(new File(outputDataDistributionFile.getParent().resolve("calculatedData").toString()).mkdir());
Path inputDataDirectory = Path.of(utils.getPackageInputDirectory());
String usedLanduseConfiguration = "useOSMBuildingsAndLanduse";
String networkPath = "https://raw.githubusercontent.com/matsim-org/matsim-libs/master/examples/scenarios/freight-chessboard-9x9/grid9x9.xml";
Expand All @@ -542,15 +542,15 @@ void testReducingDemandAfterAddingExistingScenarios_goods() throws Exception {
Map<String, Map<String, List<ActivityFacility>>> facilitiesPerZone = new HashMap<>();

Map<String, Object2DoubleMap<String>> resultingDataPerZone = LanduseBuildingAnalysis
.createInputDataDistribution(output, landuseCategoriesAndDataConnection,
.createInputDataDistribution(outputDataDistributionFile, landuseCategoriesAndDataConnection,
usedLanduseConfiguration,
SCTUtils.getIndexLanduse(inputDataDirectory), SCTUtils.getZoneIndex(inputDataDirectory), SCTUtils.getIndexBuildings(inputDataDirectory),
SCTUtils.getIndexRegions(inputDataDirectory), shapeFileZoneNameColumn, buildingsPerZone, pathToInvestigationAreaData, shapeFileBuildingTypeColumn);

Map<TrafficVolumeKey, Object2DoubleMap<Integer>> trafficVolumePerTypeAndZone_start = TrafficVolumeGeneration
.createTrafficVolume_start(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_start(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);
Map<TrafficVolumeKey, Object2DoubleMap<Integer>> trafficVolumePerTypeAndZone_stop = TrafficVolumeGeneration
.createTrafficVolume_stop(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_stop(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);

Map<String, Map<Id<Link>, Link>> linksPerZone = GenerateSmallScaleCommercialTrafficDemand
.filterLinksForZones(scenario, SCTUtils.getZoneIndex(inputDataDirectory), facilitiesPerZone, shapeFileZoneNameColumn);
Expand Down Expand Up @@ -680,8 +680,8 @@ void testReducingDemandAfterAddingExistingScenarios_commercialPersonTraffic() th
Map<String, Map<String, List<SimpleFeature>>> buildingsPerZone = new HashMap<>();
Map<String, Map<String, List<ActivityFacility>>> facilitiesPerZone = new HashMap<>();

Path output = Path.of(utils.getOutputDirectory());
assert(new File(output.resolve("calculatedData").toString()).mkdir());
Path outputDataDistributionFile = Path.of(utils.getOutputDirectory()).resolve("dataDistributionPerZone.csv");
assert(new File(outputDataDistributionFile.getParent().resolve("calculatedData").toString()).mkdir());
Path inputDataDirectory = Path.of(utils.getPackageInputDirectory());
String usedLanduseConfiguration = "useOSMBuildingsAndLanduse";
String networkPath = "https://raw.githubusercontent.com/matsim-org/matsim-libs/master/examples/scenarios/freight-chessboard-9x9/grid9x9.xml";
Expand All @@ -708,15 +708,15 @@ void testReducingDemandAfterAddingExistingScenarios_commercialPersonTraffic() th


Map<String, Object2DoubleMap<String>> resultingDataPerZone = LanduseBuildingAnalysis
.createInputDataDistribution(output, landuseCategoriesAndDataConnection,
.createInputDataDistribution(outputDataDistributionFile, landuseCategoriesAndDataConnection,
usedLanduseConfiguration,
SCTUtils.getIndexLanduse(inputDataDirectory), SCTUtils.getZoneIndex(inputDataDirectory), SCTUtils.getIndexBuildings(inputDataDirectory),
SCTUtils.getIndexRegions(inputDataDirectory), shapeFileZoneNameColumn, buildingsPerZone, pathToInvestigationAreaData, shapeFileBuildingTypeColumn);

Map<TrafficVolumeKey, Object2DoubleMap<Integer>> trafficVolumePerTypeAndZone_start = TrafficVolumeGeneration
.createTrafficVolume_start(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_start(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);
Map<TrafficVolumeKey, Object2DoubleMap<Integer>> trafficVolumePerTypeAndZone_stop = TrafficVolumeGeneration
.createTrafficVolume_stop(resultingDataPerZone, output, sample, modesORvehTypes, usedTrafficType);
.createTrafficVolume_stop(resultingDataPerZone, outputDataDistributionFile.getParent(), sample, modesORvehTypes, usedTrafficType);

Map<String, Map<Id<Link>, Link>> regionLinksMap = GenerateSmallScaleCommercialTrafficDemand
.filterLinksForZones(scenario, SCTUtils.getZoneIndex(inputDataDirectory), facilitiesPerZone, shapeFileZoneNameColumn);
Expand Down
Loading