Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
vadere
vadere
Commits
63fb9f74
Commit
63fb9f74
authored
Jan 30, 2017
by
Benedikt Zoennchen
Browse files
refactoring of the eikonalSolver code
parent
dcdf6117
Changes
3
Hide whitespace changes
Inline
Side-by-side
VadereUtils/src/org/vadere/util/potential/calculators/EikonalSolver.java
View file @
63fb9f74
...
...
@@ -65,5 +65,4 @@ public interface EikonalSolver {
default
ITimeCostFunction
getTimeCostFunction
()
{
return
new
UnitTimeCostFunction
();
}
}
VadereUtils/src/org/vadere/util/potential/calculators/EikonalSolverFMMTriangulation.java
View file @
63fb9f74
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
}
VadereUtils/src/org/vadere/util/potential/calculators/PotentialFieldCalculatorNone.java
View file @
63fb9f74
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
;
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment