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;
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.*;
......
......@@ -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");
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
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;
......
......@@ -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;
......
package org.vadere.meshing.mesh.triangulation.adaptive;
package org.vadere.meshing.mesh.inter;
import org.vadere.util.geometry.shapes.IPoint;
......
......@@ -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;
......
......@@ -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;
......
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;
......
......@@ -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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
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;
......
package org.vadere.meshing.mesh.triangulation.improver.opencl;
package org.vadere.meshing.mesh.triangulation.improver.eikmesh.opencl;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.log4j.LogManager;
......@@ -14,8 +14,8 @@ import org.vadere.meshing.mesh.triangulation.triangulator.ITriangulator;
import org.vadere.meshing.mesh.triangulation.triangulator.UniformRefinementTriangulatorSFC;
import org.vadere.meshing.opencl.CLDistMesh;
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.opencl.OpenCLException;
import org.vadere.util.geometry.shapes.*;
import org.vadere.meshing.mesh.triangulation.improver.IMeshImprover;
......@@ -28,8 +28,8 @@ import java.util.stream.Collectors;
*
* @param <P> the type of the points (containers)
*/
public class CLPSMeshing<P extends EikMeshPoint> implements IMeshImprover<P, AVertex<P>, AHalfEdge<P>, AFace<P>>, ITriangulator<P, AVertex<P>, AHalfEdge<P>, AFace<P>> {
private static final Logger log = LogManager.getLogger(CLPSMeshing.class);
public class CLEikMesh<P extends EikMeshPoint> implements IMeshImprover<P, AVertex<P>, AHalfEdge<P>, AFace<P>>, ITriangulator<P, AVertex<P>, AHalfEdge<P>, AFace<P>> {
private static final Logger log = LogManager.getLogger(CLEikMesh.class);
private boolean illegalMovement = false;
private IDistanceFunction distanceFunc;
private IEdgeLengthFunction edgeLengthFunc;
......@@ -63,7 +63,7 @@ public class CLPSMeshing<P extends EikMeshPoint> implements IMeshImprover<P, AVe
private int nSteps;
private final static int MAX_STEPS = 200;
public CLPSMeshing(
public CLEikMesh(
final IDistanceFunction distanceFunc,
final IEdgeLengthFunction edgeLengthFunc,
final double initialEdgeLen,
......
package org.vadere.meshing.mesh.triangulation.improver.opencl;
package org.vadere.meshing.mesh.triangulation.improver.eikmesh.opencl;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.log4j.LogManager;
......@@ -15,8 +15,8 @@ import org.vadere.meshing.mesh.triangulation.triangulator.ITriangulator;
import org.vadere.meshing.mesh.triangulation.triangulator.UniformRefinementTriangulatorSFC;
import org.vadere.meshing.opencl.CLDistMeshHE;
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.opencl.OpenCLException;
import org.vadere.util.geometry.shapes.*;
import org.vadere.meshing.mesh.triangulation.improver.IMeshImprover;
......@@ -27,8 +27,8 @@ import java.util.stream.Collectors;
/**
* @author Benedikt Zoennchen
*/
public class CLPSMeshingHE<P extends EikMeshPoint> implements IMeshImprover<P, AVertex<P>, AHalfEdge<P>, AFace<P>>, ITriangulator<P, AVertex<P>, AHalfEdge<P>, AFace<P>> {
private static final Logger log = LogManager.getLogger(CLPSMeshing.class);
public class CLEikMeshHE<P extends EikMeshPoint> implements IMeshImprover<P, AVertex<P>, AHalfEdge<P>, AFace<P>>, ITriangulator<P, AVertex<P>, AHalfEdge<P>, AFace<P>> {
private static final Logger log = LogManager.getLogger(CLEikMesh.class);
private boolean illegalMovement = false;
private IDistanceFunction distanceFunc;
private IEdgeLengthFunction edgeLengthFunc;
......@@ -61,7 +61,7 @@ public class CLPSMeshingHE<P extends EikMeshPoint> implements IMeshImprover<P, A
private CLDistMeshHE<P> clDistMesh;
private boolean hasToRead = false;
public CLPSMeshingHE(
public CLEikMeshHE(
final IDistanceFunction distanceFunc,
final IEdgeLengthFunction edgeLengthFunc,
final double initialEdgeLen,
......
......@@ -5,9 +5,9 @@ import org.vadere.meshing.mesh.gen.PFace;
import org.vadere.meshing.mesh.gen.PHalfEdge;
import org.vadere.meshing.mesh.gen.PVertex;
import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
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.LaplacianSmother;
import javax.swing.*;
......
......@@ -13,8 +13,8 @@ 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.inter.IPointConstructor;
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.meshing.mesh.triangulation.improver.distmesh.Distmesh;
import org.vadere.meshing.mesh.triangulation.improver.distmesh.DistmeshPanel;
......
......@@ -8,7 +8,7 @@ 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.geometry.shapes.VTriangle;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.distmesh.Distmesh;
import org.vadere.meshing.mesh.triangulation.improver.distmesh.DistmeshPanel;
......
......@@ -9,11 +9,11 @@ import org.vadere.meshing.mesh.gen.AMesh;
import org.vadere.meshing.mesh.gen.AVertex;
import org.vadere.meshing.mesh.inter.IMeshSupplier;
import org.vadere.meshing.mesh.inter.IPointConstructor;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMesh;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint;
import org.vadere.meshing.tex.TexGraphGenerator;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMesh;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPoint;
import org.vadere.meshing.utils.tex.TexGraphGenerator;
import org.vadere.util.math.IDistanceFunction;
import org.vadere.util.geometry.shapes.VPolygon;
import org.vadere.util.geometry.shapes.VRectangle;
......
......@@ -7,10 +7,10 @@ import org.vadere.meshing.mesh.gen.AFace;
import org.vadere.meshing.mesh.gen.AMesh;
import org.vadere.meshing.mesh.inter.IMeshSupplier;
import org.vadere.meshing.mesh.inter.IPointConstructor;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMesh;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMesh;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPoint;
import org.vadere.util.math.IDistanceFunction;
import org.vadere.meshing.mesh.gen.AHalfEdge;
import org.vadere.meshing.mesh.gen.AVertex;
......
......@@ -9,9 +9,9 @@ import org.vadere.util.geometry.shapes.VPoint;
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.improver.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
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.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.PEikMesh;
import java.util.ArrayList;
import java.util.List;
......
......@@ -12,10 +12,10 @@ import org.vadere.meshing.mesh.inter.IMeshSupplier;
import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape;
import org.vadere.meshing.mesh.inter.IPointConstructor;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.EikMesh;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
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.EikMesh;
import java.util.ArrayList;
import java.util.List;
......
......@@ -13,10 +13,10 @@ import org.vadere.util.opencl.OpenCLException;
import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape;
import org.vadere.meshing.mesh.inter.IPointConstructor;
import org.vadere.meshing.mesh.triangulation.improver.opencl.CLPSMeshing;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.opencl.CLEikMesh;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPanel;
import javax.swing.*;
import java.util.ArrayList;
......@@ -46,7 +46,7 @@ public class RunTimeGPUEdgeBased extends JFrame {
List<Long> runTimes = new ArrayList<>();
while (initialEdgeLength >= minInitialEdgeLength) {
CLPSMeshing meshGenerator = new CLPSMeshing(distanceFunc, uniformEdgeLength, initialEdgeLength, bbox, new ArrayList<>(), supplier);
CLEikMesh meshGenerator = new CLEikMesh(distanceFunc, uniformEdgeLength, initialEdgeLength, bbox, new ArrayList<>(), supplier);
StopWatch overAllTime = new StopWatch();
overAllTime.start();
......@@ -92,7 +92,7 @@ public class RunTimeGPUEdgeBased extends JFrame {
while (initialEdgeLength >= minInitialEdgeLength) {
initlialEdgeLengths.add(initialEdgeLength);
CLPSMeshing meshGenerator = new CLPSMeshing(distanceFunc, uniformEdgeLength, initialEdgeLength, bbox, new ArrayList<>(), supplier);
CLEikMesh meshGenerator = new CLEikMesh(distanceFunc, uniformEdgeLength, initialEdgeLength, bbox, new ArrayList<>(), supplier);
meshGenerator.initialize();
StopWatch overAllTime = new StopWatch();
......
......@@ -9,10 +9,10 @@ import org.vadere.meshing.mesh.gen.AMesh;
import org.vadere.meshing.mesh.gen.AVertex;
import org.vadere.meshing.mesh.inter.IMeshSupplier;
import org.vadere.meshing.mesh.inter.IPointConstructor;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.opencl.CLPSMeshingHE;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
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.opencl.CLEikMeshHE;
import org.vadere.util.math.IDistanceFunction;
import org.vadere.util.opencl.OpenCLException;
import org.vadere.util.geometry.shapes.VRectangle;
......@@ -45,7 +45,7 @@ public class RunTimeGPUVertexBased extends JFrame {
while (initialEdgeLength >= minInitialEdgeLength) {
CLPSMeshingHE meshGenerator = new CLPSMeshingHE(distanceFunc, uniformEdgeLength, initialEdgeLength, bbox, new ArrayList<>(), supplier);
CLEikMeshHE meshGenerator = new CLEikMeshHE(distanceFunc, uniformEdgeLength, initialEdgeLength, bbox, new ArrayList<>(), supplier);
StopWatch overAllTime = new StopWatch();
overAllTime.start();
......@@ -87,7 +87,7 @@ public class RunTimeGPUVertexBased extends JFrame {
while (initialEdgeLength >= minInitialEdgeLength) {
initlialEdgeLengths.add(initialEdgeLength);
CLPSMeshingHE meshGenerator = new CLPSMeshingHE(distanceFunc, uniformEdgeLength, initialEdgeLength, bbox, new ArrayList<>(), supplier);
CLEikMeshHE meshGenerator = new CLEikMeshHE(distanceFunc, uniformEdgeLength, initialEdgeLength, bbox, new ArrayList<>(), supplier);
meshGenerator.initialize();
StopWatch overAllTime = new StopWatch();
......
......@@ -12,9 +12,9 @@ import org.vadere.meshing.mesh.inter.ITriangulation;
import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape;
import org.vadere.meshing.mesh.inter.IPointConstructor;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.eikmesh.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.triangulator.UniformRefinementTriangulatorSFC;
import java.util.ArrayList;
......
......@@ -12,10 +12,10 @@ import org.vadere.meshing.mesh.inter.IMeshSupplier;
import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape;
import org.vadere.meshing.mesh.inter.IPointConstructor;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.EikMesh;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
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.EikMesh;
import java.util.ArrayList;
import java.util.List;
......
......@@ -4,7 +4,7 @@ import org.apache.commons.lang3.time.StopWatch;
import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.vadere.util.math.IDistanceFunction;
import org.vadere.meshing.color.ColorHelper;
import org.vadere.util.visualization.ColorHelper;
import org.vadere.meshing.mesh.gen.AFace;
import org.vadere.meshing.mesh.gen.AHalfEdge;
import org.vadere.meshing.mesh.gen.AMesh;
......@@ -17,12 +17,12 @@ import org.vadere.meshing.mesh.inter.IMeshSupplier;
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.tex.TexGraphGenerator;
import org.vadere.meshing.utils.tex.TexGraphGenerator;
import org.vadere.meshing.mesh.inter.IPointConstructor;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPoint;
import org.vadere.meshing.mesh.triangulation.improver.EikMeshPanel;
import org.vadere.meshing.mesh.triangulation.improver.EikMesh;
import org.vadere.meshing.mesh.inter.IEdgeLengthFunction;
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.EikMesh;
import java.awt.*;
import java.util.ArrayList;
......
......@@ -13,10 +13,10 @@ import org.vadere.util.opencl.OpenCLException;
import org.vadere.util.geometry.shapes.VRectangle;
import org.vadere.util.geometry.shapes.VShape;
import org.vadere.meshing.mesh.inter.IPointConstructor;
import org.vadere.meshing.mesh.triangulation.improver.opencl.CLPSMeshing;
import org.vadere.meshing.mesh.triangulation.adaptive.IEdgeLengthFunction;