The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

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