feat: Adding vehicles to swiss config (#318)

* feat: Adding vehicles to swiss config

Adjusting swiss config with vehicles

* Update RunAdaptConfig.java

* Update SwissConfigAdapter.java to handle scenario prefix

* add missing imports

Author: balacmi

switzerland/src/main/java/org/eqasim/switzerland/scenario/RunAdaptConfig.java

@@ -9,9 +9,11 @@
 import org.matsim.core.config.CommandLine;
 import org.matsim.core.config.Config;
 import org.matsim.core.config.groups.QSimConfigGroup;
+import org.matsim.core.config.groups.QSimConfigGroup.VehiclesSource;
 import org.matsim.core.config.groups.ReplanningConfigGroup;
 import org.matsim.core.config.groups.ReplanningConfigGroup.StrategySettings;
 import org.matsim.core.config.groups.ScoringConfigGroup;
+import org.matsim.core.config.groups.VehiclesConfigGroup;
 import org.matsim.core.replanning.strategies.DefaultPlanStrategiesModule.DefaultSelector;
 import org.matsim.core.replanning.strategies.DefaultPlanStrategiesModule.DefaultStrategy;
 
@@ -80,6 +82,12 @@ static public void adaptConfiguration(Config config) {
 			}
 		}
 
+		// Vehicles
+		QSimConfigGroup qsimConfig = config.qsim();
+		qsimConfig.setVehiclesSource(VehiclesSource.fromVehiclesData);
+		VehiclesConfigGroup vehiclesConfig = config.vehicles();
+		vehiclesConfig.setVehiclesFile(SwissConfigAdapter.prefix + "vehicles.xml.gz");
+
 	}
 
 }

switzerland/src/main/java/org/eqasim/switzerland/scenario/SwissConfigAdapter.java

@@ -15,10 +15,12 @@ public class SwissConfigAdapter {
     protected static double downsamplingRate = 1.0;
     protected static double replanningRate = 0.05;
 
+    protected static String prefix = "";
+
     public static void run(String[] args, SwitzerlandConfigurator configurator, Consumer<Config> adapter)
             throws CommandLine.ConfigurationException {
         CommandLine cmd = new CommandLine.Builder(args) //
-                .requireOptions("input-path", "output-path", "downsamplingRate", "replanningRate") //
+                .requireOptions("input-path", "output-path", "downsamplingRate", "replanningRate", "prefix") //
                 .allowOptions("activity-list", "hasFreight") //
                 .build();
 
@@ -34,6 +36,8 @@ public static void run(String[] args, SwitzerlandConfigurator configurator, Cons
 
         downsamplingRate = Double.parseDouble(cmd.getOptionStrict("downsamplingRate"));
 
+        prefix = cmd.getOptionStrict("prefix");
+
         Config config = ConfigUtils.loadConfig(cmd.getOptionStrict("input-path"));
         configurator.updateConfig(config);
         adapter.accept(config);
@@ -45,4 +49,4 @@ protected static void setCustomActivities(String activityList) {
         hasCustomActivities = true;
         activityTypes = Arrays.asList(activityList.split("\\s*,\\s*"));
     }
-}
+}