Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
17ea3e8c
Commit
17ea3e8c
authored
Jun 04, 2020
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev/MeshPlotting' into 'master'
Dev/mesh plotting See merge request
!133
parents
d77a1a8d
290ae70a
Pipeline
#266819
passed with stages
in 145 minutes and 18 seconds
Changes
160
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
160 changed files
with
8556 additions
and
1383 deletions
+8556
-1383
VadereGui/resources/messages.properties
VadereGui/resources/messages.properties
+2
-0
VadereGui/resources/messages_de_DE.properties
VadereGui/resources/messages_de_DE.properties
+2
-1
VadereGui/src/org/vadere/gui/components/control/ActionGenerateMesh.java
...org/vadere/gui/components/control/ActionGenerateMesh.java
+91
-0
VadereGui/src/org/vadere/gui/components/model/SimulationModel.java
.../src/org/vadere/gui/components/model/SimulationModel.java
+1
-1
VadereGui/src/org/vadere/gui/components/view/DefaultRenderer.java
...i/src/org/vadere/gui/components/view/DefaultRenderer.java
+4
-1
VadereGui/src/org/vadere/gui/components/view/SimulationRenderer.java
...rc/org/vadere/gui/components/view/SimulationRenderer.java
+1
-1
VadereGui/src/org/vadere/gui/onlinevisualization/OnlineVisualization.java
...g/vadere/gui/onlinevisualization/OnlineVisualization.java
+8
-7
VadereGui/src/org/vadere/gui/onlinevisualization/model/OnlineVisualizationModel.java
...i/onlinevisualization/model/OnlineVisualizationModel.java
+28
-26
VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java
...ui/src/org/vadere/gui/projectview/view/ScenarioPanel.java
+1
-1
VadereGui/src/org/vadere/gui/topographycreator/view/ActionTranslateTopographyDialog.java
...pographycreator/view/ActionTranslateTopographyDialog.java
+7
-1
VadereGui/src/org/vadere/gui/topographycreator/view/TopographyWindow.java
...g/vadere/gui/topographycreator/view/TopographyWindow.java
+11
-3
VadereManager/tests/org/vadere/manager/traci/commandHandler/SimulationCommandHandlerTest.java
...er/traci/commandHandler/SimulationCommandHandlerTest.java
+1
-0
VadereMeshing/resources/poly/bridge.poly
VadereMeshing/resources/poly/bridge.poly
+37
-39
VadereMeshing/src/org/vadere/meshing/examples/BackgroundMeshExamples.java
...c/org/vadere/meshing/examples/BackgroundMeshExamples.java
+2
-1
VadereMeshing/src/org/vadere/meshing/examples/EikMeshExamples.java
...hing/src/org/vadere/meshing/examples/EikMeshExamples.java
+24
-5
VadereMeshing/src/org/vadere/meshing/examples/EikMeshPlots.java
...Meshing/src/org/vadere/meshing/examples/EikMeshPlots.java
+46
-1
VadereMeshing/src/org/vadere/meshing/examples/EikMeshPoly.java
...eMeshing/src/org/vadere/meshing/examples/EikMeshPoly.java
+1
-1
VadereMeshing/src/org/vadere/meshing/examples/ElementSizeFunction.java
.../src/org/vadere/meshing/examples/ElementSizeFunction.java
+76
-0
VadereMeshing/src/org/vadere/meshing/examples/MeshExamples.java
...Meshing/src/org/vadere/meshing/examples/MeshExamples.java
+12
-12
VadereMeshing/src/org/vadere/meshing/examples/MeshQuantityPrinting.java
...src/org/vadere/meshing/examples/MeshQuantityPrinting.java
+451
-0
VadereMeshing/src/org/vadere/meshing/examples/RegularRefinement.java
...ng/src/org/vadere/meshing/examples/RegularRefinement.java
+36
-22
VadereMeshing/src/org/vadere/meshing/examples/SierpinskiSorting.java
...ng/src/org/vadere/meshing/examples/SierpinskiSorting.java
+33
-0
VadereMeshing/src/org/vadere/meshing/mesh/gen/AHalfEdge.java
VadereMeshing/src/org/vadere/meshing/mesh/gen/AHalfEdge.java
+9
-2
VadereMeshing/src/org/vadere/meshing/mesh/gen/AMesh.java
VadereMeshing/src/org/vadere/meshing/mesh/gen/AMesh.java
+422
-84
VadereMeshing/src/org/vadere/meshing/mesh/gen/AVertex.java
VadereMeshing/src/org/vadere/meshing/mesh/gen/AVertex.java
+1
-5
VadereMeshing/src/org/vadere/meshing/mesh/gen/BasePointLocator.java
...ing/src/org/vadere/meshing/mesh/gen/BasePointLocator.java
+1
-1
VadereMeshing/src/org/vadere/meshing/mesh/gen/CachedPointLocator.java
...g/src/org/vadere/meshing/mesh/gen/CachedPointLocator.java
+2
-2
VadereMeshing/src/org/vadere/meshing/mesh/gen/DelaunayHierarchy.java
...ng/src/org/vadere/meshing/mesh/gen/DelaunayHierarchy.java
+1
-1
VadereMeshing/src/org/vadere/meshing/mesh/gen/DelaunayTree.java
...Meshing/src/org/vadere/meshing/mesh/gen/DelaunayTree.java
+1
-1
VadereMeshing/src/org/vadere/meshing/mesh/gen/IncrementalTriangulation.java
...org/vadere/meshing/mesh/gen/IncrementalTriangulation.java
+218
-22
VadereMeshing/src/org/vadere/meshing/mesh/gen/JumpAndWalk.java
...eMeshing/src/org/vadere/meshing/mesh/gen/JumpAndWalk.java
+12
-1
VadereMeshing/src/org/vadere/meshing/mesh/gen/MeshPanel.java
VadereMeshing/src/org/vadere/meshing/mesh/gen/MeshPanel.java
+13
-0
VadereMeshing/src/org/vadere/meshing/mesh/gen/MeshRenderer.java
...Meshing/src/org/vadere/meshing/mesh/gen/MeshRenderer.java
+90
-35
VadereMeshing/src/org/vadere/meshing/mesh/gen/PMesh.java
VadereMeshing/src/org/vadere/meshing/mesh/gen/PMesh.java
+9
-4
VadereMeshing/src/org/vadere/meshing/mesh/gen/PVertex.java
VadereMeshing/src/org/vadere/meshing/mesh/gen/PVertex.java
+1
-2
VadereMeshing/src/org/vadere/meshing/mesh/impl/PMeshPanel.java
...eMeshing/src/org/vadere/meshing/mesh/impl/PMeshPanel.java
+10
-0
VadereMeshing/src/org/vadere/meshing/mesh/impl/PSLG.java
VadereMeshing/src/org/vadere/meshing/mesh/impl/PSLG.java
+4
-0
VadereMeshing/src/org/vadere/meshing/mesh/inter/IEdgeContainerBoolean.java
.../org/vadere/meshing/mesh/inter/IEdgeContainerBoolean.java
+10
-0
VadereMeshing/src/org/vadere/meshing/mesh/inter/IEdgeContainerDouble.java
...c/org/vadere/meshing/mesh/inter/IEdgeContainerDouble.java
+10
-0
VadereMeshing/src/org/vadere/meshing/mesh/inter/IEdgeContainerObject.java
...c/org/vadere/meshing/mesh/inter/IEdgeContainerObject.java
+10
-0
VadereMeshing/src/org/vadere/meshing/mesh/inter/IIncrementalTriangulation.java
.../vadere/meshing/mesh/inter/IIncrementalTriangulation.java
+4
-2
VadereMeshing/src/org/vadere/meshing/mesh/inter/IMesh.java
VadereMeshing/src/org/vadere/meshing/mesh/inter/IMesh.java
+244
-8
VadereMeshing/src/org/vadere/meshing/mesh/inter/IPolyConnectivity.java
.../src/org/vadere/meshing/mesh/inter/IPolyConnectivity.java
+10
-3
VadereMeshing/src/org/vadere/meshing/mesh/inter/ITriConnectivity.java
...g/src/org/vadere/meshing/mesh/inter/ITriConnectivity.java
+216
-46
VadereMeshing/src/org/vadere/meshing/mesh/inter/ITriEventListener.java
.../src/org/vadere/meshing/mesh/inter/ITriEventListener.java
+6
-5
VadereMeshing/src/org/vadere/meshing/mesh/inter/ITriangulation.java
...ing/src/org/vadere/meshing/mesh/inter/ITriangulation.java
+4
-0
VadereMeshing/src/org/vadere/meshing/mesh/inter/IVertexContainerBoolean.java
...rg/vadere/meshing/mesh/inter/IVertexContainerBoolean.java
+11
-0
VadereMeshing/src/org/vadere/meshing/mesh/inter/IVertexContainerDouble.java
...org/vadere/meshing/mesh/inter/IVertexContainerDouble.java
+12
-0
VadereMeshing/src/org/vadere/meshing/mesh/inter/IVertexContainerInteger.java
...rg/vadere/meshing/mesh/inter/IVertexContainerInteger.java
+11
-0
VadereMeshing/src/org/vadere/meshing/mesh/inter/IVertexContainerObject.java
...org/vadere/meshing/mesh/inter/IVertexContainerObject.java
+10
-0
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/BowyerWatsonSlow.java
...g/vadere/meshing/mesh/triangulation/BowyerWatsonSlow.java
+1
-4
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/DistanceFunctionApproxBF.java
.../meshing/mesh/triangulation/DistanceFunctionApproxBF.java
+36
-8
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/EdgeLengthFunctionApprox.java
.../meshing/mesh/triangulation/EdgeLengthFunctionApprox.java
+1
-1
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/IMeshImprover.java
...re/meshing/mesh/triangulation/improver/IMeshImprover.java
+5
-0
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/Distmesh.java
...eshing/mesh/triangulation/improver/distmesh/Distmesh.java
+34
-6
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/Parameters.java
...hing/mesh/triangulation/improver/distmesh/Parameters.java
+2
-1
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/eikmesh/gen/GenEikMesh.java
...g/mesh/triangulation/improver/eikmesh/gen/GenEikMesh.java
+82
-19
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/eikmesh/impl/AEikMesh.java
...ng/mesh/triangulation/improver/eikmesh/impl/AEikMesh.java
+1
-0
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/eikmesh/opencl/CLEikMesh.java
...mesh/triangulation/improver/eikmesh/opencl/CLEikMesh.java
+11
-2
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/eikmesh/opencl/CLEikMeshHE.java
...sh/triangulation/improver/eikmesh/opencl/CLEikMeshHE.java
+8
-4
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/plots/VisualTestGPUEdgeBased.java
...hing/mesh/triangulation/plots/VisualTestGPUEdgeBased.java
+11
-9
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/plots/VisualTestGPUVertexBased.java
...ng/mesh/triangulation/plots/VisualTestGPUVertexBased.java
+7
-6
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/triangulator/gen/GenConstrainSplitter.java
.../triangulation/triangulator/gen/GenConstrainSplitter.java
+216
-0
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/triangulator/gen/GenConstrainedDelaunayTriangulator.java
.../triangulator/gen/GenConstrainedDelaunayTriangulator.java
+32
-0
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/triangulator/gen/GenRegularRefinement.java
.../triangulation/triangulator/gen/GenRegularRefinement.java
+408
-216
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/triangulator/gen/GenRuppertsTriangulator.java
...iangulation/triangulator/gen/GenRuppertsTriangulator.java
+8
-8
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/triangulator/gen/GenSpaceFillingCurve.java
.../triangulation/triangulator/gen/GenSpaceFillingCurve.java
+29
-1
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/triangulator/gen/GenUniformRefinementTriangulatorSFC.java
...triangulator/gen/GenUniformRefinementTriangulatorSFC.java
+119
-16
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/triangulator/gen/VoronoiSegPlacement.java
...h/triangulation/triangulator/gen/VoronoiSegPlacement.java
+3
-3
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/triangulator/impl/PContrainedDelaunayTriangulator.java
...on/triangulator/impl/PContrainedDelaunayTriangulator.java
+12
-0
VadereMeshing/src/org/vadere/meshing/opencl/CLDistMesh.java
VadereMeshing/src/org/vadere/meshing/opencl/CLDistMesh.java
+23
-164
VadereMeshing/src/org/vadere/meshing/opencl/CLDistMeshHE.java
...reMeshing/src/org/vadere/meshing/opencl/CLDistMeshHE.java
+19
-111
VadereMeshing/src/org/vadere/meshing/utils/MeshConstructor.java
...Meshing/src/org/vadere/meshing/utils/MeshConstructor.java
+170
-0
VadereMeshing/src/org/vadere/meshing/utils/color/Colors.java
VadereMeshing/src/org/vadere/meshing/utils/color/Colors.java
+1
-0
VadereMeshing/src/org/vadere/meshing/utils/io/IOUtils.java
VadereMeshing/src/org/vadere/meshing/utils/io/IOUtils.java
+26
-0
VadereMeshing/src/org/vadere/meshing/utils/io/tex/TexGraphGenerator.java
...rc/org/vadere/meshing/utils/io/tex/TexGraphGenerator.java
+316
-68
VadereMeshing/src/org/vadere/meshing/utils/math/GeometryUtilsMesh.java
.../src/org/vadere/meshing/utils/math/GeometryUtilsMesh.java
+193
-0
VadereMeshing/tests/org/vadere/geometry/triangulation/TestPointLocation.java
.../org/vadere/geometry/triangulation/TestPointLocation.java
+4
-0
VadereSimulator/src/org/vadere/simulator/control/scenarioelements/OfflineTopographyController.java
...control/scenarioelements/OfflineTopographyController.java
+11
-29
VadereSimulator/src/org/vadere/simulator/control/simulation/PassiveCallback.java
.../vadere/simulator/control/simulation/PassiveCallback.java
+2
-2
VadereSimulator/src/org/vadere/simulator/control/simulation/ScenarioRun.java
.../org/vadere/simulator/control/simulation/ScenarioRun.java
+51
-20
VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java
...c/org/vadere/simulator/control/simulation/Simulation.java
+1
-1
VadereSimulator/src/org/vadere/simulator/examples/Curvature.java
...imulator/src/org/vadere/simulator/examples/Curvature.java
+211
-0
VadereSimulator/src/org/vadere/simulator/examples/DistanceFunction.java
...r/src/org/vadere/simulator/examples/DistanceFunction.java
+47
-0
VadereSimulator/src/org/vadere/simulator/examples/DistanceFunctionApproxFMM.java
.../vadere/simulator/examples/DistanceFunctionApproxFMM.java
+122
-0
VadereSimulator/src/org/vadere/simulator/models/MainModelBuilder.java
...tor/src/org/vadere/simulator/models/MainModelBuilder.java
+3
-2
VadereSimulator/src/org/vadere/simulator/models/Model.java
VadereSimulator/src/org/vadere/simulator/models/Model.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/bhm/NavigationCluster.java
...rc/org/vadere/simulator/models/bhm/NavigationCluster.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/density/CLGaussianFilter.java
...org/vadere/simulator/models/density/CLGaussianFilter.java
+2
-2
VadereSimulator/src/org/vadere/simulator/models/density/JGaussianFilter.java
.../org/vadere/simulator/models/density/JGaussianFilter.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/osm/OSMBehaviorController.java
...rg/vadere/simulator/models/osm/OSMBehaviorController.java
+4
-4
VadereSimulator/src/org/vadere/simulator/models/osm/optimization/ParticleSwarmOptimizer.java
...lator/models/osm/optimization/ParticleSwarmOptimizer.java
+2
-2
VadereSimulator/src/org/vadere/simulator/models/osm/optimization/PotentialEvaluationFunction.java
.../models/osm/optimization/PotentialEvaluationFunction.java
+2
-2
VadereSimulator/src/org/vadere/simulator/models/osm/optimization/StepCircleOptimizerCircleNelderMead.java
...osm/optimization/StepCircleOptimizerCircleNelderMead.java
+3
-3
VadereSimulator/src/org/vadere/simulator/models/osm/optimization/StepCircleOptimizerDiscrete.java
.../models/osm/optimization/StepCircleOptimizerDiscrete.java
+3
-3
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldObstacleOSM.java
...simulator/models/potential/PotentialFieldObstacleOSM.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldDistanceEikonalEq.java
...els/potential/fields/PotentialFieldDistanceEikonalEq.java
+4
-4
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldDistancesBruteForce.java
...s/potential/fields/PotentialFieldDistancesBruteForce.java
+3
-3
VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldTarget.java
...mulator/models/potential/fields/PotentialFieldTarget.java
+6
-1
VadereSimulator/src/org/vadere/simulator/models/potential/solver/EikonalSolverCacheProvider.java
...r/models/potential/solver/EikonalSolverCacheProvider.java
+4
-5
VadereSimulator/src/org/vadere/simulator/models/potential/solver/EikonalSolverDefaultProvider.java
...models/potential/solver/EikonalSolverDefaultProvider.java
+1
-2
VadereSimulator/src/org/vadere/simulator/models/potential/solver/EikonalSolverProvider.java
...ulator/models/potential/solver/EikonalSolverProvider.java
+26
-33
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/EikonalSolver.java
...or/models/potential/solver/calculators/EikonalSolver.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/PotentialFieldCalculatorNone.java
...tial/solver/calculators/PotentialFieldCalculatorNone.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/cartesian/EikonalSolverFIM.java
...ential/solver/calculators/cartesian/EikonalSolverFIM.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/cartesian/EikonalSolverFMM.java
...ential/solver/calculators/cartesian/EikonalSolverFMM.java
+5
-2
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/cartesian/EikonalSolverFSM.java
...ential/solver/calculators/cartesian/EikonalSolverFSM.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/cartesian/EikonalSolverSFMM.java
...ntial/solver/calculators/cartesian/EikonalSolverSFMM.java
+2
-2
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/cartesian/PotentialFieldCalculatorAirLine.java
...alculators/cartesian/PotentialFieldCalculatorAirLine.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/cartesian/PotentialFieldCalculatorDijkstra.java
...lculators/cartesian/PotentialFieldCalculatorDijkstra.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/AMeshEikonalSolver.java
...potential/solver/calculators/mesh/AMeshEikonalSolver.java
+541
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/AMeshEikonalSolverFMM.java
...ential/solver/calculators/mesh/AMeshEikonalSolverFMM.java
+135
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/DensityUpdater.java
...els/potential/solver/calculators/mesh/DensityUpdater.java
+81
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/FMMTriangulationExamples.java
...ial/solver/calculators/mesh/FMMTriangulationExamples.java
+3
-3
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/MeshEikonalSolver.java
.../potential/solver/calculators/mesh/MeshEikonalSolver.java
+231
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/MeshEikonalSolverDFMM.java
...ential/solver/calculators/mesh/MeshEikonalSolverDFMM.java
+424
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/MeshEikonalSolverFIM.java
...tential/solver/calculators/mesh/MeshEikonalSolverFIM.java
+187
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/MeshEikonalSolverFIMParallel.java
...solver/calculators/mesh/MeshEikonalSolverFIMParallel.java
+303
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/MeshEikonalSolverFMM.java
...tential/solver/calculators/mesh/MeshEikonalSolverFMM.java
+228
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/MeshEikonalSolverFMMIterative.java
...olver/calculators/mesh/MeshEikonalSolverFMMIterative.java
+175
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/MeshEikonalSolverFMMRefined.java
.../solver/calculators/mesh/MeshEikonalSolverFMMRefined.java
+680
-129
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/PredicateEdgeRefineCurvature.java
...solver/calculators/mesh/PredicateEdgeRefineCurvature.java
+41
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/calculators/mesh/PredicateRefinement.java
...otential/solver/calculators/mesh/PredicateRefinement.java
+49
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/gradients/FloorGradientProviderRingContinuous.java
...solver/gradients/FloorGradientProviderRingContinuous.java
+2
-2
VadereSimulator/src/org/vadere/simulator/models/potential/solver/timecost/ITimeCostFunction.java
...r/models/potential/solver/timecost/ITimeCostFunction.java
+4
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/timecost/ITimeCostFunctionMesh.java
...dels/potential/solver/timecost/ITimeCostFunctionMesh.java
+16
-0
VadereSimulator/src/org/vadere/simulator/models/potential/solver/timecost/TimeCost2D1ConfigurationSpace.java
...ential/solver/timecost/TimeCost2D1ConfigurationSpace.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/timeCostFunction/TimeCostFunctionFactory.java
...s/potential/timeCostFunction/TimeCostFunctionFactory.java
+77
-1
VadereSimulator/src/org/vadere/simulator/models/potential/timeCostFunction/TimeCostObstacleDensityMesh.java
...tential/timeCostFunction/TimeCostObstacleDensityMesh.java
+108
-0
VadereSimulator/src/org/vadere/simulator/models/potential/timeCostFunction/TimeCostPedestrianDensityMesh.java
...ntial/timeCostFunction/TimeCostPedestrianDensityMesh.java
+186
-0
VadereSimulator/src/org/vadere/simulator/models/potential/timeCostFunction/TimeCostPedestrianDensityQueueingMesh.java
...meCostFunction/TimeCostPedestrianDensityQueueingMesh.java
+128
-0
VadereSimulator/src/org/vadere/simulator/models/queuing/QueueDetector.java
...rc/org/vadere/simulator/models/queuing/QueueDetector.java
+2
-2
VadereSimulator/src/org/vadere/simulator/projects/Domain.java
...reSimulator/src/org/vadere/simulator/projects/Domain.java
+23
-5
VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java
...r/src/org/vadere/simulator/projects/io/JsonConverter.java
+2
-1
VadereSimulator/src/org/vadere/simulator/projects/migration/GeometryCleaner.java
.../vadere/simulator/projects/migration/GeometryCleaner.java
+1
-1
VadereSimulator/src/org/vadere/simulator/utils/cache/MeshTxtCacheObject.java
.../org/vadere/simulator/utils/cache/MeshTxtCacheObject.java
+3
-3
VadereSimulator/tests/org/vadere/simulator/dataprocessing/TestOutputFile.java
...s/org/vadere/simulator/dataprocessing/TestOutputFile.java
+1
-1
VadereSimulator/tests/org/vadere/simulator/models/potential/solver/PerformanceSFMM.java
...re/simulator/models/potential/solver/PerformanceSFMM.java
+2
-2
VadereSimulator/tests/org/vadere/simulator/models/potential/solver/PerformanceTriangleFMM.java
...lator/models/potential/solver/PerformanceTriangleFMM.java
+4
-5
VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestEikonalSolver.java
.../simulator/models/potential/solver/TestEikonalSolver.java
+3
-3
VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFFMNonUniformTriangulation.java
...dels/potential/solver/TestFFMNonUniformTriangulation.java
+14
-15
VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFFMUniformTriangulation.java
.../models/potential/solver/TestFFMUniformTriangulation.java
+3
-3
VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFMMEikMesh.java
...ere/simulator/models/potential/solver/TestFMMEikMesh.java
+7
-7
VadereState/src/org/vadere/state/attributes/models/AttributesOSM.java
...src/org/vadere/state/attributes/models/AttributesOSM.java
+1
-1
VadereState/src/org/vadere/state/attributes/scenario/AttributesAgent.java
...org/vadere/state/attributes/scenario/AttributesAgent.java
+3
-3
VadereState/src/org/vadere/state/scenario/IMoveDynamicElementListener.java
...rg/vadere/state/scenario/IMoveDynamicElementListener.java
+8
-0
VadereState/src/org/vadere/state/scenario/Topography.java
VadereState/src/org/vadere/state/scenario/Topography.java
+35
-14
VadereUtils/src/org/vadere/util/geometry/GeometryUtils.java
VadereUtils/src/org/vadere/util/geometry/GeometryUtils.java
+234
-38
VadereUtils/src/org/vadere/util/geometry/shapes/VCircleSector.java
...ls/src/org/vadere/util/geometry/shapes/VCircleSector.java
+1
-1
VadereUtils/src/org/vadere/util/geometry/shapes/VCone.java
VadereUtils/src/org/vadere/util/geometry/shapes/VCone.java
+1
-1
VadereUtils/src/org/vadere/util/geometry/shapes/VTriangle.java
...eUtils/src/org/vadere/util/geometry/shapes/VTriangle.java
+9
-1
VadereUtils/src/org/vadere/util/geometry/shapes/Vector2D.java
...reUtils/src/org/vadere/util/geometry/shapes/Vector2D.java
+4
-4
VadereUtils/src/org/vadere/util/io/CollectionUtils.java
VadereUtils/src/org/vadere/util/io/CollectionUtils.java
+38
-0
VadereUtils/src/org/vadere/util/io/IOUtils.java
VadereUtils/src/org/vadere/util/io/IOUtils.java
+2
-0
VadereUtils/src/org/vadere/util/math/IDistanceFunction.java
VadereUtils/src/org/vadere/util/math/IDistanceFunction.java
+2
-2
VadereUtils/src/org/vadere/util/math/MathUtil.java
VadereUtils/src/org/vadere/util/math/MathUtil.java
+3
-3
VadereUtils/src/org/vadere/util/random/SimpleReachablePointProvider.java
.../org/vadere/util/random/SimpleReachablePointProvider.java
+1
-1
VadereUtils/tests/org/vadere/util/geometry/GeometryUtilsTest.java
...ils/tests/org/vadere/util/geometry/GeometryUtilsTest.java
+15
-0
VadereUtils/tests/org/vadere/util/geometry/TestGeometry.java
VadereUtils/tests/org/vadere/util/geometry/TestGeometry.java
+3
-3
VadereUtils/tests/org/vadere/util/geometry/shapes/TestVTriangle.java
.../tests/org/vadere/util/geometry/shapes/TestVTriangle.java
+1
-1
No files found.
VadereGui/resources/messages.properties
View file @
17ea3e8c
...
...
@@ -136,6 +136,7 @@ ProjectView.chooseFile=Chose file
ProjectView.ScenarioChecker.title
=
Scenario Checker
ProjectView.ScenarioChecker.deactive.text
=
ScenarioChecker deactivated. Project > Activate ScenarioChecker
ProjectView.ScenarioChecker.active.text
=
The following problems where found
ProjectView.btnGenerateMesh.tooltip
=
Generate background mesh
SaveBeforeClosing.text
=
Do you want to save the current project before closing?
...
...
@@ -364,6 +365,7 @@ TopographyCreator.PlaceRandomPedestrians.couldNotPlaceAllPeds.requested.text=Req
TopographyCreator.PlaceRandomPedestrians.couldNotPlaceAllPeds.placed.text
=
Placed pedestrians
TopographyCreator.btnChecker.tooltip
=
Show Topography Checker Messages
TopographyCreator.btnGenerateIds.tooltip
=
Generate missing Ids for sources, targets, ...
TopographyCreator.btnGenerateMesh.tooltip
=
Generate background mesh
select_shape_tooltip
=
Select Shape
...
...
VadereGui/resources/messages_de_DE.properties
View file @
17ea3e8c
...
...
@@ -137,6 +137,7 @@ ProjectView.label.simResults=Simulationsergebniss
ProjectView.ScenarioChecker.title
=
Scenario Checker
ProjectView.ScenarioChecker.deactive.text
=
ScenarioChecker deaktiviert. Projekt > ScenarioChecker aktivieren
ProjectView.ScenarioChecker.active.text
=
Probleme gefunden
ProjectView.btnGenerateMesh.tooltip
=
Generiere Hintergrundgitter
SaveBeforeClosing.text
=
Aktuelles Projekt vor dem Beenden speichern?
...
...
@@ -356,7 +357,7 @@ TopographyCreator.PlaceRandomPedestrians.couldNotPlaceAllPeds.requested.text=Ang
TopographyCreator.PlaceRandomPedestrians.couldNotPlaceAllPeds.placed.text
=
Platzierte Fu
\u
00dfg
\u
00e4nger
TopographyCreator.btnChecker.tooltip
=
Topography Linter Nachrichten
TopographyCreator.btnGenerateIds.tooltip
=
Erzeuge fehlende Ids f
\u
00fcr Quellen, Ziele, ...
TopographyCreator.btnGenerateMesh.tooltip
=
Generiere Hintergrundgitter
# tab titles Topography creator / postvis
Tab.Simulation.title
=
Simulation
...
...
VadereGui/src/org/vadere/gui/components/control/ActionGenerateMesh.java
0 → 100644
View file @
17ea3e8c
package
org.vadere.gui.components.control
;
import
org.apache.commons.configuration2.Configuration
;
import
org.jetbrains.annotations.NotNull
;
import
org.vadere.gui.components.control.simulation.ActionGeneratePNG
;
import
org.vadere.gui.projectview.model.ProjectViewModel
;
import
org.vadere.gui.topographycreator.view.ActionTranslateTopographyDialog
;
import
org.vadere.meshing.mesh.gen.PFace
;
import
org.vadere.meshing.mesh.gen.PHalfEdge
;
import
org.vadere.meshing.mesh.gen.PVertex
;
import
org.vadere.meshing.mesh.impl.PSLG
;
import
org.vadere.meshing.mesh.inter.IMesh
;
import
org.vadere.meshing.utils.MeshConstructor
;
import
org.vadere.meshing.utils.io.poly.MeshPolyWriter
;
import
org.vadere.simulator.utils.pslg.PSLGConverter
;
import
org.vadere.util.config.VadereConfig
;
import
org.vadere.util.io.IOUtils
;
import
org.vadere.util.logging.Logger
;
import
java.awt.event.ActionEvent
;
import
java.io.File
;
import
java.io.FileWriter
;
import
java.io.IOException
;
import
java.util.concurrent.CompletableFuture
;
import
javax.swing.*
;
public
class
ActionGenerateMesh
extends
AbstractAction
{
private
static
Logger
logger
=
Logger
.
getLogger
(
ActionGeneratePNG
.
class
);
private
static
final
Configuration
CONFIG
=
VadereConfig
.
getConfig
();
private
final
ProjectViewModel
model
;
public
ActionGenerateMesh
(
final
String
name
,
Icon
icon
,
final
ProjectViewModel
model
)
{
super
(
name
,
icon
);
this
.
model
=
model
;
}
@Override
public
void
actionPerformed
(
final
ActionEvent
e
)
{
/*JFileChooser fileChooser = new JFileChooser(CONFIG.getString("SettingsDialog.snapshotDirectory.path"));
Date todaysDate = new java.util.Date();
SimpleDateFormat formatter = new SimpleDateFormat(CONFIG.getString("SettingsDialog.dataFormat"));
String formattedDate = formatter.format(todaysDate);*/
ActionTranslateTopographyDialog
dialog
=
new
ActionTranslateTopographyDialog
(
0.5
,
5.0
,
"hmin, hmax"
);
if
(
dialog
.
getValue
()){
double
hmin
=
dialog
.
getX
();
double
hmax
=
dialog
.
getY
();
PSLGConverter
pslgConverter
=
new
PSLGConverter
();
PSLG
pslg
=
pslgConverter
.
toPSLG
(
model
.
getCurrentScenario
().
getTopography
());
logger
.
info
(
"generate poly"
);
MeshConstructor
constructor
=
new
MeshConstructor
();
CompletableFuture
.
supplyAsync
(()
->
constructor
.
pslgToAdaptivePMesh
(
pslg
,
hmin
,
hmax
,
true
)).
thenAccept
(
mesh
->
saveFloorFieldMesh
(
mesh
,
""
));
CompletableFuture
.
supplyAsync
(()
->
constructor
.
pslgToCoarsePMesh
(
pslg
,
true
)).
thenAccept
(
mesh
->
saveFloorFieldMesh
(
mesh
,
IOUtils
.
BACKGROUND_MESH_ENDING
));
}
}
private
void
saveFloorFieldMesh
(
@NotNull
final
IMesh
<
PVertex
,
PHalfEdge
,
PFace
>
mesh
,
final
String
ending
)
{
logger
.
info
(
"generate mesh"
);
File
meshDir
=
new
File
(
model
.
getCurrentProjectPath
().
concat
(
"/"
+
IOUtils
.
SCENARIO_DIR
+
"/"
+
IOUtils
.
MESH_DIR
));
File
outputFile
=
new
File
(
meshDir
.
getAbsoluteFile
()
+
"/"
+
model
.
getCurrentScenario
().
getName
()
+
ending
+
".poly"
);
MeshPolyWriter
<
PVertex
,
PHalfEdge
,
PFace
>
meshPolyWriter
=
new
MeshPolyWriter
<>();
String
meshString
=
meshPolyWriter
.
to2DPoly
(
mesh
);
if
(
meshDir
.
exists
())
{
meshDir
.
mkdir
();
}
if
(!
outputFile
.
exists
())
{
try
{
outputFile
.
createNewFile
();
}
catch
(
IOException
e1
)
{
e1
.
printStackTrace
();
}
}
try
(
FileWriter
fileWriter
=
new
FileWriter
(
outputFile
))
{
fileWriter
.
write
(
meshString
);
logger
.
info
(
"generate new mesh file: "
+
outputFile
.
getAbsolutePath
());
}
catch
(
IOException
ex
)
{
logger
.
error
(
ex
.
getMessage
());
ex
.
printStackTrace
();
}
}
}
VadereGui/src/org/vadere/gui/components/model/SimulationModel.java
View file @
17ea3e8c
...
...
@@ -51,7 +51,7 @@ public abstract class SimulationModel<T extends DefaultSimulationConfig> extends
return
config
;
}
public
IMesh
<?,
?,
?>
get
Discretization
()
{
public
IMesh
<?,
?,
?>
get
FloorFieldMesh
()
{
return
new
PMesh
();
}
...
...
VadereGui/src/org/vadere/gui/components/view/DefaultRenderer.java
View file @
17ea3e8c
...
...
@@ -673,7 +673,10 @@ public abstract class DefaultRenderer {
@NotNull
final
Graphics2D
g
,
@NotNull
final
IMesh
<?,
?,
?>
mesh
,
@NotNull
final
VRectangle
bound
)
{
MeshRenderer
<?,
?,
?>
meshRenderer
=
new
MeshRenderer
<>(
mesh
);
MeshRenderer
<?,
?,
?>
meshRenderer
=
new
MeshRenderer
<>(
mesh
,
false
);
meshRenderer
.
renderPostTransform
(
g
,
bound
);
//meshRenderer.renderGraphics(g, bound);
}
...
...
VadereGui/src/org/vadere/gui/components/view/SimulationRenderer.java
View file @
17ea3e8c
...
...
@@ -108,7 +108,7 @@ public abstract class SimulationRenderer extends DefaultRenderer {
}
if
(
model
.
config
.
isShowTargetPotentielFieldMesh
())
{
renderMesh
(
graphics
,
model
.
get
Discretization
(),
new
VRectangle
(
model
.
getTopographyBound
()));
renderMesh
(
graphics
,
model
.
get
FloorFieldMesh
(),
new
VRectangle
(
model
.
getTopographyBound
()));
}
renderSimulationContent
(
graphics
);
...
...
VadereGui/src/org/vadere/gui/onlinevisualization/OnlineVisualization.java
View file @
17ea3e8c
...
...
@@ -9,6 +9,7 @@ import org.vadere.meshing.mesh.inter.IMesh;
import
org.vadere.simulator.control.simulation.PassiveCallback
;
import
org.vadere.simulator.models.potential.fields.IPotentialField
;
import
org.vadere.simulator.models.potential.fields.IPotentialFieldTarget
;
import
org.vadere.simulator.projects.Domain
;
import
org.vadere.state.scenario.Agent
;
import
org.vadere.state.scenario.Topography
;
import
org.vadere.util.geometry.shapes.VRectangle
;
...
...
@@ -25,7 +26,7 @@ public class OnlineVisualization implements PassiveCallback {
*/
public
class
ObservationAreaSnapshotData
{
public
final
double
simTimeInSec
;
public
final
Topography
scenario
;
public
final
Domain
domain
;
public
final
IPotentialField
potentialFieldTarget
;
public
final
Agent
selectedAgent
;
public
final
IPotentialField
potentialField
;
...
...
@@ -33,13 +34,13 @@ public class OnlineVisualization implements PassiveCallback {
public
ObservationAreaSnapshotData
(
final
double
simTimeInSec
,
@NotNull
final
Topography
scenario
,
@NotNull
final
Domain
scenario
,
@Nullable
final
IPotentialField
potentialFieldTarget
,
@Nullable
final
IPotentialField
potentialField
,
@Nullable
final
Agent
selectedAgent
,
@Nullable
final
Function
<
Agent
,
IMesh
<?,
?,
?>>
discretizations
)
{
this
.
simTimeInSec
=
simTimeInSec
;
this
.
scenario
=
scenario
;
this
.
domain
=
scenario
;
this
.
potentialFieldTarget
=
potentialFieldTarget
;
this
.
potentialField
=
potentialField
;
this
.
selectedAgent
=
selectedAgent
;
...
...
@@ -50,7 +51,7 @@ public class OnlineVisualization implements PassiveCallback {
private
MainPanel
window
;
private
OnlineVisualisationWindow
onlineVisualisationPanel
;
private
OnlineVisualizationModel
model
;
private
Topography
scenario
;
private
Domain
domain
;
/**
* Target potential.
...
...
@@ -75,8 +76,8 @@ public class OnlineVisualization implements PassiveCallback {
}
@Override
public
void
set
Topography
(
final
Topography
scenario
)
{
this
.
scenario
=
scenario
;
public
void
set
Domain
(
final
Domain
domain
)
{
this
.
domain
=
domain
;
}
@Override
...
...
@@ -146,7 +147,7 @@ public class OnlineVisualization implements PassiveCallback {
pedPotentialField
=
IPotentialField
.
copyAgentField
(
potentialField
,
selectedAgent
,
new
VRectangle
(
model
.
getTopographyBound
()),
0.1
);
}
ObservationAreaSnapshotData
data
=
new
ObservationAreaSnapshotData
(
simTimeInSec
,
scenario
.
clone
(),
pft
,
pedPotentialField
,
selectedAgent
,
discretizations
);
ObservationAreaSnapshotData
data
=
new
ObservationAreaSnapshotData
(
simTimeInSec
,
domain
.
clone
(),
pft
,
pedPotentialField
,
selectedAgent
,
discretizations
);
model
.
pushObservationAreaSnapshot
(
data
);
}
}
...
...
VadereGui/src/org/vadere/gui/onlinevisualization/model/OnlineVisualizationModel.java
View file @
17ea3e8c
...
...
@@ -14,9 +14,11 @@ import org.vadere.gui.components.model.AgentColoring;
import
org.vadere.gui.components.model.DefaultSimulationConfig
;
import
org.vadere.gui.components.model.SimulationModel
;
import
org.vadere.gui.onlinevisualization.OnlineVisualization
;
import
org.vadere.meshing.mesh.gen.AMesh
;
import
org.vadere.meshing.mesh.gen.PMesh
;
import
org.vadere.meshing.mesh.inter.IMesh
;
import
org.vadere.simulator.models.potential.fields.IPotentialField
;
import
org.vadere.simulator.projects.Domain
;
import
org.vadere.state.scenario.*
;
import
org.vadere.util.geometry.shapes.IPoint
;
import
org.vadere.util.voronoi.VoronoiDiagram
;
...
...
@@ -38,8 +40,6 @@ public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationC
private
IPotentialField
potentialField
=
null
;
private
Function
<
Agent
,
IMesh
<?,
?,
?>>
discretizations
=
null
;
private
Agent
agent
=
null
;
/**
...
...
@@ -63,7 +63,7 @@ public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationC
* The observation area to display. Updated by popDrawData() with the latest
* observation area snapshot.
*/
private
Topography
topography
;
private
Domain
domain
;
public
OnlineVisualizationModel
()
{
super
(
new
DefaultSimulationConfig
());
...
...
@@ -75,21 +75,21 @@ public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationC
@Override
public
Collection
<
Agent
>
getAgents
()
{
if
(
topography
==
null
)
{
if
(
domain
==
null
||
domain
.
getTopography
()
==
null
)
{
return
new
ArrayList
<>();
}
Collection
<
Agent
>
result
=
new
LinkedList
<>();
result
.
addAll
(
topography
.
getElements
(
Agent
.
class
));
result
.
addAll
(
domain
.
getTopography
()
.
getElements
(
Agent
.
class
));
return
result
;
}
@Override
public
Collection
<
Pedestrian
>
getPedestrians
()
{
if
(
topography
==
null
)
{
if
(
domain
==
null
)
{
return
new
ArrayList
<>();
}
Collection
<
Pedestrian
>
result
=
new
LinkedList
<>();
result
.
addAll
(
topography
.
getElements
(
Pedestrian
.
class
));
result
.
addAll
(
domain
.
getTopography
()
.
getElements
(
Pedestrian
.
class
));
return
result
;
}
...
...
@@ -100,15 +100,18 @@ public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationC
@Override
public
Topography
getTopography
()
{
return
topography
;
if
(
domain
==
null
)
{
return
null
;
}
return
domain
.
getTopography
();
}
@Override
public
Iterator
<
ScenarioElement
>
iterator
()
{
if
(
topography
==
null
)
{
if
(
domain
==
null
)
{
return
new
ArrayList
<
ScenarioElement
>().
iterator
();
}
return
new
TopographyIterator
(
topography
);
return
new
TopographyIterator
(
domain
.
getTopography
()
);
}
/**
...
...
@@ -130,7 +133,6 @@ public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationC
potentialFieldTarget
=
observationAreaSnapshot
.
potentialFieldTarget
;
potentialField
=
observationAreaSnapshot
.
potentialField
;
agent
=
observationAreaSnapshot
.
selectedAgent
;
discretizations
=
observationAreaSnapshot
.
discretizations
;
/*
* if(topography == null ||
...
...
@@ -139,30 +141,30 @@ public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationC
* }
*/
if
(
topography
==
null
)
{
topography
=
observationAreaSnapshot
.
scenario
;
if
(
domain
==
null
)
{
domain
=
observationAreaSnapshot
.
domain
;
// recalculate GUI (fireChangeViewportEvent will synchronize on model which is also
// needed by some awt event. Therefore do this in EDT (Event Dispatching Thread)
EventQueue
.
invokeLater
(()
->
{
fireChangeViewportEvent
(
new
Rectangle2D
.
Double
(
topography
.
getBounds
().
x
,
topography
.
getBounds
().
y
,
topography
.
getBounds
().
width
,
topography
.
getBounds
().
height
));
fireChangeViewportEvent
(
new
Rectangle2D
.
Double
(
getTopography
().
getBounds
().
x
,
getTopography
()
.
getBounds
().
y
,
getTopography
().
getBounds
().
width
,
getTopography
()
.
getBounds
().
height
));
});
}
else
{
topography
=
observationAreaSnapshot
.
scenario
;
domain
=
observationAreaSnapshot
.
domain
;
}
if
(
getSelectedElement
()
instanceof
Car
)
{
int
carId
=
getSelectedElement
().
getId
();
Car
car
=
topography
.
getElement
(
Car
.
class
,
carId
);
Car
car
=
domain
.
getTopography
()
.
getElement
(
Car
.
class
,
carId
);
setSelectedElement
(
car
);
}
else
if
(
getSelectedElement
()
instanceof
Pedestrian
)
{
int
pedId
=
getSelectedElement
().
getId
();
Pedestrian
ped
=
topography
.
getElement
(
Pedestrian
.
class
,
pedId
);
Pedestrian
ped
=
domain
.
getTopography
()
.
getElement
(
Pedestrian
.
class
,
pedId
);
setSelectedElement
(
ped
);
}
if
(
isVoronoiDiagramAvailable
()
&&
isVoronoiDiagramVisible
())
{
getVoronoiDiagram
().
computeVoronoiDiagram
(
topography
.
getPedestrianDynamicElements
().
getElements
()
getVoronoiDiagram
().
computeVoronoiDiagram
(
domain
.
getTopography
()
.
getPedestrianDynamicElements
().
getElements
()
.
stream
()
.
map
(
ped
->
ped
.
getPosition
())
.
collect
(
Collectors
.
toList
()));
...
...
@@ -186,7 +188,7 @@ public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationC
selectedElement
=
null
;
voronoiDiagram
=
null
;
topography
=
null
;
domain
=
null
;
simTimeInSec
=
0.0
;
}
...
...
@@ -225,12 +227,12 @@ public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationC
}
@Override
public
IMesh
<?,
?,
?>
getDiscretization
()
{
if
(
agent
!=
null
&&
discretizations
!=
null
&&
config
.
isShowTargetPotentielFieldMesh
()
&&
agent
.
equals
(
getSelectedElement
()))
{
return
discretizations
.
apply
(
agent
);
public
IMesh
<?,
?,
?>
getFloorFieldMesh
()
{
if
(
domain
.
getFloorFieldMesh
()
!=
null
)
{
return
domain
.
getFloorFieldMesh
();
}
else
{
return
new
AMesh
();
}
return
new
PMesh
();
}
@Override
...
...
@@ -263,6 +265,6 @@ public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationC
@Override
public
boolean
isAlive
(
int
pedId
)
{
return
topography
.
getPedestrianDynamicElements
().
idExists
(
pedId
);
return
domain
.
getTopography
()
.
getPedestrianDynamicElements
().
idExists
(
pedId
);
}
}
VadereGui/src/org/vadere/gui/projectview/view/ScenarioPanel.java
View file @
17ea3e8c
...
...
@@ -256,7 +256,7 @@ public class ScenarioPanel extends JPanel implements IProjectChangeListener, Pro
tabbedPane
.
removeTabAt
(
tabbedPane
.
indexOfComponent
(
topographyCreatorView
));
}
topographyCreatorView
=
new
TopographyWindow
(
scenario
);
topographyCreatorView
=
new
TopographyWindow
(
scenario
,
model
);
tabbedPane
.
addTab
(
Messages
.
getString
(
"Tab.TopographyCreator.title"
),
topographyCreatorView
);
tabbedPane
.
validate
();
tabbedPane
.
repaint
();
...
...
VadereGui/src/org/vadere/gui/topographycreator/view/ActionTranslateTopographyDialog.java
View file @
17ea3e8c
...
...
@@ -19,8 +19,13 @@ public class ActionTranslateTopographyDialog {
private
final
double
xOld
;
private
final
double
yOld
;
private
boolean
valid
;
private
final
String
label
;
public
ActionTranslateTopographyDialog
(
final
double
x
,
double
y
){
this
(
x
,
y
,
"x, y"
);
}
public
ActionTranslateTopographyDialog
(
final
double
x
,
double
y
,
final
String
label
){
this
.
textField
=
new
JTextField
(
30
);
this
.
textField
.
setText
(
String
.
format
(
Locale
.
ENGLISH
,
"%f, %f"
,
x
,
y
));
...
...
@@ -30,6 +35,7 @@ public class ActionTranslateTopographyDialog {
this
.
y
=
y
;
this
.
xOld
=
x
;
this
.
yOld
=
y
;
this
.
label
=
label
;
}
public
double
getX
()
{
...
...
@@ -44,7 +50,7 @@ public class ActionTranslateTopographyDialog {
return
JOptionPane
.
showConfirmDialog
(
ProjectView
.
getMainWindow
(),
textField
,
"x, y"
,
label
,
JOptionPane
.
OK_CANCEL_OPTION
)
==
JOptionPane
.
OK_OPTION
;
}
...
...
VadereGui/src/org/vadere/gui/topographycreator/view/TopographyWindow.java
View file @
17ea3e8c
...
...
@@ -3,6 +3,8 @@ package org.vadere.gui.topographycreator.view;
import
com.jgoodies.forms.layout.CellConstraints
;
import
com.jgoodies.forms.layout.FormLayout
;
import
org.jetbrains.annotations.NotNull
;
import
org.vadere.gui.components.control.ActionGenerateMesh
;
import
org.vadere.gui.components.control.ActionGeneratePoly
;
import
org.vadere.gui.components.control.IViewportChangeListener
;
import
org.vadere.gui.components.control.JViewportChangeListener
;
...
...
@@ -14,6 +16,7 @@ import org.vadere.gui.components.view.InfoPanel;
import
org.vadere.gui.components.view.ScenarioElementView
;
import
org.vadere.gui.components.view.ScenarioToolBar
;
import
org.vadere.gui.projectview.control.ActionDeselect
;
import
org.vadere.gui.projectview.model.ProjectViewModel
;
import
org.vadere.gui.projectview.view.JsonValidIndicator
;
import
org.vadere.gui.topographycreator.control.ActionBasic
;
import
org.vadere.gui.topographycreator.control.ActionCopyElement
;
...
...
@@ -81,7 +84,7 @@ public class TopographyWindow extends JPanel {
private
UndoableEditSupport
undoSupport
;
private
UndoManager
undoManager
;
public
TopographyWindow
(
final
Scenario
currentScenario
)
{
public
TopographyWindow
(
final
Scenario
currentScenario
,
@NotNull
final
ProjectViewModel
model
)
{
toolbar
=
new
ScenarioToolBar
(
"Toolbar"
);
int
toolbarSize
=
VadereConfig
.
getConfig
().
getInt
(
"Gui.toolbar.size"
);
...
...
@@ -99,7 +102,7 @@ public class TopographyWindow extends JPanel {
undoManager
=
new
UndoManager
();
undoSupport
.
addUndoableEditListener
(
new
UndoAdaptor
(
undoManager
));
setTopography
(
new
TopographyCreatorModel
(
currentScenario
));
setTopography
(
new
TopographyCreatorModel
(
currentScenario
)
,
model
);
}
private
static
JButton
addActionToToolbar
(
final
JToolBar
toolbar
,
final
Action
action
,
...
...
@@ -120,7 +123,7 @@ public class TopographyWindow extends JPanel {
return
button
;
}
private
void
setTopography
(
final
TopographyCreatorModel
panelModel
)
{
private
void
setTopography
(
final
TopographyCreatorModel
panelModel
,
@NotNull
final
ProjectViewModel
model
)
{
this
.
panelModel
=
panelModel
;
this
.
panelModel
.
setMouseSelectionMode
(
new
SelectElementMode
(
panelModel
,
undoSupport
));
...
...
@@ -423,6 +426,10 @@ public class TopographyWindow extends JPanel {
resources
.
getIcon
(
"camera_poly.png"
,
iconWidth
,
iconHeight
),
panelModel
);
AbstractAction
generateMesh
=
new
ActionGenerateMesh
(
Messages
.
getString
(
"ProjectView.btnGenerateMesh.tooltip"
),
resources
.
getIcon
(
"generate_mesh.png"
,
iconWidth
,
iconHeight
),
model
);
/* create toolbar*/
addActionToToolbar
(
toolbar
,
selectShape
,
"select_shape_tooltip"
);
...
...
@@ -468,6 +475,7 @@ public class TopographyWindow extends JPanel {
addActionToToolbar
(
toolbar
,
resetScenarioAction
,
"TopographyCreator.btnNewTopography.tooltip"
);
addActionToToolbar
(
toolbar
,
saveScenarioAction
,
"TopographyCreator.btnQuickSave.tooltip"
);
addActionToToolbar
(
toolbar
,
polyImg
,
"TopographyCreator.btnGeneratePoly.tooltip"
);
addActionToToolbar
(
toolbar
,
generateMesh
,
"TopographyCreator.btnGenerateMesh.tooltip"
);
toolbar
.
addSeparator
(
new
Dimension
(
5
,
50
));
addActionToToolbar
(
toolbar
,
undoAction
,
"TopographyCreator.btnUndo.tooltip"
);
...
...
VadereManager/tests/org/vadere/manager/traci/commandHandler/SimulationCommandHandlerTest.java
View file @
17ea3e8c
...
...
@@ -46,6 +46,7 @@ public class SimulationCommandHandlerTest extends CommandHandlerTest {
}
catch
(
IOException
e
)
{
throw
e
;
}
TraCIGetCommand
cmd
=
(
TraCIGetCommand
)
getFirstCommand
(
TraCIGetCacheHashCommand
.
build
(
TraCICmd
.
GET_SIMULATION_VALUE
,
elementID
,
varID
,
varType
,
data
));
RemoteManager
rm
=
new
TestRemoteManager
()
{
...
...
VadereMeshing/resources/poly/bridge.poly
View file @
17ea3e8c
# nVertices dimension nAttributes boundaryMarker
1
9
2 0 0
1
8
2 0 0
# vertexId x y
1 10.068317 15.240938
2 0.500000 12.473684
3 49.500000 49.500000
4 49.500000 0.500000
5 7.711478 10.030659
6 0.500000 45.907735
7 0.500000 42.907735
8 32.129121 5.936819
9 0.500000 49.500000
10 3.888684 20.251412
11 1.463889 42.907735
12 1.821300 11.082842
13 23.463889 45.907735
14 49.500000 5.936819
15 15.459378 12.808810
16 20.931872 10.544835
17 29.892589 0.500000
18 49.500000 42.506680
19 31.295924 42.506680
2 49.500000 49.500000
3 49.500000 0.500000
4 7.711478 10.030659
5 0.500000 45.907735
6 32.129121 5.936819
7 0.500000 49.500000
8 3.888684 20.251412
9 0.985522 42.000000
10 0.500000 11.318871
11 23.463889 45.907735
12 49.500000 5.936819
13 15.459378 12.808810
14 29.892589 0.500000
15 20.931872 10.544835
16 49.500000 42.506680
17 0.500000 42.000000
18 31.295924 42.506680
#
# nSegments boundaryMarker
1
9
0
1
8
0
# lineId vertexId1 vertexId2
1 4 14
2 14 8
3 8 16
4 16 19