WIP: change occurences in repository

.gitignore

@@ -17,7 +17,7 @@ Tools/ContinuousIntegration/**/output
 
 # C extensions
 *.so
-vadere_analysis_tool/build
+vadereanalysistool/build
 
 #Tools and build utils
 bin/

Tools/ContinuousIntegration/run_orign_translation_test.py

@@ -3,8 +3,8 @@ import shutil
 import subprocess
 import time
 
-from vadere_analysis_tool import VadereProject
-from vadere_analysis_tool.analysis import OriginDeviation
+from vadereanalysistool import VadereProject
+from vadereanalysistool.analysis import OriginDeviation
 
 
 def run_scenario_files_with_vadere_console(scenario_files, vadere_console="VadereSimulator/target/vadere-console.jar",

Tools/ContinuousIntegration/run_seed_comparison_test.d/complex_UNIT_001.scenario

+{
+  "name" : "complex_UNIT_001",
+  "description" : "",
+  "release" : "0.6",
+  "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" : true,
+        "stepLengthIntercept" : 0.4625,
+        "stepLengthSlopeSpeed" : 0.2345,
+        "stepLengthSD" : 0.036,
+        "movementThreshold" : 0.0,
+        "optimizationType" : "NELDER_MEAD",
+        "movementType" : "ARBITRARY",
+        "dynamicStepLength" : true,
+        "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" : 90.0,
+      "simTimeStepLength" : 0.4,
+      "realTimeSimTimeRatio" : 0.0,
+      "writeSimulationData" : true,
+      "visualizationEnabled" : true,
+      "printFPS" : false,
+      "digitsPerCoordinate" : 2,
+      "useFixedSeed" : true,
+      "fixedSeed" : -3213925745664992646,
+      "simulationSeed" : 0
+    },
+    "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" : 0.4,
+            "y" : 0.4
+          }, {
+            "x" : 0.5,
+            "y" : 18.7
+          }, {
+            "x" : 9.8,
+            "y" : 18.8
+          }, {
+            "x" : 15.4,
+            "y" : 8.3
+          }, {
+            "x" : 15.4,
+            "y" : 0.5
+          } ]
+        },
+        "id" : 9
+      }, {
+        "shape" : {
+          "type" : "POLYGON",
+          "points" : [ {
+            "x" : 0.6,
+            "y" : 34.9
+          }, {
+            "x" : 0.4,
+            "y" : 49.5
+          }, {
+            "x" : 14.9,
+            "y" : 49.5
+          }, {
+            "x" : 14.7,
+            "y" : 42.3
+          }, {
+            "x" : 9.0,
+            "y" : 35.0
+          } ]
+        },
+        "id" : 10
+      }, {
+        "shape" : {
+          "type" : "POLYGON",
+          "points" : [ {
+            "x" : 36.0,
+            "y" : 25.7
+          }, {
+            "x" : 12.4,
+            "y" : 25.8
+          }, {
+            "x" : 12.5,
+            "y" : 29.5
+          }, {
+            "x" : 20.7,
+            "y" : 39.6
+          }, {
+            "x" : 32.0,
+            "y" : 39.5
+          }, {
+            "x" : 36.1,
+            "y" : 32.7
+          } ]
+        },
+        "id" : 11
+      }, {
+        "shape" : {
+          "type" : "POLYGON",
+          "points" : [ {
+            "x" : 19.8,
+            "y" : 22.1
+          }, {
+            "x" : 32.3,
+            "y" : 22.2
+          }, {
+            "x" : 33.24321348467342,
+            "y" : 18.125317746210836
+          }, {
+            "x" : 43.4,
+            "y" : 18.2
+          }, {
+            "x" : 43.5,
+            "y" : 3.9
+          }, {
+            "x" : 35.9,
+            "y" : 3.9
+          }, {
+            "x" : 29.8,
+            "y" : 11.3
+          }, {
+            "x" : 29.800000000000008,
+            "y" : 11.311504424778763
+          }, {
+            "x" : 19.8,
+            "y" : 11.4
+          } ]
+        },
+        "id" : 12
+      }, {
+        "shape" : {
+          "x" : 35.5,
+          "y" : 39.3,
+          "width" : 14.3,
+          "height" : 10.2,
+          "type" : "RECTANGLE"
+        },
+        "id" : 5
+      } ],
+      "stairs" : [ {
+        "shape" : {
+          "type" : "POLYGON",
+          "points" : [ {
+            "x" : 13.0,
+            "y" : 29.8
+          }, {
+            "x" : 7.9,
+            "y" : 33.7
+          }, {
+            "x" : 14.8,
+            "y" : 42.1
+          }, {
+            "x" : 20.3,
+            "y" : 38.8
+          } ]
+        },
+        "id" : 20,
+        "treadCount" : 35,
+        "upwardDirection" : {
+          "x" : 1.0,
+          "y" : 1.3
+        }
+      }, {
+        "shape" : {
+          "x" : 43.1,
+          "y" : 3.9,
+          "width" : 6.4,
+          "height" : 14.4,
+          "type" : "RECTANGLE"
+        },
+        "id" : 14,
+        "treadCount" : 45,
+        "upwardDirection" : {
+          "x" : 0.0,
+          "y" : 1.0
+        }
+      } ],
+      "targets" : [ {
+        "id" : 6,
+        "absorbing" : false,
+        "shape" : {
+          "x" : 41.6,
+          "y" : 20.0,
+          "width" : 3.7,
+          "height" : 10.0,
+          "type" : "RECTANGLE"
+        },
+        "waitingTime" : 0.0,
+        "waitingTimeYellowPhase" : 0.0,
+        "parallelWaiters" : 0,
+        "individualWaiting" : true,
+        "deletionDistance" : 0.1,
+        "startingWithRedLight" : false,
+        "nextSpeed" : -1.0
+      }, {
+        "id" : 7,
+        "absorbing" : true,
+        "shape" : {
+          "x" : 19.9,
+          "y" : 41.7,
+          "width" : 10.0,
+          "height" : 3.7,
+          "type" : "RECTANGLE"
+        },
+        "waitingTime" : 0.0,
+        "waitingTimeYellowPhase" : 0.0,
+        "parallelWaiters" : 0,
+        "individualWaiting" : true,
+        "deletionDistance" : 0.1,
+        "startingWithRedLight" : false,
+        "nextSpeed" : -1.0
+      }, {
+        "id" : 8,
+        "absorbing" : true,
+        "shape" : {
+          "x" : 20.0,
+          "y" : 4.6,
+          "width" : 10.0,
+          "height" : 3.0,
+          "type" : "RECTANGLE"
+        },
+        "waitingTime" : 0.0,
+        "waitingTimeYellowPhase" : 0.0,
+        "parallelWaiters" : 0,
+        "individualWaiting" : true,
+        "deletionDistance" : 0.1,
+        "startingWithRedLight" : false,
+        "nextSpeed" : -1.0
+      }, {
+        "id" : 15,
+        "absorbing" : false,
+        "shape" : {
+          "x" : 5.2,
+          "y" : 20.0,
+          "width" : 3.5,
+          "height" : 9.8,
+          "type" : "RECTANGLE"
+        },
+        "waitingTime" : 0.0,
+        "waitingTimeYellowPhase" : 0.0,
+        "parallelWaiters" : 0,
+        "individualWaiting" : true,
+        "deletionDistance" : 0.1,
+        "startingWithRedLight" : false,
+        "nextSpeed" : -1.0
+      } ],
+      "sources" : [ {
+        "id" : 2,
+        "shape" : {
+          "x" : 45.8,
+          "y" : 20.0,
+          "width" : 3.7,
+          "height" : 10.0,
+          "type" : "RECTANGLE"
+        },
+        "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
+        "distributionParameters" : [ 1.0 ],
+        "spawnNumber" : 3,
+        "maxSpawnNumberTotal" : -1,
+        "startTime" : 0.0,
+        "endTime" : 15.0,
+        "spawnAtRandomPositions" : true,
+        "useFreeSpaceOnly" : true,
+        "targetIds" : [ 8 ],
+        "groupSizeDistribution" : [ 1.0 ],
+        "dynamicElementType" : "PEDESTRIAN"
+      }, {
+        "id" : 3,
+        "shape" : {
+          "x" : 20.0,
+          "y" : 45.8,
+          "width" : 10.0,
+          "height" : 3.7,
+          "type" : "RECTANGLE"
+        },
+        "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
+        "distributionParameters" : [ 1.0 ],
+        "spawnNumber" : 3,
+        "maxSpawnNumberTotal" : -1,
+        "startTime" : 0.0,
+        "endTime" : 15.0,
+        "spawnAtRandomPositions" : true,
+        "useFreeSpaceOnly" : true,
+        "targetIds" : [ 15, 8 ],
+        "groupSizeDistribution" : [ 1.0 ],
+        "dynamicElementType" : "PEDESTRIAN"
+      }, {
+        "id" : 4,
+        "shape" : {
+          "x" : 20.0,
+          "y" : 0.4,
+          "width" : 10.0,
+          "height" : 3.7,
+          "type" : "RECTANGLE"
+        },
+        "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
+        "distributionParameters" : [ 1.0 ],
+        "spawnNumber" : 3,
+        "maxSpawnNumberTotal" : -1,
+        "startTime" : 0.0,
+        "endTime" : 15.0,
+        "spawnAtRandomPositions" : true,
+        "useFreeSpaceOnly" : true,
+        "targetIds" : [ 6, 7 ],
+        "groupSizeDistribution" : [ 1.0 ],
+        "dynamicElementType" : "PEDESTRIAN"
+      }, {
+        "id" : 1,
+        "shape" : {
+          "x" : 0.5,
+          "y" : 20.0,
+          "width" : 3.7,
+          "height" : 10.0,
+          "type" : "RECTANGLE"
+        },
+        "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
+        "distributionParameters" : [ 1.0 ],
+        "spawnNumber" : 3,
+        "maxSpawnNumberTotal" : -1,
+        "startTime" : 0.0,
+        "endTime" : 15.0,
+        "spawnAtRandomPositions" : true,
+        "useFreeSpaceOnly" : true,
+        "targetIds" : [ 6, 7 ],
+        "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_seed_comparison_test.d/legacy/scenarios/_LOG-20190211083635.txt

+Info:>> analyzing JSON tree of scenario <scenarios/complex_UNIT_groups_001>
+Info:<complex_UNIT_groups_001> Start Transform to Version: 0.7
+Info:Scenario Migrated - OK. Move copy of old version to legacllyDir
+Info:>> analyzing JSON tree of scenario <scenarios/bridge_timeCost_UNIT>
+Info:<bridge_timeCost_UNIT> Start Transform to Version: 0.7
+Info:Scenario Migrated - OK. Move copy of old version to legacllyDir
+Info:>> analyzing JSON tree of scenario <scenarios/bridge_timeCost_NAVIGATION>
+Info:<bridge_timeCost_NAVIGATION> Start Transform to Version: 0.7
+Info:Scenario Migrated - OK. Move copy of old version to legacllyDir
+Info:>> analyzing JSON tree of scenario <scenarios/bridge_timeCost_OBSTACLES>
+Info:<bridge_timeCost_OBSTACLES> Start Transform to Version: 0.7
+Info:Scenario Migrated - OK. Move copy of old version to legacllyDir
+Info:>> analyzing JSON tree of scenario <scenarios/complex_NAVIGATION_groups_001>
+Info:<complex_NAVIGATION_groups_001> Start Transform to Version: 0.7
+Info:Scenario Migrated - OK. Move copy of old version to legacllyDir
+Info:>> analyzing JSON tree of scenario <scenarios/complex_NAVIGATION_001>
+Info:<complex_NAVIGATION_001> Start Transform to Version: 0.7
+Info:Scenario Migrated - OK. Move copy of old version to legacllyDir
+Info:>> analyzing JSON tree of scenario <scenarios/bridge_timeCost_QUEUEING>
+Info:<bridge_timeCost_QUEUEING> Start Transform to Version: 0.7
+Info:Scenario Migrated - OK. Move copy of old version to legacllyDir

Tools/ContinuousIntegration/run_seed_comparison_test.d/legacy/scenarios/bridge_timeCost_NAVIGATION.scenario.legacy

+{
+  "name" : "bridge_timeCost_NAVIGATION",
+  "description" : "",
+  "release" : "0.6",
+  "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" : 150.0,
+      "simTimeStepLength" : 0.4,
+      "realTimeSimTimeRatio" : 0.0,
+      "writeSimulationData" : true,
+      "visualizationEnabled" : true,
+      "printFPS" : false,
+      "digitsPerCoordinate" : 2,
+      "useFixedSeed" : true,
+      "fixedSeed" : -3213925745664992646,
+      "simulationSeed" : 0
+    },
+    "topography" : {
+      "attributes" : {
+        "bounds" : {
+          "x" : 0.0,
+          "y" : 0.0,
+          "width" : 50.0,
+          "height" : 50.0
+        },
+        "boundingBoxWidth" : 0.5,
+        "bounded" : true
+      },
+      "obstacles" : [ {
+        "shape" : {