Commit 5d97753e authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

Merge branch 'develop' of https://gitlab.lrz.de/vadere/vadere into develop

parents 8b4c313d 79268262
...@@ -3,6 +3,9 @@ target/ ...@@ -3,6 +3,9 @@ target/
*.out *.out
*.preferences.xml *.preferences.xml
#Tools and build utils
bin/
#IntelliJ #IntelliJ
.idea/ .idea/
*.iml *.iml
...@@ -17,9 +20,11 @@ target/ ...@@ -17,9 +20,11 @@ target/
VadereGui/*.png VadereGui/*.png
VadereGui/*.svg VadereGui/*.svg
VadereGui/*.mov VadereGui/*.mov
VadereGui/testResources/**/*.legacy
VadereUtils/testreports/*.txt VadereUtils/testreports/*.txt
VadereUtils/output/* VadereUtils/output/*
VadereSimulator/resources/current_commit_hash.txt VadereSimulator/resources/current_commit_hash.txt
VadereSimulator/testResources/**/*.legacy
#model test output #model test output
VadereModelTests/TestOSM/output/* VadereModelTests/TestOSM/output/*
...@@ -41,7 +46,6 @@ VadereModelTests/TestOVM/processed output/* ...@@ -41,7 +46,6 @@ VadereModelTests/TestOVM/processed output/*
VadereUtils/output/* VadereUtils/output/*
#deprecated: can potentially be removed #deprecated: can potentially be removed
bin/
VadereGui/output/ VadereGui/output/
#mac osx files #mac osx files
......
{ {
"name" : "Neues_Szenario", "name" : "Neues_Szenario",
"description" : "", "description" : "",
"release" : "0.3", "release" : "0.4",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -194,6 +194,23 @@ ...@@ -194,6 +194,23 @@
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : { "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" : { "org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18, "stepCircleResolution" : 18,
"numberOfCircles" : 1, "numberOfCircles" : 1,
...@@ -221,23 +238,6 @@ ...@@ -221,23 +238,6 @@
"useHardBodyShell" : false, "useHardBodyShell" : false,
"obstDistanceDeviation" : 0.0, "obstDistanceDeviation" : 0.0,
"visionFieldRadius" : 5.0 "visionFieldRadius" : 5.0
},
"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" : { "attributesSimulation" : {
...@@ -249,8 +249,9 @@ ...@@ -249,8 +249,9 @@
"printFPS" : false, "printFPS" : false,
"needsBoundary" : false, "needsBoundary" : false,
"digitsPerCoordinate" : 2, "digitsPerCoordinate" : 2,
"useRandomSeed" : true, "useFixedSeed" : true,
"randomSeed" : 1 "fixedSeed" : 1,
"simulationSeed" : null
}, },
"topography" : { "topography" : {
"attributes" : { "attributes" : {
...@@ -338,8 +339,8 @@ ...@@ -338,8 +339,8 @@
"maximumSpeed" : 3.0, "maximumSpeed" : 3.0,
"acceleration" : 2.0 "acceleration" : 2.0
}, },
"attributesCar" : null, "dynamicElements" : [ ],
"dynamicElements" : [ ] "attributesCar" : null
} }
} }
} }
\ No newline at end of file
{ {
"name" : "basic_5_1_roadReachTarget_ovm1", "name" : "basic_5_1_roadReachTarget_ovm1",
"description" : "", "description" : "",
"release" : "0.3", "release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -53,8 +54,9 @@ ...@@ -53,8 +54,9 @@
"printFPS" : false, "printFPS" : false,
"needsBoundary" : false, "needsBoundary" : false,
"digitsPerCoordinate" : 2, "digitsPerCoordinate" : 2,
"useRandomSeed" : true, "useFixedSeed" : true,
"randomSeed" : 1 "fixedSeed" : 1,
"simulationSeed" : null
}, },
"topography" : { "topography" : {
"attributes" : { "attributes" : {
...@@ -108,7 +110,6 @@ ...@@ -108,7 +110,6 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "CAR" "dynamicElementType" : "CAR"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -133,7 +134,8 @@ ...@@ -133,7 +134,8 @@
"x" : 1.0, "x" : 1.0,
"y" : 0.0 "y" : 0.0
} }
} },
"dynamicElements" : [ ]
} }
} }
} }
\ No newline at end of file
{ {
"name" : "basic_5_2_roadReachTarget_ovm1", "name" : "basic_5_2_roadReachTarget_ovm1",
"description" : "", "description" : "",
"release" : "0.3", "release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -53,8 +54,9 @@ ...@@ -53,8 +54,9 @@
"printFPS" : false, "printFPS" : false,
"needsBoundary" : false, "needsBoundary" : false,
"digitsPerCoordinate" : 2, "digitsPerCoordinate" : 2,
"useRandomSeed" : true, "useFixedSeed" : true,
"randomSeed" : 1 "fixedSeed" : 1,
"simulationSeed" : null
}, },
"topography" : { "topography" : {
"attributes" : { "attributes" : {
...@@ -125,7 +127,6 @@ ...@@ -125,7 +127,6 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "CAR" "dynamicElementType" : "CAR"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -150,7 +151,8 @@ ...@@ -150,7 +151,8 @@
"x" : 1.0, "x" : 1.0,
"y" : 0.0 "y" : 0.0
} }
} },
"dynamicElements" : [ ]
} }
} }
} }
\ No newline at end of file
{ {
"name" : "testtrafficlight", "name" : "testtrafficlight",
"description" : "", "description" : "",
"release" : "0.3", "release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -10,6 +11,23 @@ ...@@ -10,6 +11,23 @@
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : { "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" : { "org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18, "stepCircleResolution" : 18,
"numberOfCircles" : 1, "numberOfCircles" : 1,
...@@ -37,23 +55,6 @@ ...@@ -37,23 +55,6 @@
"useHardBodyShell" : false, "useHardBodyShell" : false,
"obstDistanceDeviation" : 0.0, "obstDistanceDeviation" : 0.0,
"visionFieldRadius" : 5.0 "visionFieldRadius" : 5.0
},
"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" : { "attributesSimulation" : {
...@@ -65,8 +66,9 @@ ...@@ -65,8 +66,9 @@
"printFPS" : false, "printFPS" : false,
"needsBoundary" : false, "needsBoundary" : false,
"digitsPerCoordinate" : 2, "digitsPerCoordinate" : 2,
"useRandomSeed" : true, "useFixedSeed" : true,
"randomSeed" : 1 "fixedSeed" : 1,
"simulationSeed" : null
}, },
"topography" : { "topography" : {
"attributes" : { "attributes" : {
...@@ -137,7 +139,6 @@ ...@@ -137,7 +139,6 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -162,7 +163,8 @@ ...@@ -162,7 +163,8 @@
"x" : 1.0, "x" : 1.0,
"y" : 0.0 "y" : 0.0
} }
} },
"dynamicElements" : [ ]
} }
} }
} }
\ No newline at end of file
{ {
"name" : "basic_1_chicken_gnm1", "name" : "basic_1_chicken_gnm1",
"description" : "", "description" : "",
"release" : "0.3", "release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -10,19 +11,6 @@ ...@@ -10,19 +11,6 @@
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesGNM" : {
"attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45",
"stepSizeMin" : 1.0E-4,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
},
"floorGradientProviderType" : "FLOOR_EIKONAL_DISCRETE",
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldPedestrianGNM",
"obstaclePotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldObstacleGNM"
},
"org.vadere.state.attributes.models.AttributesFloorField" : { "org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING", "createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
...@@ -40,6 +28,19 @@ ...@@ -40,6 +28,19 @@
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT"
} }
}, },
"org.vadere.state.attributes.models.AttributesGNM" : {
"attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45",
"stepSizeMin" : 1.0E-4,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
},
"floorGradientProviderType" : "FLOOR_EIKONAL_DISCRETE",
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldPedestrianGNM",
"obstaclePotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldObstacleGNM"
},
"org.vadere.state.attributes.models.AttributesPotentialGNM" : { "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
"pedestrianBodyPotential" : 3.59, "pedestrianBodyPotential" : 3.59,
"pedestrianRecognitionDistance" : 0.7, "pedestrianRecognitionDistance" : 0.7,
...@@ -56,8 +57,9 @@ ...@@ -56,8 +57,9 @@
"printFPS" : false, "printFPS" : false,
"needsBoundary" : false, "needsBoundary" : false,
"digitsPerCoordinate" : 2, "digitsPerCoordinate" : 2,
"useRandomSeed" : true, "useFixedSeed" : true,
"randomSeed" : 1 "fixedSeed" : 1,
"simulationSeed" : null
}, },
"topography" : { "topography" : {
"attributes" : { "attributes" : {
...@@ -138,7 +140,6 @@ ...@@ -138,7 +140,6 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -148,7 +149,8 @@ ...@@ -148,7 +149,8 @@
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0
}, },
"attributesCar" : null "attributesCar" : null,
"dynamicElements" : [ ]
} }
} }
} }
\ No newline at end of file
{ {
"name" : "basic_1_chicken_gnm2", "name" : "basic_1_chicken_gnm2",
"description" : "", "description" : "",
"release" : "0.3", "release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -10,19 +11,6 @@ ...@@ -10,19 +11,6 @@
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesGNM" : {
"attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45",
"stepSizeMin" : 1.0E-4,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
},
"floorGradientProviderType" : "FLOOR_EUCLIDEAN_CONTINUOUS",
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldPedestrianGNM",
"obstaclePotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldObstacleGNM"
},
"org.vadere.state.attributes.models.AttributesFloorField" : { "org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "NONE", "createMethod" : "NONE",
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
...@@ -40,6 +28,19 @@ ...@@ -40,6 +28,19 @@
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT"
} }
}, },
"org.vadere.state.attributes.models.AttributesGNM" : {
"attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45",
"stepSizeMin" : 1.0E-4,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
},
"floorGradientProviderType" : "FLOOR_EUCLIDEAN_CONTINUOUS",
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldPedestrianGNM",
"obstaclePotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldObstacleGNM"
},
"org.vadere.state.attributes.models.AttributesPotentialGNM" : { "org.vadere.state.attributes.models.AttributesPotentialGNM" : {
"pedestrianBodyPotential" : 3.59, "pedestrianBodyPotential" : 3.59,
"pedestrianRecognitionDistance" : 0.7, "pedestrianRecognitionDistance" : 0.7,
...@@ -56,8 +57,9 @@ ...@@ -56,8 +57,9 @@
"printFPS" : false, "printFPS" : false,
"needsBoundary" : false, "needsBoundary" : false,
"digitsPerCoordinate" : 2, "digitsPerCoordinate" : 2,
"useRandomSeed" : true, "useFixedSeed" : true,
"randomSeed" : 1 "fixedSeed" : 1,
"simulationSeed" : null
}, },
"topography" : { "topography" : {
"attributes" : { "attributes" : {
...@@ -138,7 +140,6 @@ ...@@ -138,7 +140,6 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -148,7 +149,8 @@ ...@@ -148,7 +149,8 @@
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0
}, },
"attributesCar" : null "attributesCar" : null,
"dynamicElements" : [ ]
} }
} }
} }
\ No newline at end of file
{ {
"name" : "basic_2_density_gnm1", "name" : "basic_2_density_gnm1",
"description" : "", "description" : "",
"release" : "0.3", "release" : "0.4",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -10,19 +11,6 @@ ...@@ -10,19 +11,6 @@
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel", "mainModel" : "org.vadere.simulator.models.gnm.GradientNavigationModel",
"attributesModel" : { "attributesModel" : {
"org.vadere.state.attributes.models.AttributesGNM" : {
"attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45",
"stepSizeMin" : 1.0E-4,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
},
"floorGradientProviderType" : "FLOOR_EIKONAL_DISCRETE",
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldPedestrianGNM",
"obstaclePotentialModel" : "org.vadere.simulator.models.gnm.PotentialFieldObstacleGNM"
},
"org.vadere.state.attributes.models.AttributesFloorField" : { "org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING", "createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
...@@ -40,6 +28,19 @@ ...@@ -40,6 +28,19 @@
"loadingType" : "CONSTANT"