Commit 63fb9f74 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

refactoring of the eikonalSolver code

parent dcdf6117
...@@ -65,5 +65,4 @@ public interface EikonalSolver { ...@@ -65,5 +65,4 @@ public interface EikonalSolver {
default ITimeCostFunction getTimeCostFunction() { default ITimeCostFunction getTimeCostFunction() {
return new UnitTimeCostFunction(); return new UnitTimeCostFunction();
} }
} }
package org.vadere.util.potential.calculators; package org.vadere.util.potential.calculators;
<<<<<<< HEAD
import org.apache.log4j.LogManager; import org.apache.log4j.LogManager;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.vadere.util.geometry.GeometryUtils; import org.vadere.util.geometry.GeometryUtils;
...@@ -17,16 +18,23 @@ import org.vadere.util.geometry.shapes.VTriangle; ...@@ -17,16 +18,23 @@ import org.vadere.util.geometry.shapes.VTriangle;
import org.vadere.util.math.InterpolationUtil; import org.vadere.util.math.InterpolationUtil;
import org.vadere.util.math.MathUtil; import org.vadere.util.math.MathUtil;
import org.vadere.util.potential.PathFindingTag; import org.vadere.util.potential.PathFindingTag;
=======
import org.vadere.util.geometry.shapes.VShape;
>>>>>>> refactoring of the eikonalSolver code
import org.vadere.util.potential.timecost.ITimeCostFunction; import org.vadere.util.potential.timecost.ITimeCostFunction;
import org.vadere.util.geometry.mesh.iterators.FaceIterator; import org.vadere.util.geometry.mesh.iterators.FaceIterator;
import org.vadere.util.triangulation.IPointConstructor; import org.vadere.util.triangulation.IPointConstructor;
<<<<<<< HEAD
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Comparator; import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedList; import java.util.LinkedList;
=======
import java.awt.*;
>>>>>>> refactoring of the eikonalSolver code
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.PriorityQueue; import java.util.PriorityQueue;
...@@ -171,6 +179,7 @@ public class EikonalSolverFMMTriangulation<P extends PotentialPoint, E extends I ...@@ -171,6 +179,7 @@ public class EikonalSolverFMMTriangulation<P extends PotentialPoint, E extends I
@Override @Override
public double getValue(double x, double y) { public double getValue(double x, double y) {
<<<<<<< HEAD
Optional<F> optFace = triangulation.locate(new VPoint(x, y)); Optional<F> optFace = triangulation.locate(new VPoint(x, y));
double result = Double.MAX_VALUE; double result = Double.MAX_VALUE;
...@@ -563,4 +572,15 @@ public class EikonalSolverFMMTriangulation<P extends PotentialPoint, E extends I ...@@ -563,4 +572,15 @@ public class EikonalSolverFMMTriangulation<P extends PotentialPoint, E extends I
return halfEdge.toString(); return halfEdge.toString();
} }
} }
=======
return 0;
}
@Override
public boolean isValidPoint(Point point) {
return false;
}
>>>>>>> refactoring of the eikonalSolver code
} }
package org.vadere.util.potential.calculators; package org.vadere.util.potential.calculators;
public class PotentialFieldCalculatorNone implements EikonalSolver { public class PotentialFieldCalculatorNone implements EikonalSolver {
@Override @Override
...@@ -18,5 +17,4 @@ public class PotentialFieldCalculatorNone implements EikonalSolver { ...@@ -18,5 +17,4 @@ public class PotentialFieldCalculatorNone implements EikonalSolver {
public double getValue(double x, double y) { public double getValue(double x, double y) {
return 0; return 0;
} }
} }
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