changed nr of simplex to 4 (now every agent reaches the target)

VadereOptimizationTests/TestNelderMead/scenarios/counterflow.scenario

@@ -12,14 +12,14 @@
         "expectedResult" : "SUCCESS",
         "optimizationMetricProcessorId" : 2,
         "testEvacuationProcessorId" : 3,
-        "maxMeanPointDistance" : 0.11637874817308734,
-        "maxMeanDifferenceFuncValue" : 0.04086533272032428,
+        "maxMeanPointDistance" : 0.07522399192836575,
+        "maxMeanDifferenceFuncValue" : 0.023848826871958207,
         "infoMinPointDistanceL2" : 0.0,
-        "infoMaxPointDistanceL2" : 1.4027595875238072,
-        "infoMinFuncDifference" : -6.450105858060162E-4,
-        "infoMaxFuncDifference" : 0.8011193645851016,
-        "infoStddevPointDistance" : 0.14227951170241054,
-        "infoStddevDifferenceFuncValue" : 0.054445311463520295
+        "infoMaxPointDistanceL2" : 1.564386140233547,
+        "infoMinFuncDifference" : -7.357495880544462E-6,
+        "infoMaxFuncDifference" : 0.33222591981368765,
+        "infoStddevPointDistance" : 0.09544596760319345,
+        "infoStddevDifferenceFuncValue" : 0.0336543527990736
       }
     }, {
       "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianMetricOptimizationProcessor",
@@ -59,8 +59,8 @@
     "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesOSM" : {
-        "stepCircleResolution" : 4,
-        "numberOfCircles" : 1,
+        "stepCircleResolution" : 5,
+        "numberOfCircles" : 4,
         "optimizationType" : "NELDER_MEAD",
         "varyStepDirection" : true,
         "movementType" : "ARBITRARY",

VadereOptimizationTests/TestNelderMead/scenarios/labyrinth.scenario

@@ -12,14 +12,14 @@
         "expectedResult" : "SUCCESS",
         "optimizationMetricProcessorId" : 2,
         "testEvacuationProcessorId" : 3,
-        "maxMeanPointDistance" : 0.12097956548754923,
-        "maxMeanDifferenceFuncValue" : 0.06502552049091297,
+        "maxMeanPointDistance" : 0.04348786203804414,
+        "maxMeanDifferenceFuncValue" : 0.02338581202140835,
         "infoMinPointDistanceL2" : 0.0,
-        "infoMaxPointDistanceL2" : 1.3058118129359295,
-        "infoMinFuncDifference" : -0.0012764912109695103,
-        "infoMaxFuncDifference" : 0.5078355644650969,
-        "infoStddevPointDistance" : 0.18731508797737528,
-        "infoStddevDifferenceFuncValue" : 0.0836097016329198
+        "infoMaxPointDistanceL2" : 0.8801307467971874,
+        "infoMinFuncDifference" : -0.0019591732715724675,
+        "infoMaxFuncDifference" : 0.2936029040890915,
+        "infoStddevPointDistance" : 0.05263515246267969,
+        "infoStddevDifferenceFuncValue" : 0.0357770532188485
       }
     }, {
       "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianMetricOptimizationProcessor",
@@ -31,7 +31,7 @@
       "attributes" : {
         "expectedResult" : "SUCCESS",
         "evacuationTimeProcessorId" : 4,
-        "maximalEvacuationTime" : 200.0,
+        "maximalEvacuationTime" : 300.0,
         "minimalEvacuationTime" : 0.0
       }
     }, {
@@ -78,8 +78,8 @@
         }
       },
       "org.vadere.state.attributes.models.AttributesOSM" : {
-        "stepCircleResolution" : 4,
-        "numberOfCircles" : 1,
+        "stepCircleResolution" : 5,
+        "numberOfCircles" : 4,
         "optimizationType" : "NELDER_MEAD",
         "varyStepDirection" : false,
         "movementType" : "ARBITRARY",
@@ -110,7 +110,7 @@
       }
     },
     "attributesSimulation" : {
-      "finishTime" : 200.0,
+      "finishTime" : 300.0,
       "simTimeStepLength" : 0.4,
       "realTimeSimTimeRatio" : 0.0,
       "writeSimulationData" : true,

VadereOptimizationTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario

@@ -12,14 +12,14 @@
         "expectedResult" : "SUCCESS",
         "optimizationMetricProcessorId" : 2,
         "testEvacuationProcessorId" : 3,
-        "maxMeanPointDistance" : 0.10117727754291686,
-        "maxMeanDifferenceFuncValue" : 0.06578728725037036,
-        "infoMinPointDistanceL2" : 1.9860273225978185E-15,
-        "infoMaxPointDistanceL2" : 1.381287718714383,
-        "infoMinFuncDifference" : -0.004389072407133376,
-        "infoMaxFuncDifference" : 2.685622269103443,
-        "infoStddevPointDistance" : 0.14060838183188207,
-        "infoStddevDifferenceFuncValue" : 0.1714766405903272
+        "maxMeanPointDistance" : 0.06743253584052734,
+        "maxMeanDifferenceFuncValue" : 0.03762845011019873,
+        "infoMinPointDistanceL2" : 0.0,
+        "infoMaxPointDistanceL2" : 1.1908766074958799,
+        "infoMinFuncDifference" : -0.007825774248588324,
+        "infoMaxFuncDifference" : 3.1836042315887085,
+        "infoStddevPointDistance" : 0.11888918094737598,
+        "infoStddevDifferenceFuncValue" : 0.14690668533173323
       }
     }, {
       "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianMetricOptimizationProcessor",
@@ -59,8 +59,8 @@
     "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
     "attributesModel" : {
       "org.vadere.state.attributes.models.AttributesOSM" : {
-        "stepCircleResolution" : 4,
-        "numberOfCircles" : 1,
+        "stepCircleResolution" : 5,
+        "numberOfCircles" : 4,
         "optimizationType" : "NELDER_MEAD",
         "varyStepDirection" : true,
         "movementType" : "ARBITRARY",

VadereOptimizationTests/TestNelderMead/scenarios/s2ucre.scenario

@@ -12,14 +12,14 @@
         "expectedResult" : "SUCCESS",
         "optimizationMetricProcessorId" : 2,
         "testEvacuationProcessorId" : 3,
-        "maxMeanPointDistance" : 0.10834411214886479,
-        "maxMeanDifferenceFuncValue" : 0.028939284596679084,
-        "infoMinPointDistanceL2" : 0.0047852776238586315,
-        "infoMaxPointDistanceL2" : 0.5644439334256358,
-        "infoMinFuncDifference" : 1.0201430488976371E-4,
-        "infoMaxFuncDifference" : 0.18037735004502053,
-        "infoStddevPointDistance" : 0.06414657689116453,
-        "infoStddevDifferenceFuncValue" : 0.023724652000537107
+        "maxMeanPointDistance" : 0.11145469470145097,
+        "maxMeanDifferenceFuncValue" : 0.023782107248396297,
+        "infoMinPointDistanceL2" : 0.005467775994727584,
+        "infoMaxPointDistanceL2" : 0.6825148285371956,
+        "infoMinFuncDifference" : 1.0532856536293878E-4,
+        "infoMaxFuncDifference" : 0.10498155287141664,
+        "infoStddevPointDistance" : 0.07134475478590001,
+        "infoStddevDifferenceFuncValue" : 0.0122377396313633
       }
     }, {
       "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianMetricOptimizationProcessor",
@@ -78,8 +78,8 @@
         }
       },
       "org.vadere.state.attributes.models.AttributesOSM" : {
-        "stepCircleResolution" : 4,
-        "numberOfCircles" : 1,
+        "stepCircleResolution" : 5,
+        "numberOfCircles" : 4,
         "optimizationType" : "NELDER_MEAD",
         "varyStepDirection" : false,
         "movementType" : "ARBITRARY",

VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java

@@ -133,7 +133,7 @@ public class PedestrianOSM extends Pedestrian {
 		} else {
 			VCircle reachableArea = new VCircle(getPosition(), getDesiredStepSize());
 
-			// get stairs pedestrian is on - remains null if on area
+			// get stairs object an agent may be on - remains null if agent is on area
 			Stairs stairs = null;
 			for (Stairs singleStairs : topography.getStairs()) {
 				if (singleStairs.getShape().contains(getPosition())) {
@@ -142,7 +142,7 @@ public class PedestrianOSM extends Pedestrian {
 				}
 			}
 
-			if (stairs == null) { // meaning pedestrian is on area
+			if (stairs == null) { // --> agent is on area
 
 				refreshRelevantPedestrians();
 				nextPosition = stepCircleOptimizer.getNextPosition(this, reachableArea);

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/tests/TestOptimizationMetricNelderMeadProcessor.java

@@ -87,8 +87,10 @@ public class TestOptimizationMetricNelderMeadProcessor extends TestProcessor {
 
 		if(pointDistanceL2Values.isEmpty() || differenceFuncValues.isEmpty()){
 			throw new NullPointerException("No values to compare. Reasons can be that i) there are no agents in the " +
-					"scenario, ii) the option to compare with the brute force is turned off or iii) or the optimizer " +
-					"does not support setting the OptimizationMetric. ");
+					"scenario, ii) the option to compare with the brute force is turned off (see " +
+					"`Testing.stepCircleOptimization.compareBruteForceSolution` in Vadere.conf) or iii) the " +
+					"optimizer does not support setting the OptimizationMetric of iv) the simulation failed " +
+					"unexpected.");
 		}
 
 		var metricStatistics = computeStatistics(pointDistanceL2Values, differenceFuncValues);
@@ -204,7 +206,6 @@ public class TestOptimizationMetricNelderMeadProcessor extends TestProcessor {
 		statistics.put("stddevDifferenceFuncValue", stddevDifferenceFuncValue);
 
 		return statistics;
-
 	}
 
 	@Override