Skip to content

V
vadere
Commit ecfbb5e2 authored by hm-schuhba1's avatar hm-schuhba1
Browse files
Options

add additional CI steps to test seed and origin translation Merge branch '151_diff_origin'

parents d30dc9c4 2631a2ac
Pipeline #76385 failed with stages
      in 105 minutes and 27 seconds
      Expand all Hide whitespace changes
      Inline Side-by-side
      Showing with 1486575 additions and 9 deletions
      .gitignore
      View file @ ecfbb5e2
      ......@@ -4,6 +4,20 @@ target/
      *.preferences.xml
      swing-inspector-linux-1.2.3/
      #Python
      # Byte-compiled / optimized / DLL files
      __pycache__/
      *.py[cod]
      *$py.class
      **/venv/
      Tools/VadereAnalysisTool/dist/
      Tools/VadereAnalysisTool/build/
      Tools/VadereAnalysisTool/VadereAnalysisTool.egg-info/
      Tools/ContinuousIntegration/**/output
      # C extensions
      *.so
      vadere_analysis_tool/build
      #Tools and build utils
      bin/
      ......@@ -46,6 +60,7 @@ VadereModelTests/TestSFM/processed output/*
      VadereModelTests/TestGNM/processed output/*
      VadereModelTests/TestOVM/processed output/*
      VadereUtils/output/*
      VadereModelTests/*_private
      #deprecated: can potentially be removed
      VadereGui/output/
      ......
      .gitlab-ci.yml
      View file @ ecfbb5e2
      ......@@ -46,12 +46,31 @@ unit_tests_with_coverage:
      - mvn -Dtest=!TestConvolution,!TestBitonicSort,!TestCLLinkedList,!TestCLOptimalStepsModel test
      - python3 Tools/ContinuousIntegration/collect_line_and_branch_coverage.py
      run_scenario_files:
      run_origin_test:
      stage: deploy
      script:
      - Documentation/version-control/git-hook-vadere-software
      - mvn clean
      - mvn -Dmaven.test.skip=true package
      - python3 Tools/VadereAnalysisTool/setup.py install --user
      - 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/run_vadere_console_with_all_scenario_files.py
      - python3 Tools/VadereAnalysisTool/setup.py install --user
      - python3 Tools/ContinuousIntegration/run_seed_comparison_test.py
      run_scenario_files:
      stage: deploy
      script:
      - Documentation/version-control/git-hook-vadere-software
      - mvn clean
      - mvn -Dmaven.test.skip=true package
      - python3 Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py
      \ No newline at end of file
      Tools/ContinuousIntegration/run_orign_translation_test.d/output/2_bridge_coordinates_kai_navigation_random_pos_with_offset/2_bridge_coordinates_kai_navigation_random_pos_with_offset.scenario 0 → 100644
      View file @ ecfbb5e2
      {
      "name" : "2_bridge_coordinates_kai_navigation_random_pos_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" : "NAVIGATION",
      "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" : -5104110572817619091
      },
      "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" : true,
      "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
      }
      }
      }
      }
      }
      Tools/ContinuousIntegration/run_orign_translation_test.d/output/2_bridge_coordinates_kai_navigation_random_pos_with_offset/overlaps.csv 0 → 100644
      View file @ ecfbb5e2
      timeStep pedestrianId overlapPedestrianId distance overlaps
      194 175 230 0.3808849709997803 0.00911502900021971
      Tools/ContinuousIntegration/run_orign_translation_test.d/output/2_bridge_coordinates_kai_navigation_random_pos_without_offset/2_bridge_coordinates_kai_navigation_random_pos_without_offset.scenario 0 → 100644
      View file @ ecfbb5e2
      {
      "name" : "2_bridge_coordinates_kai_navigation_random_pos_without_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" : "NAVIGATION",
      "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" : -5104110572817619091
      },
      "topography" : {
      "attributes" : {
      "bounds" : {
      "x" : 0.0,
      "y" : 0.0,
      "width" : 50.0,
      "height" : 50.0
      },
      "boundingBoxWidth" : 0.5,
      "bounded" : true
      },
      "obstacles" : [ {
      "shape" : {
      "type" : "POLYGON",
      "points" : [ {
      "x" : 50.295924079138786,
      "y" : 42.50668004900217
      }, {
      "x" : 31.295924079138786,
      "y" : 42.50668004900217
      }, {
      "x" : 20.931872089859098,
      "y" : 10.544835465960205
      }, {
      "x" : 32.12912071251776,
      "y" : 5.936819093301892
      }, {
      "x" : 50.12912071251776,
      "y" : 5.936819093301892
      } ]
      },
      "id" : 1
      }, {
      "shape" : {
      "type" : "POLYGON",
      "points" : [ {
      "x" : 29.94311923184432,
      "y" : -1.52171147800982
      }, {
      "x" : 29.94311923184432,
      "y" : 0.47828852199018
      }, {
      "x" : 7.711477719247341,
      "y" : 10.030658625997603
      }, {
      "x" : 0.32635102153290063,
      "y" : 11.349890053272247
      }, {
      "x" : 0.32635102153290063,
      "y" : -0.6501099467277527
      } ]
      },
      "id" : 2
      }, {
      "shape" : {
      "type" : "POLYGON",
      "points" : [ {
      "x" : 3.88868360244669,
      "y" : 20.25141224823892
      }, {
      "x" : 10.068316678749397,
      "y" : 15.240937641821802
      }, {
      "x" : 15.45937814656645,
      "y" : 12.808810473419726
      }, {
      "x" : 23.463889407925308,
      "y" : 45.90773453190923
      }, {
      "x" : 0.46388940792530775,
      "y" : 45.90773453190923
      } ]
      },
      "id" : -1
      } ],
      "stairs" : [ ],
      "targets" : [ {
      "id" : 1,