Merge branch 'master' into zonalRejectionRates

contribs/vsp/src/test/java/playground/vsp/cadyts/marginals/ModalDistanceAndCountsCadytsIT.java

@@ -1,5 +1,4 @@
 package playground.vsp.cadyts.marginals;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -63,13 +62,14 @@ private static DistanceDistribution createDistanceDistribution() {
 		return result;
 	}
 
-	private Config createConfig() {
+	private Config createConfig(String outputSuffix) {
 
 		Config config = ConfigUtils.createConfig();
 		String[] modes = new String[]{TransportMode.car, TransportMode.bike};
 
 		config.routing().setNetworkRouteConsistencyCheck(RoutingConfigGroup.NetworkRouteConsistencyCheck.disable);
-		config.controller().setOutputDirectory(this.utils.getOutputDirectory());
+		String outputDirectory = this.utils.getOutputDirectory();
+		config.controller().setOutputDirectory(outputDirectory.substring(0,outputDirectory.length()-1)+outputSuffix);
 		config.controller().setOverwriteFileSetting(OutputDirectoryHierarchy.OverwriteFileSetting.deleteDirectoryIfExists);
 		config.controller().setLastIteration(40);
 
@@ -244,7 +244,7 @@ private static Plan createPlan(String mode, String endLink, Network network, Pop
 	@MethodSource("arguments")
 	void test(double countsWeight, double modalDistanceWeight) {
 
-		Config config = createConfig();
+		Config config = createConfig(countsWeight+"_"+modalDistanceWeight);
 		CadytsConfigGroup cadytsConfigGroup = new CadytsConfigGroup();
 		cadytsConfigGroup.setWriteAnalysisFile(true);
 		config.addModule(cadytsConfigGroup);