add python script for seed test to gitlab pipeline (7083c1b7) · Commits · vadere / vadere

.gitignore

+2 −1

Original line number	Diff line number	Diff line
		@@ -11,8 +11,9 @@ __pycache__/
		*$py.class
		**/venv/
		Tools/VadereAnalysisTool/dist/
		Tools/VadereAnalysisTool/build/
		Tools/VadereAnalysisTool/VadereAnalysisTool.egg-info/

		Tools/ContinuousIntegration/**/output
		# C extensions
		*.so
		vadere_analysis_tool/build

.gitlab-ci.yml

+9 −0

Original line number	Diff line number	Diff line
		@@ -65,3 +65,12 @@ run_origin_test:
		- python3 Tools/ContinuousIntegration/install_vadere_analysis_tool.py
		- python3 Tools/ContinuousIntegration/run_orign_translation_test.py

		run_seed_test:
		stage: deploy

		script:
		- Documentation/version-control/git-hook-vadere-software
		- mvn clean
		- mvn -Dmaven.test.skip=true package
		- python3 Tools/ContinuousIntegration/install_vadere_analysis_tool.py
		- python3 Tools/ContinuousIntegration/run_seed_comparison_test.py

Tools/ContinuousIntegration/install_vadere_analysis_tool.py

+12 −6

Original line number	Diff line number	Diff line
		@@ -21,9 +21,12 @@ def install_package_if_needed(package_name='VadereAnalysisTool', search_path='To
		check=True,
		stdout=subprocess.PIPE,
		stderr=subprocess.PIPE)
		print("ReturnCode: {}\nStdOut: {} \nStdErr: {}".format(p_make_package.returncode,
		p_make_package.stdout.decode('utf8'),
		p_make_package.stderr.decode('utf8')))
		if p_make_package.stdout:
		print("StdOut: {}".format(p_make_package.stdout.decode('utf8')))
		if p_make_package.stderr:
		print("StdErr: {}".format(p_make_package.stderr.decode('utf8')))
		print("ReturnCode: {}".format(p_make_package.returncode))

		if p_make_package.returncode == 0:
		stdout = p_make_package.stdout.decode('utf8')
		dist_dir = os.path.join(search_path, "dist")
		@@ -41,9 +44,12 @@ def install_package_if_needed(package_name='VadereAnalysisTool', search_path='To
		stdout=subprocess.PIPE,
		stderr=subprocess.PIPE)

		print("ReturnCode: {}\nStdOut: {} \nStdErr: {}".format(p_install_package.returncode,
		p_install_package.stdout.decode('utf8'),
		p_install_package.stderr.decode('utf8')))
		if p_install_package.stdout:
		print("StdOut: {}".format(p_install_package.stdout.decode('utf8')))
		if p_install_package.stderr:
		print("StdErr: {}".format(p_install_package.stderr.decode('utf8')))
		print("ReturnCode: {}".format(p_install_package.returncode))

		else:
		exit(1)
		else:

Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/2_bridge_coordinates_kai_unit_with_offset.scenario

0 → 100644

+279 −0

Original line number	Diff line number	Diff line
		{
		"name" : "2_bridge_coordinates_kai_unit_with_offset",
		"description" : "",
		"release" : "0.6",
		"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
		"processWriters" : {
		"files" : [ {
		"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
		"filename" : "postvis.trajectories",
		"processors" : [ 1, 2 ]
		}, {
		"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
		"filename" : "overlaps.csv",
		"processors" : [ 3 ]
		}, {
		"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
		"filename" : "overlapCount.txt",
		"processors" : [ 4 ]
		} ],
		"processors" : [ {
		"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
		"id" : 1
		}, {
		"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
		"id" : 2
		}, {
		"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
		"id" : 3
		}, {
		"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
		"id" : 4,
		"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
		"attributes" : {
		"pedestrianOverlapProcessorId" : 3
		}
		} ],
		"isTimestamped" : true
		},
		"scenario" : {
		"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
		"attributesModel" : {
		"org.vadere.state.attributes.models.AttributesOSM" : {
		"stepCircleResolution" : 18,
		"numberOfCircles" : 1,
		"varyStepDirection" : false,
		"stepLengthIntercept" : 0.4625,
		"stepLengthSlopeSpeed" : 0.2345,
		"stepLengthSD" : 0.036,
		"movementThreshold" : 0.0,
		"optimizationType" : "NELDER_MEAD",
		"movementType" : "ARBITRARY",
		"dynamicStepLength" : false,
		"updateType" : "EVENT_DRIVEN",
		"seeSmallWalls" : false,
		"minimumStepLength" : false,
		"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
		"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
		"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
		"submodels" : [ ]
		},
		"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
		"pedPotentialIntimateSpaceWidth" : 0.45,
		"pedPotentialPersonalSpaceWidth" : 1.2,
		"pedPotentialHeight" : 50.0,
		"obstPotentialWidth" : 0.8,
		"obstPotentialHeight" : 6.0,
		"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" : {
		"finishTime" : 200.0,
		"simTimeStepLength" : 0.4,
		"realTimeSimTimeRatio" : 0.0,
		"writeSimulationData" : true,
		"visualizationEnabled" : true,
		"printFPS" : false,
		"digitsPerCoordinate" : 2,
		"useFixedSeed" : true,
		"fixedSeed" : -5104110572817619091,
		"simulationSeed" : 0
		},
		"topography" : {
		"attributes" : {
		"bounds" : {
		"x" : 564280.0,
		"y" : 5933391.0,
		"width" : 50.0,
		"height" : 50.0
		},
		"boundingBoxWidth" : 0.5,
		"bounded" : true
		},
		"obstacles" : [ {
		"shape" : {
		"type" : "POLYGON",
		"points" : [ {
		"x" : 564330.2959240791,
		"y" : 5933433.506680049
		}, {
		"x" : 564311.2959240791,
		"y" : 5933433.506680049
		}, {
		"x" : 564300.9318720899,
		"y" : 5933401.544835466
		}, {
		"x" : 564312.1291207125,
		"y" : 5933396.936819093
		}, {
		"x" : 564330.1291207125,
		"y" : 5933396.936819093
		} ]
		},
		"id" : 1
		}, {
		"shape" : {
		"type" : "POLYGON",
		"points" : [ {
		"x" : 564309.9431192318,
		"y" : 5933389.478288522
		}, {
		"x" : 564309.9431192318,
		"y" : 5933391.478288522
		}, {
		"x" : 564287.7114777192,
		"y" : 5933401.030658626
		}, {
		"x" : 564280.3263510215,
		"y" : 5933402.349890053
		}, {
		"x" : 564280.3263510215,
		"y" : 5933390.349890053
		} ]
		},
		"id" : 2
		}, {
		"shape" : {
		"type" : "POLYGON",
		"points" : [ {
		"x" : 564283.8886836024,
		"y" : 5933411.251412248
		}, {
		"x" : 564290.0683166787,
		"y" : 5933406.240937642
		}, {
		"x" : 564295.4593781466,
		"y" : 5933403.808810473
		}, {
		"x" : 564303.4638894079,
		"y" : 5933436.907734532
		}, {
		"x" : 564280.4638894079,
		"y" : 5933436.907734532
		} ]
		},
		"id" : -1
		} ],
		"stairs" : [ ],
		"targets" : [ {
		"id" : 1,
		"absorbing" : true,
		"shape" : {
		"type" : "POLYGON",
		"points" : [ {
		"x" : 564280.3,
		"y" : 5933402.3
		}, {
		"x" : 564280.1,
		"y" : 5933403.7
		}, {
		"x" : 564280.5,
		"y" : 5933414.2
		}, {
		"x" : 564283.9,
		"y" : 5933411.2
		} ]
		},
		"waitingTime" : 0.0,
		"waitingTimeYellowPhase" : 0.0,
		"parallelWaiters" : 0,
		"individualWaiting" : true,
		"deletionDistance" : 0.1,
		"startingWithRedLight" : false,
		"nextSpeed" : -1.0
		}, {
		"id" : 1,
		"absorbing" : true,
		"shape" : {
		"type" : "POLYGON",
		"points" : [ {
		"x" : 564313.9,
		"y" : 5933391.2
		}, {
		"x" : 564309.9,
		"y" : 5933391.5
		}, {
		"x" : 564312.3,
		"y" : 5933397.0
		}, {
		"x" : 564316.4,
		"y" : 5933395.9
		} ]
		},
		"waitingTime" : 0.0,
		"waitingTimeYellowPhase" : 0.0,
		"parallelWaiters" : 0,
		"individualWaiting" : true,
		"deletionDistance" : 0.1,
		"startingWithRedLight" : false,
		"nextSpeed" : -1.0
		} ],
		"sources" : [ {
		"id" : -1,
		"shape" : {
		"x" : 564304.3,
		"y" : 5933435.5,
		"width" : 8.0,
		"height" : 4.4,
		"type" : "RECTANGLE"
		},
		"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
		"distributionParameters" : [ 1.0 ],
		"spawnNumber" : 4,
		"maxSpawnNumberTotal" : -1,
		"startTime" : 0.0,
		"endTime" : 100.0,
		"spawnAtRandomPositions" : false,
		"useFreeSpaceOnly" : true,
		"targetIds" : [ 1 ],
		"groupSizeDistribution" : [ 1.0 ],
		"dynamicElementType" : "PEDESTRIAN"
		} ],
		"dynamicElements" : [ ],
		"attributesPedestrian" : {
		"radius" : 0.195,
		"densityDependentSpeed" : false,
		"speedDistributionMean" : 1.34,
		"speedDistributionStandardDeviation" : 0.26,
		"minimumSpeed" : 0.5,
		"maximumSpeed" : 2.2,
		"acceleration" : 2.0
		},
		"attributesCar" : {
		"id" : -1,
		"radius" : 0.195,
		"densityDependentSpeed" : false,
		"speedDistributionMean" : 1.34,
		"speedDistributionStandardDeviation" : 0.26,
		"minimumSpeed" : 0.5,
		"maximumSpeed" : 2.2,
		"acceleration" : 2.0,
		"length" : 4.5,
		"width" : 1.7,
		"direction" : {
		"x" : 1.0,
		"y" : 0.0
		}
		}
		}
		}
		}
		No newline at end of file

Tools/VadereAnalysisTool/vadere_analysis_tool/tests/testData/s2ucre/output/bridge_coordinates_kai_2018-10-15_10-34-43.80/bridge_coordinates_kai.scenario→Tools/ContinuousIntegration/run_seed_comparison_test.d/scenarios/bridge_coordinates_kai.scenario

+2 −3

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		"name" : "bridge_coordinates_kai",
		"description" : "",
		"release" : "0.6",
		"commithash" : "topographyWarning: no commit hash",
		"processWriters" : {
		"files" : [ {
		"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
		@@ -96,7 +95,7 @@
		"digitsPerCoordinate" : 2,
		"useFixedSeed" : true,
		"fixedSeed" : -3213925745664992646,
		"simulationSeed" : -3213925745664992646
		"simulationSeed" : 0
		},
		"topography" : {
		"attributes" : {

Admin message