Merge branch 'group_models' into 'master' (05c5ba9c) · Commits · vadere / vadere

.gitignore

+10 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,16 @@ __pycache__/
		Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool.egg-info/
		Tools/VadereAnalysisTools/VadereAnalysisTool/build/
		Tools/VadereAnalysisTools/VadereAnalysisTool/dist/
		# Jupyter Notebooks
		**/.ipynb_checkpoints

		#model test output
		VadereModelTests/**/output
		VadereModelTests/*_private
		VadereModelCalibration/**/output
		VadereModelTests/**/legacy
		VadereUtils/output/**
		VadereModelTests/*_private

		# Operating system files
		.DS_Store

Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario

+25 −21

Original line number	Diff line number	Diff line
		{
		"name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset",
		"description" : "",
		"release" : "0.6",
		"release" : "0.8",
		"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
		"processWriters" : {
		"files" : [ {
		@@ -39,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" : "NAVIGATION",
		"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,
		@@ -56,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.1",
		"maxStepDuration" : "1.7976931348623157E308"
		},
		"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
		"pedPotentialIntimateSpaceWidth" : 0.45,
		@@ -67,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" : "NAVIGATION",
		"obstacleDensityWeight" : 3.5,
		"pedestrianSameTargetDensityWeight" : 3.5,
		"pedestrianOtherTargetDensityWeight" : 3.5,
		"pedestrianWeight" : 3.5,
		"queueWidthLoading" : 1.0,
		"pedestrianDynamicWeight" : 6.0,
		"loadingType" : "CONSTANT"
		}
		}
		},
		"attributesSimulation" : {
		@@ -98,6 +100,7 @@
		"fixedSeed" : -5104110572817619091,
		"simulationSeed" : 0
		},
		"eventInfos" : [ ],
		"topography" : {
		"attributes" : {
		"bounds" : {
		@@ -248,7 +251,6 @@
		"groupSizeDistribution" : [ 1.0 ],
		"dynamicElementType" : "PEDESTRIAN"
		} ],
		"dynamicElements" : [ ],
		"attributesPedestrian" : {
		"radius" : 0.195,
		"densityDependentSpeed" : false,
		@@ -273,7 +275,9 @@
		"x" : 1.0,
		"y" : 0.0
		}
		}
		},
		"dynamicElements" : [ ],
		"teleporter" : null
		}
		}
		}
		No newline at end of file

Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario

+25 −21

Original line number	Diff line number	Diff line
		{
		"name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset",
		"description" : "",
		"release" : "0.6",
		"release" : "0.8",
		"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
		"processWriters" : {
		"files" : [ {
		@@ -39,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" : "NAVIGATION",
		"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,
		@@ -56,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.1",
		"maxStepDuration" : "1.7976931348623157E308"
		},
		"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
		"pedPotentialIntimateSpaceWidth" : 0.45,
		@@ -67,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" : "NAVIGATION",
		"obstacleDensityWeight" : 3.5,
		"pedestrianSameTargetDensityWeight" : 3.5,
		"pedestrianOtherTargetDensityWeight" : 3.5,
		"pedestrianWeight" : 3.5,
		"queueWidthLoading" : 1.0,
		"pedestrianDynamicWeight" : 6.0,
		"loadingType" : "CONSTANT"
		}
		}
		},
		"attributesSimulation" : {
		@@ -98,6 +100,7 @@
		"fixedSeed" : -5104110572817619091,
		"simulationSeed" : 0
		},
		"eventInfos" : [ ],
		"topography" : {
		"attributes" : {
		"bounds" : {
		@@ -248,7 +251,6 @@
		"groupSizeDistribution" : [ 1.0 ],
		"dynamicElementType" : "PEDESTRIAN"
		} ],
		"dynamicElements" : [ ],
		"attributesPedestrian" : {
		"radius" : 0.195,
		"densityDependentSpeed" : false,
		@@ -273,7 +275,9 @@
		"x" : 1.0,
		"y" : 0.0
		}
		}
		},
		"dynamicElements" : [ ],
		"teleporter" : null
		}
		}
		}
		No newline at end of file

Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_with_offset.scenario

+25 −21

Original line number	Diff line number	Diff line
		{
		"name" : "2_bridge_coordinates_kai_navigation_with_offset",
		"description" : "",
		"release" : "0.6",
		"release" : "0.8",
		"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
		"processWriters" : {
		"files" : [ {
		@@ -39,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" : "NAVIGATION",
		"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,
		@@ -56,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.1",
		"maxStepDuration" : "1.7976931348623157E308"
		},
		"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
		"pedPotentialIntimateSpaceWidth" : 0.45,
		@@ -67,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" : "NAVIGATION",
		"obstacleDensityWeight" : 3.5,
		"pedestrianSameTargetDensityWeight" : 3.5,
		"pedestrianOtherTargetDensityWeight" : 3.5,
		"pedestrianWeight" : 3.5,
		"queueWidthLoading" : 1.0,
		"pedestrianDynamicWeight" : 6.0,
		"loadingType" : "CONSTANT"
		}
		}
		},
		"attributesSimulation" : {
		@@ -98,6 +100,7 @@
		"fixedSeed" : -5104110572817619091,
		"simulationSeed" : 0
		},
		"eventInfos" : [ ],
		"topography" : {
		"attributes" : {
		"bounds" : {
		@@ -248,7 +251,6 @@
		"groupSizeDistribution" : [ 1.0 ],
		"dynamicElementType" : "PEDESTRIAN"
		} ],
		"dynamicElements" : [ ],
		"attributesPedestrian" : {
		"radius" : 0.195,
		"densityDependentSpeed" : false,
		@@ -273,7 +275,9 @@
		"x" : 1.0,
		"y" : 0.0
		}
		}
		},
		"dynamicElements" : [ ],
		"teleporter" : null
		}
		}
		}
		No newline at end of file

Tools/ContinuousIntegration/run_orign_translation_test.d/scenarios/2_bridge_coordinates_kai_navigation_without_offset.scenario

+25 −21

Original line number	Diff line number	Diff line
		{
		"name" : "2_bridge_coordinates_kai_navigation_without_offset",
		"description" : "",
		"release" : "0.6",
		"release" : "0.8",
		"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
		"processWriters" : {
		"files" : [ {
		@@ -39,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" : "NAVIGATION",
		"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,
		@@ -56,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.1",
		"maxStepDuration" : "1.7976931348623157E308"
		},
		"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
		"pedPotentialIntimateSpaceWidth" : 0.45,
		@@ -67,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" : "NAVIGATION",
		"obstacleDensityWeight" : 3.5,
		"pedestrianSameTargetDensityWeight" : 3.5,
		"pedestrianOtherTargetDensityWeight" : 3.5,
		"pedestrianWeight" : 3.5,
		"queueWidthLoading" : 1.0,
		"pedestrianDynamicWeight" : 6.0,
		"loadingType" : "CONSTANT"
		}
		}
		},
		"attributesSimulation" : {
		@@ -98,6 +100,7 @@
		"fixedSeed" : -5104110572817619091,
		"simulationSeed" : 0
		},
		"eventInfos" : [ ],
		"topography" : {
		"attributes" : {
		"bounds" : {
		@@ -248,7 +251,6 @@
		"groupSizeDistribution" : [ 1.0 ],
		"dynamicElementType" : "PEDESTRIAN"
		} ],
		"dynamicElements" : [ ],
		"attributesPedestrian" : {
		"radius" : 0.195,
		"densityDependentSpeed" : false,
		@@ -273,7 +275,9 @@
		"x" : 1.0,
		"y" : 0.0
		}
		}
		},
		"dynamicElements" : [ ],
		"teleporter" : null
		}
		}
		}
		No newline at end of file

Admin message