Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
adbcd1b9
Commit
adbcd1b9
authored
Oct 23, 2018
by
Benedikt Zoennchen
Browse files
structure the meshing package even further.
parent
180c7d31
Changes
61
Hide whitespace changes
Inline
Side-by-side
VadereGui/src/org/vadere/gui/components/model/DefaultModel.java
View file @
adbcd1b9
...
...
@@ -29,8 +29,8 @@ import org.vadere.util.data.cellgrid.CellState;
import
org.vadere.util.data.cellgrid.PathFindingTag
;
import
org.vadere.util.math.DistanceFunction
;
import
org.vadere.util.math.IDistanceFunction
;
import
org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint
;
import
org.vadere.meshing.mesh.triangulation.improver.PEikMesh
;
import
org.vadere.meshing.mesh.triangulation.improver.
eikmesh.
EikMeshPoint
;
import
org.vadere.meshing.mesh.triangulation.improver.
eikmesh.
PEikMesh
;
import
org.vadere.util.voronoi.VoronoiDiagram
;
import
java.awt.*
;
...
...
VadereGui/src/org/vadere/gui/components/model/DefaultSimulationConfig.java
View file @
adbcd1b9
...
...
@@ -7,7 +7,7 @@ import java.util.Optional;
import
java.util.TreeMap
;
import
org.vadere.gui.components.utils.Resources
;
import
org.vadere.
meshing.color
.ColorHelper
;
import
org.vadere.
util.visualization
.ColorHelper
;
public
class
DefaultSimulationConfig
extends
DefaultConfig
{
private
static
Resources
resources
=
Resources
.
getInstance
(
"global"
);
...
...
VadereGui/src/org/vadere/gui/components/utils/CLGaussianCalculator.java
View file @
adbcd1b9
...
...
@@ -4,7 +4,7 @@ import java.awt.image.BufferedImage;
import
org.vadere.gui.components.model.DefaultSimulationConfig
;
import
org.vadere.gui.components.model.SimulationModel
;
import
org.vadere.
meshing.color
.ColorHelper
;
import
org.vadere.
util.visualization
.ColorHelper
;
import
org.vadere.simulator.models.density.IGaussianFilter
;
import
org.vadere.state.attributes.scenario.AttributesAgent
;
...
...
VadereGui/src/org/vadere/gui/components/view/SimulationRenderer.java
View file @
adbcd1b9
...
...
@@ -13,7 +13,7 @@ import java.util.stream.Stream;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.jetbrains.annotations.NotNull
;
import
org.vadere.
meshing.color
.ColorHelper
;
import
org.vadere.
util.visualization
.ColorHelper
;
import
org.vadere.gui.components.model.SimulationModel
;
import
org.vadere.gui.components.utils.CLGaussianCalculator
;
import
org.vadere.gui.components.utils.Resources
;
...
...
VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationRenderer.java
View file @
adbcd1b9
...
...
@@ -9,7 +9,7 @@ import java.util.stream.Stream;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.vadere.
meshing.color
.ColorHelper
;
import
org.vadere.
util.visualization
.ColorHelper
;
import
org.vadere.gui.components.view.DefaultRenderer
;
import
org.vadere.gui.components.view.SimulationRenderer
;
import
org.vadere.gui.postvisualization.model.PostvisualizationModel
;
...
...
VadereGui/src/org/vadere/gui/projectview/RecordTriangulationMovie.java
View file @
adbcd1b9
...
...
@@ -2,7 +2,7 @@ package org.vadere.gui.projectview;
import
org.apache.commons.lang3.time.StopWatch
;
import
org.vadere.gui.components.utils.Recorder
;
import
org.vadere.
meshing.color
.ColorHelper
;
import
org.vadere.
util.visualization
.ColorHelper
;
import
org.vadere.util.geometry.GeometryUtils
;
import
org.vadere.meshing.mesh.gen.AFace
;
import
org.vadere.meshing.mesh.gen.AHalfEdge
;
...
...
@@ -13,9 +13,9 @@ import org.vadere.util.geometry.shapes.VPolygon;
import
org.vadere.util.geometry.shapes.VRectangle
;
import
org.vadere.util.geometry.shapes.VShape
;
import
org.vadere.util.math.DistanceFunction
;
import
org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint
;
import
org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel
;
import
org.vadere.meshing.mesh.triangulation.improver.AEikMesh
;
import
org.vadere.meshing.mesh.triangulation.improver.
eikmesh.
EikMeshPoint
;
import
org.vadere.meshing.mesh.triangulation.improver.
eikmesh.
EikMeshPanel
;
import
org.vadere.meshing.mesh.triangulation.improver.
eikmesh.
AEikMesh
;
import
java.awt.*
;
import
java.io.IOException
;
...
...
VadereMeshing/src/org/vadere/meshing/
mesh/triangulation
/Example.java
→
VadereMeshing/src/org/vadere/meshing/
examples
/Example.java
View file @
adbcd1b9
package
org.vadere.meshing.
mesh.triangulation
;
package
org.vadere.meshing.
examples
;
import
org.vadere.util.geometry.GeometryUtils
;
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.triangulation.improver.EikMeshPanel
;
import
org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint
;
import
org.vadere.meshing.mesh.triangulation.improver.PEikMesh
;
import
org.vadere.meshing.mesh.triangulation.improver.
eikmesh.
EikMeshPanel
;
import
org.vadere.meshing.mesh.triangulation.improver.
eikmesh.
EikMeshPoint
;
import
org.vadere.meshing.mesh.triangulation.improver.
eikmesh.
PEikMesh
;
import
org.vadere.util.geometry.shapes.VPoint
;
import
org.vadere.util.geometry.shapes.VPolygon
;
import
org.vadere.util.geometry.shapes.VRectangle
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/impl/VPUniformRefinement.java
View file @
adbcd1b9
...
...
@@ -8,7 +8,7 @@ import org.vadere.meshing.mesh.triangulation.triangulator.UniformRefinementTrian
import
org.vadere.util.geometry.shapes.VPoint
;
import
org.vadere.util.geometry.shapes.VRectangle
;
import
org.vadere.util.geometry.shapes.VShape
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
java.util.Collection
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/
triangulation/adaptive
/IEdgeLengthFunction.java
→
VadereMeshing/src/org/vadere/meshing/mesh/
inter
/IEdgeLengthFunction.java
View file @
adbcd1b9
package
org.vadere.meshing.mesh.
triangulation.adaptive
;
package
org.vadere.meshing.mesh.
inter
;
import
org.vadere.util.geometry.shapes.IPoint
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/LaplacianSmother.java
View file @
adbcd1b9
...
...
@@ -9,10 +9,11 @@ import org.vadere.meshing.mesh.gen.PVertex;
import
org.vadere.meshing.mesh.inter.IMesh
;
import
org.vadere.meshing.mesh.inter.IPointLocator
;
import
org.vadere.meshing.mesh.inter.ITriangulation
;
import
org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPoint
;
import
org.vadere.meshing.mesh.triangulation.triangulator.RandomPointsSetTriangulator
;
import
org.vadere.util.math.IDistanceFunction
;
import
org.vadere.util.geometry.shapes.*
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
java.util.ArrayList
;
import
java.util.Collection
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/Distmesh.java
View file @
adbcd1b9
...
...
@@ -10,8 +10,8 @@ import org.apache.log4j.LogManager;
import
org.apache.log4j.Logger
;
import
org.vadere.meshing.ConstantLineIterator
;
import
org.vadere.util.math.IDistanceFunction
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.triangulation.improver.
eikmesh.
EikMeshPoint
;
import
org.vadere.util.geometry.shapes.IPoint
;
import
org.vadere.util.geometry.shapes.MLine
;
import
org.vadere.util.geometry.shapes.VLine
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/deprecated/DensityEdgeLenFunction.java
View file @
adbcd1b9
package
org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.triangulation.improver.distmesh.Parameters
;
import
org.vadere.util.geometry.shapes.IPoint
;
import
org.vadere.util.geometry.shapes.VPoint
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/deprecated/DistanceEdgeLenFunction.java
View file @
adbcd1b9
...
...
@@ -2,7 +2,7 @@ package org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated;
import
org.vadere.util.math.IDistanceFunction
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
org.vadere.util.geometry.shapes.IPoint
;
import
org.vadere.util.geometry.shapes.VRectangle
;
import
org.vadere.util.geometry.shapes.VShape
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/deprecated/EdgeLenFunctionFactory.java
View file @
adbcd1b9
package
org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated
;
import
org.vadere.util.math.IDistanceFunction
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
org.vadere.util.geometry.shapes.IPoint
;
import
org.vadere.util.geometry.shapes.VRectangle
;
import
org.vadere.util.geometry.shapes.VShape
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/distmesh/deprecated/SimpleDistanceEdgeLenFunction.java
View file @
adbcd1b9
package
org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated
;
import
org.vadere.util.math.IDistanceFunction
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
org.vadere.util.geometry.shapes.IPoint
;
import
org.vadere.util.geometry.shapes.VRectangle
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/AEikMesh.java
→
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/
eikmesh/
AEikMesh.java
View file @
adbcd1b9
package
org.vadere.meshing.mesh.triangulation.improver
;
package
org.vadere.meshing.mesh.triangulation.improver
.eikmesh
;
import
org.jetbrains.annotations.NotNull
;
import
org.vadere.meshing.mesh.gen.AFace
;
...
...
@@ -9,7 +9,7 @@ import org.vadere.util.math.IDistanceFunction;
import
org.vadere.util.geometry.shapes.VPolygon
;
import
org.vadere.util.geometry.shapes.VRectangle
;
import
org.vadere.util.geometry.shapes.VShape
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
java.util.Collection
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/EikMesh.java
→
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/
eikmesh/
EikMesh.java
View file @
adbcd1b9
package
org.vadere.meshing.mesh.triangulation.improver
;
package
org.vadere.meshing.mesh.triangulation.improver
.eikmesh
;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
...
...
@@ -9,6 +9,7 @@ import org.vadere.meshing.mesh.inter.IMesh;
import
org.vadere.meshing.mesh.inter.IMeshSupplier
;
import
org.vadere.meshing.mesh.inter.ITriangulation
;
import
org.vadere.meshing.mesh.inter.IVertex
;
import
org.vadere.meshing.mesh.triangulation.improver.IMeshImprover
;
import
org.vadere.meshing.mesh.triangulation.improver.distmesh.Parameters
;
import
org.vadere.meshing.mesh.triangulation.triangulator.ITriangulator
;
import
org.vadere.meshing.mesh.triangulation.triangulator.UniformRefinementTriangulatorSFC
;
...
...
@@ -22,7 +23,7 @@ import org.vadere.util.geometry.shapes.VRectangle;
import
org.vadere.util.geometry.shapes.VShape
;
import
org.vadere.util.geometry.shapes.VTriangle
;
import
org.vadere.util.math.DistanceFunction
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
java.awt.geom.Rectangle2D
;
import
java.util.ArrayList
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/EikMeshPanel.java
→
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/
eikmesh/
EikMeshPanel.java
View file @
adbcd1b9
package
org.vadere.meshing.mesh.triangulation.improver
;
package
org.vadere.meshing.mesh.triangulation.improver
.eikmesh
;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.jetbrains.annotations.NotNull
;
import
org.vadere.
meshing.color
.ColorHelper
;
import
org.vadere.
util.visualization
.ColorHelper
;
import
org.vadere.meshing.mesh.inter.IFace
;
import
org.vadere.meshing.mesh.inter.IHalfEdge
;
import
org.vadere.meshing.mesh.inter.IMesh
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/EikMeshPoint.java
→
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/
eikmesh/
EikMeshPoint.java
View file @
adbcd1b9
package
org.vadere.meshing.mesh.triangulation.improver
;
package
org.vadere.meshing.mesh.triangulation.improver
.eikmesh
;
import
org.vadere.util.geometry.shapes.IPoint
;
import
org.vadere.util.geometry.shapes.MPoint
;
...
...
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/PEikMesh.java
→
VadereMeshing/src/org/vadere/meshing/mesh/triangulation/improver/
eikmesh/
PEikMesh.java
View file @
adbcd1b9
package
org.vadere.meshing.mesh.triangulation.improver
;
package
org.vadere.meshing.mesh.triangulation.improver
.eikmesh
;
import
org.jetbrains.annotations.NotNull
;
import
org.vadere.meshing.mesh.gen.PFace
;
...
...
@@ -9,7 +9,7 @@ import org.vadere.util.math.IDistanceFunction;
import
org.vadere.util.geometry.shapes.VPolygon
;
import
org.vadere.util.geometry.shapes.VRectangle
;
import
org.vadere.util.geometry.shapes.VShape
;
import
org.vadere.meshing.mesh.
triangulation.adaptive
.IEdgeLengthFunction
;
import
org.vadere.meshing.mesh.
inter
.IEdgeLengthFunction
;
import
java.util.Collection
;
...
...
Prev
1
2
3
4
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment