add new scenario version

* add new fields to AttributeOSM
* correct typo in PedestrianDensityGaussianProcessor

CHANGELOG.md

@@ -50,7 +50,7 @@
   * "overlaps": The amount the two pedestrian overlap
 - Moved and renamed attributes in scenario files. (c7e0538c: State)
   * Move /scenario/attributesModel/org.vadere.state.attributes.models.AttributesCGM/groupSizeDistribution to each source in /scenario/topography/sources/[]/groupSizeDistribution. This allows different group size distribution for each source
-  * Rename /scenario/attributesModel/*/timeCostAttributes/standardDerivation to standardDeviation.
+  * Rename /scenario/attributesModel/*/timeCostAttributes/standardDeviation to standardDeviation.
 
 ### Performance
 

VadereGui/testResources/test-scenario.scenario

 {
   "name" : "Neues_Szenario",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ {
@@ -67,8 +67,8 @@
       "attributes" : {
         "pedestrianPositionProcessorId" : 1,
         "scale" : 10.0,
-        "standardDerivation" : 0.7,
-        "obstacleDensity" : true
+        "obstacleDensity" : true,
+        "standardDeviation" : 0.7
       }
     }, {
       "type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityVoronoiProcessor",
@@ -228,7 +228,9 @@
         "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
         "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompact",
         "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompact",
-        "submodels" : [ ]
+        "submodels" : [ ],
+        "minStepLength" : "0.4625",
+        "maxStepDuration" : "1.7976931348623157E308"
       },
       "org.vadere.state.attributes.models.AttributesPotentialCompact" : {
         "pedPotentialWidth" : 0.5,
@@ -338,8 +340,8 @@
         "maximumSpeed" : 3.0,
         "acceleration" : 2.0
       },
-      "attributesCar" : null,
-      "dynamicElements" : [ ]
+      "dynamicElements" : [ ],
+      "attributesCar" : null
     }
   }
 }
\ No newline at end of file

VadereModelTests/TESTOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario

 {
   "name" : "basic_5_1_roadReachTarget_ovm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TESTOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario

 {
   "name" : "basic_5_2_roadReachTarget_ovm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TESTOVM/scenarios/testtrafficlight.scenario

 {
   "name" : "testtrafficlight",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],
@@ -45,7 +45,9 @@
         "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
         "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompact",
         "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompact",
-        "submodels" : [ ]
+        "submodels" : [ ],
+        "minStepLength" : "0.4625",
+        "maxStepDuration" : "1.7976931348623157E308"
       },
       "org.vadere.state.attributes.models.AttributesPotentialCompact" : {
         "pedPotentialWidth" : 0.5,

VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario

 {
   "name" : "basic_1_chicken_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario

 {
   "name" : "basic_1_chicken_gnm1_displaced",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
+  "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],
     "processors" : [ ],
@@ -138,7 +139,6 @@
         "groupSizeDistribution" : [ 1.0 ],
         "dynamicElementType" : "PEDESTRIAN"
       } ],
-      "dynamicElements" : [ ],
       "attributesPedestrian" : {
         "radius" : 0.195,
         "densityDependentSpeed" : false,
@@ -148,7 +148,8 @@
         "maximumSpeed" : 2.2,
         "acceleration" : 2.0
       },
-      "attributesCar" : null
+      "attributesCar" : null,
+      "dynamicElements" : [ ]
     }
   }
 }
\ No newline at end of file

VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario

 {
   "name" : "basic_1_chicken_gnm2",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario

 {
   "name" : "basic_2_density_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario

 {
   "name" : "basic_3_1_wall_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario

 {
   "name" : "basic_3_2_wall_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario

 {
   "name" : "basic_3_3_wall_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario

 {
   "name" : "basic_4_1_wall_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario

 {
   "name" : "basic_4_2_wall_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario

 {
   "name" : "rimea_01_pathway_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_025_h",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_050_h",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_075_h",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_100_h",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario

 {
   "name" : "rimea_04_flow_gnm1_125_h",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario

 {
   "name" : "rimea_05_react_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario

 {
   "name" : "rimea_06_corner_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario

 {
   "name" : "rimea_07_speeds_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario

 {
   "name" : "rimea_09_publicRoom_gnm1_2",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario

 {
   "name" : "rimea_09_publicRoom_gnm1_4",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario

 {
   "name" : "rimea_10_pathfinding_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario

 {
   "name" : "rimea_11_exitSelection_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario

 {
   "name" : "rimea_12_evacuation_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario

 {
   "name" : "rimea_13_stairs_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario

 {
   "name" : "rimea_14_selectRoute_gnm1",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
   "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ ],

VadereModelTests/TestNonWorkingFeatures/scenarios/cooperative_behavior_agents_get_stuck.scenario

 {
   "name" : "cooperative_behavior_agents_get_stuck",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
+  "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ {
       "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
@@ -38,6 +39,23 @@
   "scenario" : {
     "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
     "attributesModel" : {
+      "org.vadere.state.attributes.models.AttributesFloorField" : {
+        "createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
+        "potentialFieldResolution" : 0.1,
+        "obstacleGridPenalty" : 0.1,
+        "targetAttractionStrength" : 1.0,
+        "timeCostAttributes" : {
+          "standardDeviation" : 0.7,
+          "type" : "UNIT",
+          "obstacleDensityWeight" : 3.5,
+          "pedestrianSameTargetDensityWeight" : 3.5,
+          "pedestrianOtherTargetDensityWeight" : 3.5,
+          "pedestrianWeight" : 3.5,
+          "queueWidthLoading" : 1.0,
+          "pedestrianDynamicWeight" : 6.0,
+          "loadingType" : "CONSTANT"
+        }
+      },
       "org.vadere.state.attributes.models.AttributesOSM" : {
         "stepCircleResolution" : 18,
         "numberOfCircles" : 1,
@@ -55,7 +73,9 @@
         "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
         "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
         "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
-        "submodels" : [ ]
+        "submodels" : [ ],
+        "minStepLength" : "0.4625",
+        "maxStepDuration" : "1.7976931348623157E308"
       },
       "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
         "pedPotentialIntimateSpaceWidth" : 0.45,
@@ -66,23 +86,6 @@
         "intimateSpaceFactor" : 1.2,
         "personalSpacePower" : 1,
         "intimateSpacePower" : 1
-      },
-      "org.vadere.state.attributes.models.AttributesFloorField" : {
-        "createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
-        "potentialFieldResolution" : 0.1,
-        "obstacleGridPenalty" : 0.1,
-        "targetAttractionStrength" : 1.0,
-        "timeCostAttributes" : {
-          "standardDeviation" : 0.7,
-          "type" : "UNIT",
-          "obstacleDensityWeight" : 3.5,
-          "pedestrianSameTargetDensityWeight" : 3.5,
-          "pedestrianOtherTargetDensityWeight" : 3.5,
-          "pedestrianWeight" : 3.5,
-          "queueWidthLoading" : 1.0,
-          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
-        }
       }
     },
     "attributesSimulation" : {
@@ -186,7 +189,6 @@
         "groupSizeDistribution" : [ 1.0 ],
         "dynamicElementType" : "PEDESTRIAN"
       } ],
-      "dynamicElements" : [ ],
       "attributesPedestrian" : {
         "radius" : 0.195,
         "densityDependentSpeed" : false,
@@ -211,8 +213,8 @@
           "x" : 1.0,
           "y" : 0.0
         }
-      }
-    },
-    "eventInfos" : [ ]
+      },
+      "dynamicElements" : [ ]
+    }
   }
 }
\ No newline at end of file

VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario

 {
   "name" : "basic_2_density_discrete_ca",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
+  "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ {
       "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
@@ -88,7 +89,9 @@
         "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
         "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
         "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
-        "submodels" : [ ]
+        "submodels" : [ ],
+        "minStepLength" : "0.4625",
+        "maxStepDuration" : "1.7976931348623157E308"
       },
       "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
         "pedPotentialIntimateSpaceWidth" : 0.45,
@@ -201,7 +204,6 @@
         "groupSizeDistribution" : [ 1.0 ],
         "dynamicElementType" : "PEDESTRIAN"
       } ],
-      "dynamicElements" : [ ],
       "attributesPedestrian" : {
         "radius" : 0.195,
         "densityDependentSpeed" : false,
@@ -211,7 +213,8 @@
         "maximumSpeed" : 2.2,
         "acceleration" : 2.0
       },
-      "attributesCar" : null
+      "attributesCar" : null,
+      "dynamicElements" : [ ]
     }
   }
 }
\ No newline at end of file

VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario

 {
   "name" : "basic_2_density_pso",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
+  "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ {
       "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
@@ -76,7 +77,9 @@
         "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
         "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
         "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
-        "submodels" : [ ]
+        "submodels" : [ ],
+        "minStepLength" : "0.4625",
+        "maxStepDuration" : "1.7976931348623157E308"
       },
       "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
         "pedPotentialIntimateSpaceWidth" : 0.45,
@@ -189,7 +192,6 @@
         "groupSizeDistribution" : [ 1.0 ],
         "dynamicElementType" : "PEDESTRIAN"
       } ],
-      "dynamicElements" : [ ],
       "attributesPedestrian" : {
         "radius" : 0.195,
         "densityDependentSpeed" : false,
@@ -199,7 +201,8 @@
         "maximumSpeed" : 2.2,
         "acceleration" : 2.0
       },
-      "attributesCar" : null
+      "attributesCar" : null,
+      "dynamicElements" : [ ]
     }
   }
 }
\ No newline at end of file

VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario

 {
   "name" : "chicken_floorfield_displaced_ok",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
+  "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ {
       "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
@@ -93,7 +94,9 @@
         "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
         "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
         "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
-        "submodels" : [ ]
+        "submodels" : [ ],
+        "minStepLength" : "0.4625",
+        "maxStepDuration" : "1.7976931348623157E308"
       },
       "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
         "pedPotentialIntimateSpaceWidth" : 0.45,
@@ -197,7 +200,6 @@
         "groupSizeDistribution" : [ 1.0 ],
         "dynamicElementType" : "PEDESTRIAN"
       } ],
-      "dynamicElements" : [ ],
       "attributesPedestrian" : {
         "radius" : 0.195,
         "densityDependentSpeed" : false,
@@ -207,7 +209,8 @@
         "maximumSpeed" : 2.2,
         "acceleration" : 2.0
       },
-      "attributesCar" : null
+      "attributesCar" : null,
+      "dynamicElements" : [ ]
     }
   }
 }
\ No newline at end of file

VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario

 {
   "name" : "chicken_floorfield_ok",
   "description" : "",
-  "release" : "0.6",
+  "release" : "0.7",
+  "commithash" : "warning: no commit hash",
   "processWriters" : {
     "files" : [ {
       "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
@@ -103,7 +104,9 @@
         "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
         "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
         "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
-        "submodels" : [ ]
+        "submodels" : [ ],
+        "minStepLength" : "0.4625",
+        "maxStepDuration" : "1.7976931348623157E308"
       },
       "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
         "pedPotentialIntimateSpaceWidth" : 0.45,
@@ -207,7 +210,6 @@
         "groupSizeDistribution" : [ 1.0 ],
         "dynamicElementType" : "PEDESTRIAN"
       } ],
-      "dynamicElements" : [ ],
       "attributesPedestrian" : {
         "radius" : 0.195,
         "densityDependentSpeed" : false,
@@ -217,7 +219,8 @@
         "maximumSpeed" : 2.2,
         "acceleration" : 2.0
       },
-      "attributesCar" : null
+      "attributesCar" : null,
+      "dynamicElements" : [ ]
     }
   }