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
03e5a6af
Commit
03e5a6af
authored
Dec 05, 2017
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
implemented the firt version of the laplacian smoother.
parent
3b6c15c5
Changes
41
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
41 changed files
with
1526 additions
and
254 deletions
+1526
-254
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
...odelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
+32
-16
VadereModelTests/TestOSM/scenarios/basic_3_1_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_3_1_wall_osm1.scenario
+32
-16
VadereModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
+32
-16
VadereModelTests/TestOSM/scenarios/basic_3_3_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_3_3_wall_osm1.scenario
+32
-16
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_4_1_wall_osm1.scenario
+32
-16
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm2.scenario
...ModelTests/TestOSM/scenarios/basic_4_1_wall_osm2.scenario
+32
-16
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm1.scenario
...ModelTests/TestOSM/scenarios/basic_4_2_wall_osm1.scenario
+32
-16
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm2.scenario
...ModelTests/TestOSM/scenarios/basic_4_2_wall_osm2.scenario
+32
-16
VadereModelTests/TestOSM/scenarios/queueing_floor_field_osm1.scenario
...ests/TestOSM/scenarios/queueing_floor_field_osm1.scenario
+34
-17
VadereModelTests/TestOSM/scenarios/rimea_09_publicRoom_osm1_2.scenario
...sts/TestOSM/scenarios/rimea_09_publicRoom_osm1_2.scenario
+156
-4
VadereModelTests/TestOSM/scenarios/rimea_09_publicRoom_osm1_4.scenario
...sts/TestOSM/scenarios/rimea_09_publicRoom_osm1_4.scenario
+88
-0
VadereSimulator/src/org/vadere/simulator/models/bhm/UtilsBHM.java
...mulator/src/org/vadere/simulator/models/bhm/UtilsBHM.java
+2
-2
VadereSimulator/src/org/vadere/simulator/models/osm/optimization/PotentialEvaluationFunction.java
.../models/osm/optimization/PotentialEvaluationFunction.java
+1
-0
VadereSimulator/src/org/vadere/simulator/models/osm/optimization/StepCircleOptimizerDiscrete.java
.../models/osm/optimization/StepCircleOptimizerDiscrete.java
+14
-1
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldObstacleOSM.java
...simulator/models/potential/PotentialFieldObstacleOSM.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldPedestrianCompact.java
...tor/models/potential/PotentialFieldPedestrianCompact.java
+4
-0
VadereState/src/org/vadere/state/attributes/models/AttributesPotentialCompact.java
...e/state/attributes/models/AttributesPotentialCompact.java
+4
-0
VadereUtils/src/org/vadere/util/geometry/mesh/impl/VPTriangulation.java
...c/org/vadere/util/geometry/mesh/impl/VPTriangulation.java
+1
-1
VadereUtils/src/org/vadere/util/geometry/mesh/impl/VPUniformRefinement.java
...g/vadere/util/geometry/mesh/impl/VPUniformRefinement.java
+2
-2
VadereUtils/src/org/vadere/util/geometry/mesh/inter/ITriangulation.java
...c/org/vadere/util/geometry/mesh/inter/ITriangulation.java
+14
-2
VadereUtils/src/org/vadere/util/opencl/CLDistMesh.java
VadereUtils/src/org/vadere/util/opencl/CLDistMesh.java
+2
-2
VadereUtils/src/org/vadere/util/potential/calculators/PotentialFieldCalculatorFastMarching3D.java
...l/calculators/PotentialFieldCalculatorFastMarching3D.java
+1
-1
VadereUtils/src/org/vadere/util/triangulation/IncrementalTriangulation.java
...g/vadere/util/triangulation/IncrementalTriangulation.java
+8
-9
VadereUtils/src/org/vadere/util/triangulation/adaptive/CLPSMeshing.java
...c/org/vadere/util/triangulation/adaptive/CLPSMeshing.java
+12
-5
VadereUtils/src/org/vadere/util/triangulation/adaptive/IDistanceFunction.java
...vadere/util/triangulation/adaptive/IDistanceFunction.java
+8
-0
VadereUtils/src/org/vadere/util/triangulation/adaptive/IPSMeshing.java
...rc/org/vadere/util/triangulation/adaptive/IPSMeshing.java
+0
-14
VadereUtils/src/org/vadere/util/triangulation/adaptive/PSMeshingOptimized.java
...adere/util/triangulation/adaptive/PSMeshingOptimized.java
+5
-5
VadereUtils/src/org/vadere/util/triangulation/adaptive/PSMeshingPanel.java
...rg/vadere/util/triangulation/adaptive/PSMeshingPanel.java
+3
-3
VadereUtils/src/org/vadere/util/triangulation/adaptive/Parameters.java
...rc/org/vadere/util/triangulation/adaptive/Parameters.java
+12
-12
VadereUtils/src/org/vadere/util/triangulation/adaptive/TestEnhancedVersion3.java
...ere/util/triangulation/adaptive/TestEnhancedVersion3.java
+4
-6
VadereUtils/src/org/vadere/util/triangulation/adaptive/TestEnhancedVersion5.java
...ere/util/triangulation/adaptive/TestEnhancedVersion5.java
+84
-0
VadereUtils/src/org/vadere/util/triangulation/improver/IMeshImprover.java
...org/vadere/util/triangulation/improver/IMeshImprover.java
+34
-0
VadereUtils/src/org/vadere/util/triangulation/improver/LaplacianSmother.java
.../vadere/util/triangulation/improver/LaplacianSmother.java
+123
-0
VadereUtils/src/org/vadere/util/triangulation/improver/PSMeshing.java
...src/org/vadere/util/triangulation/improver/PSMeshing.java
+499
-0
VadereUtils/src/org/vadere/util/triangulation/triangulator/ITriangulator.java
...vadere/util/triangulation/triangulator/ITriangulator.java
+11
-0
VadereUtils/src/org/vadere/util/triangulation/triangulator/PointSetTriangulator.java
...util/triangulation/triangulator/PointSetTriangulator.java
+32
-0
VadereUtils/src/org/vadere/util/triangulation/triangulator/RandomPointsSetTriangulator.java
...iangulation/triangulator/RandomPointsSetTriangulator.java
+64
-0
VadereUtils/src/org/vadere/util/triangulation/triangulator/UniformRefinementTriangulator.java
...ngulation/triangulator/UniformRefinementTriangulator.java
+19
-11
VadereUtils/src/org/vadere/util/triangulation/triangulator/UniformTriangulator.java
.../util/triangulation/triangulator/UniformTriangulator.java
+23
-18
VadereUtils/tests/org/vadere/util/potential/TestFFMUniformTriangulation.java
...rg/vadere/util/potential/TestFFMUniformTriangulation.java
+4
-9
VadereUtils/tests/org/vadere/util/triangulation/TestVisual.java
...Utils/tests/org/vadere/util/triangulation/TestVisual.java
+1
-1
No files found.
VadereModelTests/TestOSM/scenarios/basic_2_density_osm1.scenario
View file @
03e5a6af
...
...
@@ -128,16 +128,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 38.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 38.0001,
"y" : 0.5001
"y" : 0.5001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 0.5001
"y" : 0.5001,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -146,16 +150,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 38.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 38.0001,
"y" : 12.0001
"y" : 12.0001,
"identifier" : -1
}, {
"x" : 37.4999,
"y" : 12.0001
"y" : 12.0001,
"identifier" : -1
}, {
"x" : 37.4999,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -164,16 +172,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 38.0001,
"y" : 12.0001
"y" : 12.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 12.0001
"y" : 12.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 11.4999
"y" : 11.4999,
"identifier" : -1
}, {
"x" : 38.0001,
"y" : 11.4999
"y" : 11.4999,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -182,16 +194,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 12.0001
"y" : 12.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 0.5001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 0.5001,
"y" : 12.0001
"y" : 12.0001,
"identifier" : -1
} ]
},
"id" : -1
...
...
VadereModelTests/TestOSM/scenarios/basic_3_1_wall_osm1.scenario
View file @
03e5a6af
...
...
@@ -93,16 +93,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 0.5001
"y" : 0.5001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 0.5001
"y" : 0.5001,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -111,16 +115,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 19.4999,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 19.4999,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -129,16 +137,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 9.4999
"y" : 9.4999,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 9.4999
"y" : 9.4999,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -147,16 +159,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 0.5001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 0.5001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
} ]
},
"id" : -1
...
...
VadereModelTests/TestOSM/scenarios/basic_3_2_wall_osm1.scenario
View file @
03e5a6af
...
...
@@ -93,16 +93,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 0.5001
"y" : 0.5001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 0.5001
"y" : 0.5001,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -111,16 +115,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 19.4999,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 19.4999,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -129,16 +137,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 9.4999
"y" : 9.4999,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 9.4999
"y" : 9.4999,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -147,16 +159,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 0.5001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 0.5001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
} ]
},
"id" : -1
...
...
VadereModelTests/TestOSM/scenarios/basic_3_3_wall_osm1.scenario
View file @
03e5a6af
...
...
@@ -93,16 +93,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 0.5001
"y" : 0.5001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 0.5001
"y" : 0.5001,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -111,16 +115,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 19.4999,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 19.4999,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -129,16 +137,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 9.4999
"y" : 9.4999,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 9.4999
"y" : 9.4999,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -147,16 +159,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 0.5001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 0.5001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
} ]
},
"id" : -1
...
...
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm1.scenario
View file @
03e5a6af
...
...
@@ -93,16 +93,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 1.0001
"y" : 1.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 1.0001
"y" : 1.0001,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -111,16 +115,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 18.9999,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 18.9999,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -129,16 +137,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 8.9999
"y" : 8.9999,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 8.9999
"y" : 8.9999,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -147,16 +159,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 1.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 1.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
} ]
},
"id" : -1
...
...
VadereModelTests/TestOSM/scenarios/basic_4_1_wall_osm2.scenario
View file @
03e5a6af
...
...
@@ -93,16 +93,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 1.0001
"y" : 1.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 1.0001
"y" : 1.0001,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -111,16 +115,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 18.9999,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 18.9999,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -129,16 +137,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 8.9999
"y" : 8.9999,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 8.9999
"y" : 8.9999,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -147,16 +159,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 1.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 1.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
} ]
},
"id" : -1
...
...
VadereModelTests/TestOSM/scenarios/basic_4_2_wall_osm1.scenario
View file @
03e5a6af
...
...
@@ -93,16 +93,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 1.0001
"y" : 1.0001,
"identifier" : -1
}, {
"x" : -1.0E-4,
"y" : 1.0001
"y" : 1.0001,
"identifier" : -1
} ]
},
"id" : -1
...
...
@@ -111,16 +115,20 @@
"type" : "POLYGON",
"points" : [ {
"x" : 20.0001,
"y" : -1.0E-4
"y" : -1.0E-4,
"identifier" : -1
}, {
"x" : 20.0001,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 18.9999,
"y" : 10.0001
"y" : 10.0001,
"identifier" : -1
}, {
"x" : 18.9999,
"y" : -1.0E-4
"y" : -1.0E-4,