Starting from 2021-07-01, all LRZ GitLab users will be required to explicitly accept the GitLab Terms of Service. Please see the detailed information at https://doku.lrz.de/display/PUBLIC/GitLab and make sure that your projects conform to the requirements.

Commit adbcd1b9 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

structure the meshing package even further.

parent 180c7d31
...@@ -29,8 +29,8 @@ import org.vadere.util.data.cellgrid.CellState; ...@@ -29,8 +29,8 @@ import org.vadere.util.data.cellgrid.CellState;
import org.vadere.util.data.cellgrid.PathFindingTag; import org.vadere.util.data.cellgrid.PathFindingTag;
import org.vadere.util.math.DistanceFunction; import org.vadere.util.math.DistanceFunction;
import org.vadere.util.math.IDistanceFunction; import org.vadere.util.math.IDistanceFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint; import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.PEikMesh; import org.vadere.meshing.mesh.triangulation.improver.eikmesh.PEikMesh;
import org.vadere.util.voronoi.VoronoiDiagram; import org.vadere.util.voronoi.VoronoiDiagram;
import java.awt.*; import java.awt.*;
......
...@@ -7,7 +7,7 @@ import java.util.Optional; ...@@ -7,7 +7,7 @@ import java.util.Optional;
import java.util.TreeMap; import java.util.TreeMap;
import org.vadere.gui.components.utils.Resources; import org.vadere.gui.components.utils.Resources;
import org.vadere.meshing.color.ColorHelper; import org.vadere.util.visualization.ColorHelper;
public class DefaultSimulationConfig extends DefaultConfig { public class DefaultSimulationConfig extends DefaultConfig {
private static Resources resources = Resources.getInstance("global"); private static Resources resources = Resources.getInstance("global");
......
...@@ -4,7 +4,7 @@ import java.awt.image.BufferedImage; ...@@ -4,7 +4,7 @@ import java.awt.image.BufferedImage;
import org.vadere.gui.components.model.DefaultSimulationConfig; import org.vadere.gui.components.model.DefaultSimulationConfig;
import org.vadere.gui.components.model.SimulationModel; 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.simulator.models.density.IGaussianFilter;
import org.vadere.state.attributes.scenario.AttributesAgent; import org.vadere.state.attributes.scenario.AttributesAgent;
......
...@@ -13,7 +13,7 @@ import java.util.stream.Stream; ...@@ -13,7 +13,7 @@ import java.util.stream.Stream;
import org.apache.log4j.LogManager; import org.apache.log4j.LogManager;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull; 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.model.SimulationModel;
import org.vadere.gui.components.utils.CLGaussianCalculator; import org.vadere.gui.components.utils.CLGaussianCalculator;
import org.vadere.gui.components.utils.Resources; import org.vadere.gui.components.utils.Resources;
......
...@@ -9,7 +9,7 @@ import java.util.stream.Stream; ...@@ -9,7 +9,7 @@ import java.util.stream.Stream;
import org.apache.log4j.LogManager; import org.apache.log4j.LogManager;
import org.apache.log4j.Logger; 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.DefaultRenderer;
import org.vadere.gui.components.view.SimulationRenderer; import org.vadere.gui.components.view.SimulationRenderer;
import org.vadere.gui.postvisualization.model.PostvisualizationModel; import org.vadere.gui.postvisualization.model.PostvisualizationModel;
......
...@@ -2,7 +2,7 @@ package org.vadere.gui.projectview; ...@@ -2,7 +2,7 @@ package org.vadere.gui.projectview;
import org.apache.commons.lang3.time.StopWatch; import org.apache.commons.lang3.time.StopWatch;
import org.vadere.gui.components.utils.Recorder; 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.util.geometry.GeometryUtils;
import org.vadere.meshing.mesh.gen.AFace; import org.vadere.meshing.mesh.gen.AFace;
import org.vadere.meshing.mesh.gen.AHalfEdge; import org.vadere.meshing.mesh.gen.AHalfEdge;
...@@ -13,9 +13,9 @@ import org.vadere.util.geometry.shapes.VPolygon; ...@@ -13,9 +13,9 @@ import org.vadere.util.geometry.shapes.VPolygon;
import org.vadere.util.geometry.shapes.VRectangle; import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape; import org.vadere.util.geometry.shapes.VShape;
import org.vadere.util.math.DistanceFunction; import org.vadere.util.math.DistanceFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint; import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel; import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.AEikMesh; import org.vadere.meshing.mesh.triangulation.improver.eikmesh.AEikMesh;
import java.awt.*; import java.awt.*;
import java.io.IOException; import java.io.IOException;
......
package org.vadere.meshing.mesh.triangulation; package org.vadere.meshing.examples;
import org.vadere.util.geometry.GeometryUtils; import org.vadere.util.geometry.GeometryUtils;
import org.vadere.meshing.mesh.gen.PFace; import org.vadere.meshing.mesh.gen.PFace;
import org.vadere.meshing.mesh.gen.PHalfEdge; import org.vadere.meshing.mesh.gen.PHalfEdge;
import org.vadere.meshing.mesh.gen.PVertex; import org.vadere.meshing.mesh.gen.PVertex;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel; import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint; import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.PEikMesh; import org.vadere.meshing.mesh.triangulation.improver.eikmesh.PEikMesh;
import org.vadere.util.geometry.shapes.VPoint; import org.vadere.util.geometry.shapes.VPoint;
import org.vadere.util.geometry.shapes.VPolygon; import org.vadere.util.geometry.shapes.VPolygon;
import org.vadere.util.geometry.shapes.VRectangle; import org.vadere.util.geometry.shapes.VRectangle;
......
...@@ -8,7 +8,7 @@ import org.vadere.meshing.mesh.triangulation.triangulator.UniformRefinementTrian ...@@ -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.VPoint;
import org.vadere.util.geometry.shapes.VRectangle; import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape; 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; import java.util.Collection;
......
package org.vadere.meshing.mesh.triangulation.adaptive; package org.vadere.meshing.mesh.inter;
import org.vadere.util.geometry.shapes.IPoint; import org.vadere.util.geometry.shapes.IPoint;
......
...@@ -9,10 +9,11 @@ import org.vadere.meshing.mesh.gen.PVertex; ...@@ -9,10 +9,11 @@ import org.vadere.meshing.mesh.gen.PVertex;
import org.vadere.meshing.mesh.inter.IMesh; import org.vadere.meshing.mesh.inter.IMesh;
import org.vadere.meshing.mesh.inter.IPointLocator; import org.vadere.meshing.mesh.inter.IPointLocator;
import org.vadere.meshing.mesh.inter.ITriangulation; 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.meshing.mesh.triangulation.triangulator.RandomPointsSetTriangulator;
import org.vadere.util.math.IDistanceFunction; import org.vadere.util.math.IDistanceFunction;
import org.vadere.util.geometry.shapes.*; 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.ArrayList;
import java.util.Collection; import java.util.Collection;
......
...@@ -10,8 +10,8 @@ import org.apache.log4j.LogManager; ...@@ -10,8 +10,8 @@ import org.apache.log4j.LogManager;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.vadere.meshing.ConstantLineIterator; import org.vadere.meshing.ConstantLineIterator;
import org.vadere.util.math.IDistanceFunction; import org.vadere.util.math.IDistanceFunction;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction; import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint; import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPoint;
import org.vadere.util.geometry.shapes.IPoint; import org.vadere.util.geometry.shapes.IPoint;
import org.vadere.util.geometry.shapes.MLine; import org.vadere.util.geometry.shapes.MLine;
import org.vadere.util.geometry.shapes.VLine; import org.vadere.util.geometry.shapes.VLine;
......
package org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated; 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.meshing.mesh.triangulation.improver.distmesh.Parameters;
import org.vadere.util.geometry.shapes.IPoint; import org.vadere.util.geometry.shapes.IPoint;
import org.vadere.util.geometry.shapes.VPoint; import org.vadere.util.geometry.shapes.VPoint;
......
...@@ -2,7 +2,7 @@ package org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated; ...@@ -2,7 +2,7 @@ package org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated;
import org.vadere.util.math.IDistanceFunction; 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.IPoint;
import org.vadere.util.geometry.shapes.VRectangle; import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape; import org.vadere.util.geometry.shapes.VShape;
......
package org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated; package org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated;
import org.vadere.util.math.IDistanceFunction; 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.IPoint;
import org.vadere.util.geometry.shapes.VRectangle; import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape; import org.vadere.util.geometry.shapes.VShape;
......
package org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated; package org.vadere.meshing.mesh.triangulation.improver.distmesh.deprecated;
import org.vadere.util.math.IDistanceFunction; 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.IPoint;
import org.vadere.util.geometry.shapes.VRectangle; import org.vadere.util.geometry.shapes.VRectangle;
......
package org.vadere.meshing.mesh.triangulation.improver; package org.vadere.meshing.mesh.triangulation.improver.eikmesh;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.vadere.meshing.mesh.gen.AFace; import org.vadere.meshing.mesh.gen.AFace;
...@@ -9,7 +9,7 @@ import org.vadere.util.math.IDistanceFunction; ...@@ -9,7 +9,7 @@ import org.vadere.util.math.IDistanceFunction;
import org.vadere.util.geometry.shapes.VPolygon; import org.vadere.util.geometry.shapes.VPolygon;
import org.vadere.util.geometry.shapes.VRectangle; import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape; 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; import java.util.Collection;
......
package org.vadere.meshing.mesh.triangulation.improver; package org.vadere.meshing.mesh.triangulation.improver.eikmesh;
import org.apache.log4j.LogManager; import org.apache.log4j.LogManager;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
...@@ -9,6 +9,7 @@ import org.vadere.meshing.mesh.inter.IMesh; ...@@ -9,6 +9,7 @@ import org.vadere.meshing.mesh.inter.IMesh;
import org.vadere.meshing.mesh.inter.IMeshSupplier; import org.vadere.meshing.mesh.inter.IMeshSupplier;
import org.vadere.meshing.mesh.inter.ITriangulation; import org.vadere.meshing.mesh.inter.ITriangulation;
import org.vadere.meshing.mesh.inter.IVertex; 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.improver.distmesh.Parameters;
import org.vadere.meshing.mesh.triangulation.triangulator.ITriangulator; import org.vadere.meshing.mesh.triangulation.triangulator.ITriangulator;
import org.vadere.meshing.mesh.triangulation.triangulator.UniformRefinementTriangulatorSFC; import org.vadere.meshing.mesh.triangulation.triangulator.UniformRefinementTriangulatorSFC;
...@@ -22,7 +23,7 @@ import org.vadere.util.geometry.shapes.VRectangle; ...@@ -22,7 +23,7 @@ import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape; import org.vadere.util.geometry.shapes.VShape;
import org.vadere.util.geometry.shapes.VTriangle; import org.vadere.util.geometry.shapes.VTriangle;
import org.vadere.util.math.DistanceFunction; 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.awt.geom.Rectangle2D;
import java.util.ArrayList; import java.util.ArrayList;
......
package org.vadere.meshing.mesh.triangulation.improver; package org.vadere.meshing.mesh.triangulation.improver.eikmesh;
import org.apache.log4j.LogManager; import org.apache.log4j.LogManager;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull; 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.IFace;
import org.vadere.meshing.mesh.inter.IHalfEdge; import org.vadere.meshing.mesh.inter.IHalfEdge;
import org.vadere.meshing.mesh.inter.IMesh; import org.vadere.meshing.mesh.inter.IMesh;
......
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.IPoint;
import org.vadere.util.geometry.shapes.MPoint; import org.vadere.util.geometry.shapes.MPoint;
......
package org.vadere.meshing.mesh.triangulation.improver; package org.vadere.meshing.mesh.triangulation.improver.eikmesh;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.vadere.meshing.mesh.gen.PFace; import org.vadere.meshing.mesh.gen.PFace;
...@@ -9,7 +9,7 @@ import org.vadere.util.math.IDistanceFunction; ...@@ -9,7 +9,7 @@ import org.vadere.util.math.IDistanceFunction;
import org.vadere.util.geometry.shapes.VPolygon; import org.vadere.util.geometry.shapes.VPolygon;
import org.vadere.util.geometry.shapes.VRectangle; import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape; 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; import java.util.Collection;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment