refactoring of the module / package structure: potentialfield calculators are...

refactoring of the module / package structure: potentialfield calculators are now in the module simulation and the module meshing requires the module utils which is again the module without dependencies. simulation depends on meshing

VadereGui/src/org/vadere/gui/components/control/DefaultSelectionMode.java

@@ -3,7 +3,7 @@ package org.vadere.gui.components.control;
 import javax.swing.*;
 
 import org.vadere.gui.components.model.IDefaultModel;
-import org.vadere.geometry.shapes.VRectangle;
+import org.vadere.util.geometry.shapes.VRectangle;
 
 import java.awt.event.MouseEvent;
 

VadereGui/src/org/vadere/gui/components/control/DrawVoronoiDiagramMode.java

@@ -3,7 +3,7 @@ package org.vadere.gui.components.control;
 import javax.swing.*;
 
 import org.vadere.gui.components.model.IDefaultModel;
-import org.vadere.geometry.shapes.VRectangle;
+import org.vadere.util.geometry.shapes.VRectangle;
 import org.vadere.util.voronoi.VoronoiDiagram;
 
 import java.awt.*;

VadereGui/src/org/vadere/gui/components/control/RectangleSelectionMode.java

@@ -5,8 +5,8 @@ import java.awt.event.MouseEvent;
 import javax.swing.SwingUtilities;
 
 import org.vadere.gui.components.model.IDefaultModel;
-import org.vadere.geometry.shapes.VPoint;
-import org.vadere.geometry.shapes.VRectangle;
+import org.vadere.util.geometry.shapes.VPoint;
+import org.vadere.util.geometry.shapes.VRectangle;
 
 public class RectangleSelectionMode extends DefaultModeAdapter {
 

VadereGui/src/org/vadere/gui/components/model/DefaultModel.java

@@ -8,32 +8,29 @@ import org.vadere.gui.components.control.*;
 import org.vadere.gui.components.view.ISelectScenarioElementListener;
 import org.vadere.simulator.models.potential.fields.IPotentialField;
 import org.vadere.simulator.models.potential.fields.PotentialFieldDistancesBruteForce;
+import org.vadere.simulator.utils.TexGraphGenerator;
 import org.vadere.state.attributes.models.AttributesFloorField;
 import org.vadere.state.scenario.Obstacle;
 import org.vadere.state.scenario.ScenarioElement;
 import org.vadere.state.scenario.Topography;
 import org.vadere.state.types.ScenarioElementType;
-import org.vadere.geometry.shapes.VPoint;
-import org.vadere.geometry.shapes.VRectangle;
-import org.vadere.geometry.shapes.VShape;
-import org.vadere.state.util.TexGraphGenerator;
-import org.vadere.geometry.mesh.gen.PFace;
-import org.vadere.geometry.mesh.gen.PHalfEdge;
-import org.vadere.geometry.mesh.gen.PVertex;
-import org.vadere.geometry.mesh.inter.ITriangulation;
-import org.vadere.geometry.shapes.IPoint;
-import org.vadere.geometry.shapes.VPoint;
-import org.vadere.geometry.shapes.VPolygon;
-import org.vadere.geometry.shapes.VRectangle;
-import org.vadere.geometry.shapes.VShape;
-import org.vadere.geometry.shapes.VTriangle;
-import org.vadere.util.potential.CellGrid;
-import org.vadere.util.potential.CellState;
-import org.vadere.util.potential.PathFindingTag;
-import org.vadere.geometry.mesh.triangulation.adaptive.DistanceFunction;
-import org.vadere.geometry.IDistanceFunction;
-import org.vadere.geometry.mesh.triangulation.improver.EikMeshPoint;
-import org.vadere.geometry.mesh.triangulation.improver.PEikMesh;
+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.gen.PFace;
+import org.vadere.meshing.mesh.gen.PHalfEdge;
+import org.vadere.meshing.mesh.gen.PVertex;
+import org.vadere.meshing.mesh.inter.ITriangulation;
+import org.vadere.util.geometry.shapes.IPoint;
+import org.vadere.util.geometry.shapes.VPolygon;
+import org.vadere.util.geometry.shapes.VTriangle;
+import org.vadere.util.data.cellgrid.CellGrid;
+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.util.voronoi.VoronoiDiagram;
 
 import java.awt.*;

VadereGui/src/org/vadere/gui/components/model/DefaultSimulationConfig.java

@@ -7,7 +7,7 @@ import java.util.Optional;
 import java.util.TreeMap;
 
 import org.vadere.gui.components.utils.Resources;
-import org.vadere.geometry.color.ColorHelper;
+import org.vadere.meshing.color.ColorHelper;
 
 public class DefaultSimulationConfig extends DefaultConfig {
 	private static Resources resources = Resources.getInstance("global");

VadereGui/src/org/vadere/gui/components/model/IDefaultModel.java

@@ -9,8 +9,8 @@ import org.vadere.gui.components.view.ISelectScenarioElementListener;
 import org.vadere.state.scenario.ScenarioElement;
 import org.vadere.state.scenario.Topography;
 import org.vadere.state.types.ScenarioElementType;
-import org.vadere.geometry.shapes.VPoint;
-import org.vadere.geometry.shapes.VShape;
+import org.vadere.util.geometry.shapes.VPoint;
+import org.vadere.util.geometry.shapes.VShape;
 import org.vadere.util.voronoi.VoronoiDiagram;
 
 import java.awt.*;

VadereGui/src/org/vadere/gui/components/model/SimulationModel.java

@@ -5,9 +5,9 @@ import java.util.Collection;
 import java.util.function.Function;
 
 import org.vadere.state.scenario.Agent;
-import org.vadere.geometry.shapes.IPoint;
-import org.vadere.geometry.shapes.VPoint;
-import org.vadere.geometry.shapes.VRectangle;
+import org.vadere.util.geometry.shapes.IPoint;
+import org.vadere.util.geometry.shapes.VPoint;
+import org.vadere.util.geometry.shapes.VRectangle;
 
 public abstract class SimulationModel<T extends DefaultSimulationConfig> extends DefaultModel {
 

VadereGui/src/org/vadere/gui/components/utils/CLGaussianCalculator.java

 package org.vadere.gui.components.utils;
 
-import java.awt.*;
 import java.awt.image.BufferedImage;
 
 import org.vadere.gui.components.model.DefaultSimulationConfig;
 import org.vadere.gui.components.model.SimulationModel;
-import org.vadere.geometry.color.ColorHelper;
+import org.vadere.meshing.color.ColorHelper;
 import org.vadere.simulator.models.density.IGaussianFilter;
 import org.vadere.state.attributes.scenario.AttributesAgent;
 

VadereGui/src/org/vadere/gui/components/view/DefaultRenderer.java

@@ -5,14 +5,14 @@ import org.vadere.gui.components.model.IDefaultModel;
 import org.vadere.state.scenario.Agent;
 import org.vadere.state.scenario.ScenarioElement;
 import org.vadere.state.scenario.Stairs;
-import org.vadere.geometry.Vector2D;
-import org.vadere.geometry.shapes.VCircle;
-import org.vadere.geometry.shapes.VLine;
-import org.vadere.geometry.shapes.VPoint;
-import org.vadere.geometry.shapes.VPolygon;
-import org.vadere.geometry.shapes.VRectangle;
+import org.vadere.util.geometry.shapes.Vector2D;
+import org.vadere.util.geometry.shapes.VCircle;
+import org.vadere.util.geometry.shapes.VLine;
+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.math.MathUtil;
-import org.vadere.util.potential.CellGrid;
+import org.vadere.util.data.cellgrid.CellGrid;
 import org.vadere.util.voronoi.Face;
 import org.vadere.util.voronoi.HalfEdge;
 import org.vadere.util.voronoi.RectangleLimits;

VadereGui/src/org/vadere/gui/components/view/ScaleablePanel.java

@@ -4,7 +4,7 @@ import javax.swing.*;
 
 import org.vadere.gui.components.control.IScaleChangeListener;
 import org.vadere.gui.components.model.IDefaultModel;
-import org.vadere.geometry.shapes.VPoint;
+import org.vadere.util.geometry.shapes.VPoint;
 
 import java.awt.*;
 

VadereGui/src/org/vadere/gui/components/view/SimulationRenderer.java

@@ -13,15 +13,15 @@ import java.util.stream.Stream;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import org.vadere.geometry.color.ColorHelper;
+import org.vadere.meshing.color.ColorHelper;
 import org.vadere.gui.components.model.SimulationModel;
 import org.vadere.gui.components.utils.CLGaussianCalculator;
 import org.vadere.gui.components.utils.Resources;
 import org.vadere.gui.renderer.agent.AgentRender;
 import org.vadere.state.scenario.Agent;
-import org.vadere.geometry.shapes.VPoint;
-import org.vadere.geometry.shapes.VRectangle;
-import org.vadere.geometry.shapes.VTriangle;
+import org.vadere.util.geometry.shapes.VPoint;
+import org.vadere.util.geometry.shapes.VRectangle;
+import org.vadere.util.geometry.shapes.VTriangle;
 
 public abstract class SimulationRenderer extends DefaultRenderer {
 

VadereGui/src/org/vadere/gui/onlinevisualization/OnlineVisualization.java

@@ -12,7 +12,7 @@ import org.vadere.simulator.models.potential.fields.IPotentialField;
 import org.vadere.simulator.models.potential.fields.IPotentialFieldTarget;
 import org.vadere.state.scenario.Agent;
 import org.vadere.state.scenario.Topography;
-import org.vadere.geometry.shapes.VRectangle;
+import org.vadere.util.geometry.shapes.VRectangle;
 
 public class OnlineVisualization implements PassiveCallback {
 

VadereGui/src/org/vadere/gui/onlinevisualization/model/OnlineVisualizationModel.java

@@ -13,7 +13,7 @@ import org.vadere.gui.components.model.SimulationModel;
 import org.vadere.gui.onlinevisualization.OnlineVisualization;
 import org.vadere.simulator.models.potential.fields.IPotentialField;
 import org.vadere.state.scenario.*;
-import org.vadere.geometry.shapes.IPoint;
+import org.vadere.util.geometry.shapes.IPoint;
 import org.vadere.util.voronoi.VoronoiDiagram;
 
 public class OnlineVisualizationModel extends SimulationModel<DefaultSimulationConfig> {

VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlinevisualizationRenderer.java

@@ -10,7 +10,7 @@ import org.vadere.gui.components.view.SimulationRenderer;
 import org.vadere.gui.onlinevisualization.model.OnlineVisualizationModel;
 import org.vadere.gui.renderer.agent.AgentRender;
 import org.vadere.state.scenario.Agent;
-import org.vadere.geometry.shapes.VPoint;
+import org.vadere.util.geometry.shapes.VPoint;
 
 public class OnlinevisualizationRenderer extends SimulationRenderer {
 

VadereGui/src/org/vadere/gui/postvisualization/model/PostvisualizationModel.java

@@ -30,11 +30,9 @@ import org.vadere.state.scenario.TopographyIterator;
 import org.vadere.state.simulation.Step;
 import org.vadere.state.simulation.Trajectory;
 import org.vadere.state.util.StateJsonConverter;
-import org.vadere.geometry.shapes.IPoint;
-import org.vadere.geometry.shapes.VPoint;
-import org.vadere.util.io.parser.JsonLogicParser;
+import org.vadere.util.geometry.shapes.IPoint;
 import org.vadere.util.io.parser.VPredicate;
-import org.vadere.util.potential.CellGrid;
+import org.vadere.util.data.cellgrid.CellGrid;
 
 import com.fasterxml.jackson.databind.JsonNode;
 

VadereGui/src/org/vadere/gui/postvisualization/utils/PotentialFieldContainer.java

@@ -3,10 +3,10 @@ package org.vadere.gui.postvisualization.utils;
 
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
-import org.vadere.util.potential.CellGrid;
-import org.vadere.util.potential.CellGridConverter;
-import org.vadere.util.potential.CellState;
-import org.vadere.util.potential.PathFindingTag;
+import org.vadere.util.data.cellgrid.CellGrid;
+import org.vadere.util.data.cellgrid.CellGridConverter;
+import org.vadere.util.data.cellgrid.CellState;
+import org.vadere.util.data.cellgrid.PathFindingTag;
 
 import java.io.BufferedReader;
 import java.io.File;

VadereGui/src/org/vadere/gui/postvisualization/utils/TikzGenerator.java

@@ -11,7 +11,7 @@ import org.vadere.gui.postvisualization.model.PostvisualizationModel;
 import org.vadere.state.scenario.*;
 import org.vadere.state.simulation.Step;
 import org.vadere.state.simulation.Trajectory;
-import org.vadere.geometry.shapes.VPoint;
+import org.vadere.util.geometry.shapes.VPoint;
 
 import java.awt.*;
 import java.awt.geom.AffineTransform;

VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationRenderer.java

@@ -9,7 +9,7 @@ import java.util.stream.Stream;
 
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
-import org.vadere.geometry.color.ColorHelper;
+import org.vadere.meshing.color.ColorHelper;
 import org.vadere.gui.components.view.DefaultRenderer;
 import org.vadere.gui.components.view.SimulationRenderer;
 import org.vadere.gui.postvisualization.model.PostvisualizationModel;
@@ -17,7 +17,7 @@ import org.vadere.gui.renderer.agent.AgentRender;
 import org.vadere.state.scenario.Agent;
 import org.vadere.state.simulation.Step;
 import org.vadere.state.simulation.Trajectory;
-import org.vadere.geometry.shapes.VPoint;
+import org.vadere.util.geometry.shapes.VPoint;
 
 public class PostvisualizationRenderer extends SimulationRenderer {
 

VadereGui/src/org/vadere/gui/projectview/RecordTriangulationMovie.java

@@ -2,20 +2,20 @@ package org.vadere.gui.projectview;
 
 import org.apache.commons.lang3.time.StopWatch;
 import org.vadere.gui.components.utils.Recorder;
-import org.vadere.geometry.color.ColorHelper;
-import org.vadere.geometry.GeometryUtils;
-import org.vadere.geometry.mesh.gen.AFace;
-import org.vadere.geometry.mesh.gen.AHalfEdge;
-import org.vadere.geometry.mesh.gen.AVertex;
-import org.vadere.geometry.shapes.VDisc;
-import org.vadere.geometry.shapes.VPoint;
-import org.vadere.geometry.shapes.VPolygon;
-import org.vadere.geometry.shapes.VRectangle;
-import org.vadere.geometry.shapes.VShape;
-import org.vadere.geometry.mesh.triangulation.adaptive.DistanceFunction;
-import org.vadere.geometry.mesh.triangulation.improver.EikMeshPoint;
-import org.vadere.geometry.mesh.triangulation.improver.EikMeshPanel;
-import org.vadere.geometry.mesh.triangulation.improver.AEikMesh;
+import org.vadere.meshing.color.ColorHelper;
+import org.vadere.util.geometry.GeometryUtils;
+import org.vadere.meshing.mesh.gen.AFace;
+import org.vadere.meshing.mesh.gen.AHalfEdge;
+import org.vadere.meshing.mesh.gen.AVertex;
+import org.vadere.util.geometry.shapes.VDisc;
+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.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 java.awt.*;
 import java.io.IOException;

VadereGui/src/org/vadere/gui/renderer/agent/AgentRender.java

@@ -7,7 +7,7 @@ import org.vadere.gui.components.model.SimulationModel;
 import org.vadere.gui.components.view.DefaultRenderer;
 import org.vadere.state.scenario.Pedestrian;
 import org.vadere.state.scenario.ScenarioElement;
-import org.vadere.geometry.shapes.VShape;
+import org.vadere.util.geometry.shapes.VShape;
 
 import java.awt.*;
 import java.util.Random;