fix compile errors

matsim-scenarios · Jan 24, 2024 · 0a40fd6 · 0a40fd6
1 parent de150d7
commit 0a40fd6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/src/main/java/org/matsim/prepare/ExtractFacilityShp.java b/src/main/java/org/matsim/prepare/ExtractFacilityShp.java
@@ -27,18 +27,8 @@
 import org.geotools.referencing.CRS;
 import org.locationtech.jts.geom.*;
 import org.locationtech.jts.index.strtree.STRtree;
-import org.matsim.api.core.v01.Coord;
-import org.matsim.api.core.v01.Id;
-import org.matsim.api.core.v01.TransportMode;
-import org.matsim.api.core.v01.network.Link;
-import org.matsim.api.core.v01.network.Network;
 import org.matsim.application.MATSimAppCommand;
 import org.matsim.application.options.CrsOptions;
-import org.matsim.application.options.ShpOptions;
-import org.matsim.core.network.NetworkUtils;
-import org.matsim.core.network.algorithms.TransportModeNetworkFilter;
-import org.matsim.core.utils.geometry.geotools.MGC;
-import org.matsim.facilities.*;
 import org.matsim.run.RunOpenBerlinScenario;
 import org.opengis.feature.simple.SimpleFeature;
 import org.opengis.feature.simple.SimpleFeatureType;
@@ -50,11 +40,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import static org.matsim.prepare.RunOpenBerlinCalibration.roundCoord;
 
 @CommandLine.Command(
 	name = "facility-shp",

diff --git a/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java b/src/main/java/org/matsim/prepare/RunOpenBerlinCalibration.java
@@ -167,7 +167,7 @@ protected Config prepareConfig(Config config) {
 			config.counts().setCountsScaleFactor(sampleSize * countScale);
 			config.plans().setInputFile(sample.adjustName(config.plans().getInputFile()));
 
-			sw.defaultParams().sampleSize = sampleSize * countScale;
+			sw.sampleSize = sampleSize * countScale;
 		}
 
 		// Routes are not relaxed yet, and there should not be too heavy congestion

diff --git a/src/main/java/org/matsim/run/RunOpenBerlinScenario.java b/src/main/java/org/matsim/run/RunOpenBerlinScenario.java
@@ -54,7 +54,7 @@ protected Config prepareConfig(Config config) {
 
 			// Counts can be scaled with sample size
 			config.counts().setCountsScaleFactor(sampleSize);
-			sw.defaultParams().sampleSize = sampleSize;
+			sw.sampleSize = sampleSize;
 
 			config.controller().setRunId(sample.adjustName(config.controller().getRunId()));
 			config.controller().setOutputDirectory(sample.adjustName(config.controller().getOutputDirectory()));