Skip to content

Commit

Permalink
change to latest version of class
Browse files Browse the repository at this point in the history
  • Loading branch information
rewertvsp committed May 21, 2024
1 parent 3a62d9d commit f0d16b2
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/main/java/org/matsim/prepare/CreateCommercialDemand.java
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,13 @@ public Integer call() {
Path pathCommercialFacilities = output.resolve("commercialFacilities.xml.gz");
//here possible to create an implementation for ruhrAGIS data
LanduseDataConnectionCreator landuseDataConnectionCreator = new LanduseDataConnectionCreatorForOSM_Data();
Path pathDataDistributionFile = output.resolve("dataDistributionPerZone.csv");
if (Files.exists(pathCommercialFacilities)) {
log.warn("Commercial facilities for small-scale commercial generation already exists. Skipping generation.");
} else {
new CreateDataDistributionOfStructureData(landuseDataConnectionCreator).execute(
"--pathOutput", output.toString(),
"--outputFacilityFile", pathCommercialFacilities.toString(),
"--outputDataDistributionFile", pathDataDistributionFile.toString(),
"--landuseConfiguration", "useOSMBuildingsAndLanduse",
"--regionsShapeFileName", osmDataLocation.resolve("regions_25832.shp").toString(),
"--regionsShapeRegionColumn", "GEN",
Expand All @@ -230,7 +232,7 @@ public Integer call() {
//TODO check: Wo wird das Volumen der existierenden Modelle von den erzeugten Potentialen abgezogen?
new GenerateSmallScaleCommercialTrafficDemand(integrateExistingTrafficToSmallScaleCommercial).execute(
configPath.toString(),
"--pathToDataDistributionToZones", output.resolve("dataDistributionPerZone.csv").toString(),
"--pathToDataDistributionToZones", pathDataDistributionFile.toString(),
"--pathToCommercialFacilities", configPath.getParent().relativize(pathCommercialFacilities).toString(),
"--sample", String.valueOf(sample),
"--jspritIterations", String.valueOf(jspritIterationsForSmallScaleCommercial),
Expand Down

0 comments on commit f0d16b2

Please sign in to comment.