Commit bd957e8d authored by BZoennchen's avatar BZoennchen

Merge branch 'master' into dev/BHM

parents cd65cfb9 6f174062
Pipeline #113148 failed with stages
in 81 minutes and 38 seconds
...@@ -34,6 +34,16 @@ __pycache__/ ...@@ -34,6 +34,16 @@ __pycache__/
Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool.egg-info/ Tools/VadereAnalysisTools/VadereAnalysisTool/vadereanalysistool.egg-info/
Tools/VadereAnalysisTools/VadereAnalysisTool/build/ Tools/VadereAnalysisTools/VadereAnalysisTool/build/
Tools/VadereAnalysisTools/VadereAnalysisTool/dist/ 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 # Operating system files
.DS_Store .DS_Store
......
...@@ -33,9 +33,9 @@ variables: ...@@ -33,9 +33,9 @@ variables:
# (i.e.,the virtual machines). We have to track that! # (i.e.,the virtual machines). We have to track that!
stages: stages:
- unit_test - unit_test
- deploy
- integration_test - integration_test
- seed_test - seed_test
- deploy
# PLEASE, OMIT FOLLOWING GITLAB PITFALLS: # PLEASE, OMIT FOLLOWING GITLAB PITFALLS:
# #
...@@ -79,7 +79,7 @@ stages: ...@@ -79,7 +79,7 @@ stages:
script: script:
- mvn clean - mvn clean
- mvn -Dmaven.test.skip=true package - mvn -Dmaven.test.skip=true package
- python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} CHANGELOG.md README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
- scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/master/${VADERE_PACKAGE_NAME_BRANCHES} - scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/master/${VADERE_PACKAGE_NAME_BRANCHES}
only: only:
refs: refs:
...@@ -91,7 +91,7 @@ stages: ...@@ -91,7 +91,7 @@ stages:
script: script:
- mvn clean - mvn clean
- mvn -Dmaven.test.skip=true package - mvn -Dmaven.test.skip=true package
- python3 -m zipfile -c ${VADERE_PACKAGE_NAME_RELEASES} README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_RELEASES} CHANGELOG.md README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
- scp ${VADERE_PACKAGE_NAME_RELEASES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/stable/${VADERE_PACKAGE_NAME_RELEASES} - scp ${VADERE_PACKAGE_NAME_RELEASES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/stable/${VADERE_PACKAGE_NAME_RELEASES}
# Run job only for "tags" (usually on the "stable" branch). Watch out: Multiple "only" tags are ORed together. # Run job only for "tags" (usually on the "stable" branch). Watch out: Multiple "only" tags are ORed together.
# See: https://gitlab.com/gitlab-org/gitlab-ce/issues/27818 # See: https://gitlab.com/gitlab-org/gitlab-ce/issues/27818
...@@ -104,7 +104,7 @@ stages: ...@@ -104,7 +104,7 @@ stages:
script: script:
- mvn clean - mvn clean
- mvn -Dmaven.test.skip=true package - mvn -Dmaven.test.skip=true package
- python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar - python3 -m zipfile -c ${VADERE_PACKAGE_NAME_BRANCHES} CHANGELOG.md README.md VadereModelTests/ VadereGui/target/vadere-gui.jar VadereSimulator/target/vadere-console.jar
- scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/branches/${VADERE_PACKAGE_NAME_BRANCHES} - scp ${VADERE_PACKAGE_NAME_BRANCHES} di49mur@webdev-mwn.lrz.de:~/webserver/htdocs/builds/branches/${VADERE_PACKAGE_NAME_BRANCHES}
when: manual when: manual
......
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
### Added ### Added
- Scenario elements like obstacles and targets can now be resized using the mouse in the topography creator tab (first, select element via left-click and then move mouse to one of its edges to get the resize handles).
- Draw also Voronoi diagram in `TikeGenerator`.
- Added new scenario element `AbsorbingArea` to absorb agents immediately. - Added new scenario element `AbsorbingArea` to absorb agents immediately.
* The new scenario element can be selected in `TopographyCreator` via the "emergency exit" button. * The new scenario element can be selected in `TopographyCreator` via the "emergency exit" button.
* The new scenario element is also taken into account by `SettingsDialaog` and `TikzGenerator`. * The new scenario element is also taken into account by `SettingsDialaog` and `TikzGenerator`.
......
...@@ -45,12 +45,12 @@ Please contact us and we will send you an invitation. ...@@ -45,12 +45,12 @@ Please contact us and we will send you an invitation.
### Use the Issue Tracker ### Use the Issue Tracker
Please, use the [issue tracker](https://gitlab.lrz.de/vadere/vadere/issues) for both Please, use the [issue tracker](https://gitlab.lrz.de/vadere/vadere/issues?sort=label_priority) for both
- to request a feature or to report a bug (see [how to write new issues](https://gitlab.lrz.de/vadere/vadere/issues/179)) - to request a feature or to report a bug (see [how to write new issues](https://gitlab.lrz.de/vadere/vadere/issues/179))
- to work on a feature (see [how to work on an issue](https://gitlab.lrz.de/vadere/vadere/issues/184)) - to work on a feature (see [how to work on an issue](https://gitlab.lrz.de/vadere/vadere/issues/184))
**Tip:** Sort the issues in the [issue tracker](https://gitlab.lrz.de/vadere/vadere/issues) by `Label priority`. **Tip:** Sort the issues in the [issue tracker](https://gitlab.lrz.de/vadere/vadere/issues?sort=label_priority) by `Label priority`.
### Steps for External Contributors ### Steps for External Contributors
......
The java_migration branch has used the following steps to compile and run vadere with JDK-11 on Windows 10: The java_migration branch has used the following steps to compile and run vadere with JDK-11 on Windows 10:
0. Ensure that JDK-11 and Git is set in the environment variables 0. Ensure that OpenJDK11 and Git is set in the environment variables
1. Adjust the IDE (IntelliJ) 1. Adjust the IDE (IntelliJ)
-> Make sure that you have the latest version of IntelliJ (in some older versions, Java 11 is not supported!) -> Make sure that you have the latest version of IntelliJ (in some older versions, Java 11 is not supported!)
...@@ -47,12 +47,15 @@ The java_migration branch has used the following steps to compile and run vadere ...@@ -47,12 +47,15 @@ The java_migration branch has used the following steps to compile and run vadere
</plugins> </plugins>
</build> </build>
3. Compile 3. Remove local Maven repository to avoid conflicts with older Java packages
3.1 Run "mvn -e clean test-compile compile" (-e for error stack trace) 3.1 rm -R "~/.m2"
3.* possibly required updates: "mvn versions:display-dependency-updates" and "mvn versions:display-plugin-updates"
4. Create local runtime 4. Compile
4.1 Run "jdeps --list-deps VadereGui/target/vadere.jar" 4.1 Run "mvn -e clean test-compile compile" (-e for error stack trace)
4.2 Run "jlink --no-header-files --no-man-pages --compress=2 --strip-debug --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.logging,java.management,java.naming,java.prefs,java.rmi,java.scripting,java.sql,java.xml --output java-runtime" 4.* possibly required updates: "mvn versions:display-dependency-updates" and "mvn versions:display-plugin-updates"
5. Optional: Create local runtime for Vadere which omits unnecessary Java packages
5.1 Run "jdeps --list-deps VadereGui/target/vadere.jar"
5.2 Run "jlink --no-header-files --no-man-pages --compress=2 --strip-debug --add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.logging,java.management,java.naming,java.prefs,java.rmi,java.scripting,java.sql,java.xml --output java-runtime"
// The main output of jdeps is used as the parameter for jlink --add-modules. // The main output of jdeps is used as the parameter for jlink --add-modules.
4.3 Run "java-runtime/bin/java -jar VadereGui/target/vadere.jar" 5.3 Run "java-runtime/bin/java -jar VadereGui/target/vadere.jar"
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset", "name" : "2_bridge_coordinates_kai_navigation_random_pos_with_offset",
"description" : "", "description" : "",
"release" : "0.6", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -39,6 +39,23 @@ ...@@ -39,6 +39,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" : "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" : { "org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18, "stepCircleResolution" : 18,
"numberOfCircles" : 1, "numberOfCircles" : 1,
...@@ -56,7 +73,9 @@ ...@@ -56,7 +73,9 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ] "submodels" : [ ],
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
}, },
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45, "pedPotentialIntimateSpaceWidth" : 0.45,
...@@ -67,23 +86,6 @@ ...@@ -67,23 +86,6 @@
"intimateSpaceFactor" : 1.2, "intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1, "personalSpacePower" : 1,
"intimateSpacePower" : 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" : { "attributesSimulation" : {
...@@ -248,7 +250,6 @@ ...@@ -248,7 +250,6 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -273,7 +274,10 @@ ...@@ -273,7 +274,10 @@
"x" : 1.0, "x" : 1.0,
"y" : 0.0 "y" : 0.0
} }
} },
} "dynamicElements" : [ ],
"teleporter" : null
},
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset", "name" : "2_bridge_coordinates_kai_navigation_random_pos_without_offset",
"description" : "", "description" : "",
"release" : "0.6", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -39,6 +39,23 @@ ...@@ -39,6 +39,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" : "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" : { "org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18, "stepCircleResolution" : 18,
"numberOfCircles" : 1, "numberOfCircles" : 1,
...@@ -56,7 +73,9 @@ ...@@ -56,7 +73,9 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ] "submodels" : [ ],
"minStepLength" : "0.1",
"maxStepDuration" : "1.7976931348623157E308"
}, },
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : { "org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45, "pedPotentialIntimateSpaceWidth" : 0.45,
...@@ -67,23 +86,6 @@ ...@@ -67,23 +86,6 @@
"intimateSpaceFactor" : 1.2, "intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1, "personalSpacePower" : 1,
"intimateSpacePower" : 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" : { "attributesSimulation" : {
...@@ -248,7 +250,6 @@ ...@@ -248,7 +250,6 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -273,7 +274,10 @@ ...@@ -273,7 +274,10 @@
"x" : 1.0, "x" : 1.0,
"y" : 0.0 "y" : 0.0
} }
} },
} "dynamicElements" : [ ],
"teleporter" : null
},
"eventInfos" : [ ]
} }
} }
\ No newline at end of file
{ {
"name" : "2_bridge_coordinates_kai_navigation_with_offset", "name" : "2_bridge_coordinates_kai_navigation_with_offset",
"description" : "", "description" : "",
"release" : "0.6", "release" : "0.9",
"commithash" : "628b018374f404d2aca1afa3483e308428b6ae20", "commithash" : "628b018374f404d2aca1afa3483e308428b6ae20",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
...@@ -39,6 +39,23 @@ ...@@ -39,6 +39,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" : "NAVIGATION",