Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
eff139a6
Commit
eff139a6
authored
May 09, 2018
by
Benedikt Zoennchen
Browse files
some code refactoring inside potentialField-classes.
parent
c3f30c06
Pipeline
#55213
passed with stage
in 45 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldObstacleCompactSoftshell.java
View file @
eff139a6
...
...
@@ -5,6 +5,7 @@ import java.util.Collection;
import
java.util.List
;
import
java.util.Random
;
import
org.apache.commons.math.util.MathUtils
;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
import
org.vadere.simulator.models.Model
;
...
...
@@ -74,9 +75,17 @@ public class PotentialFieldObstacleCompactSoftshell implements PotentialFieldObs
}
@Override
public
Vector2D
getObstaclePotentialGradient
(
VPoint
pos
,
Agent
pedestrian
)
{
throw
new
UnsupportedOperationException
(
"this method is not jet implemented."
);
public
Vector2D
getObstaclePotentialGradient
(
VPoint
pos
,
Agent
pedestrian
)
{
throw
new
UnsupportedOperationException
(
"not jet implemented."
);
/*double epsilon = 0.0000001;
VPoint dxPos = pos.add(new VPoint(pos.getX() + MathUtils.EPSILON, pos.getY()));
VPoint dyPos = pos.add(new VPoint(pos.getX(), pos.getY() + MathUtils.EPSILON));
double potential = getObstaclePotential(pos, pedestrian);
double dx = (getObstaclePotential(dxPos, pedestrian) - potential) / epsilon;
double dy = (getObstaclePotential(dyPos, pedestrian) - potential) / epsilon;
return new Vector2D(dx, dy);*/
}
@Override
...
...
VadereSimulator/src/org/vadere/simulator/models/potential/PotentialFieldPedestrianCompactSoftshell.java
View file @
eff139a6
...
...
@@ -5,6 +5,7 @@ import java.util.LinkedList;
import
java.util.List
;
import
java.util.Random
;
import
org.apache.commons.math.util.MathUtils
;
import
org.vadere.simulator.models.Model
;
import
org.vadere.simulator.models.potential.fields.PotentialFieldAgent
;
import
org.vadere.state.attributes.Attributes
;
...
...
@@ -39,14 +40,9 @@ public class PotentialFieldPedestrianCompactSoftshell implements PotentialFieldA
@Override
public
Collection
<
Pedestrian
>
getRelevantAgents
(
VCircle
relevantArea
,
Agent
pedestrian
,
Topography
scenario
)
{
List
<
Pedestrian
>
result
=
new
LinkedList
<>();
List
<
Pedestrian
>
closePedestrians
=
scenario
.
getSpatialMap
(
Pedestrian
.
class
)
.
getObjects
(
relevantArea
.
getCenter
(),
this
.
personalWidth
+
0.5
);
result
=
closePedestrians
;
return
result
;
return
closePedestrians
;
}
@Override
...
...
@@ -98,6 +94,18 @@ public class PotentialFieldPedestrianCompactSoftshell implements PotentialFieldA
public
Vector2D
getAgentPotentialGradient
(
VPoint
pos
,
Vector2D
velocity
,
Agent
pedestrian
,
Collection
<?
extends
Agent
>
otherPedestrians
)
{
throw
new
UnsupportedOperationException
(
"this method is not jet implemented."
);
throw
new
UnsupportedOperationException
(
"not jet implemented."
);
/*double epsilon = 0.001;
double dx = 0;
double dy = 0;
VPoint dxPos = pos.add(new VPoint(pos.getX() + MathUtils.EPSILON, pos.getY()));
VPoint dyPos = pos.add(new VPoint(pos.getX(), pos.getY() + MathUtils.EPSILON));
double potential = getAgentPotential(pos, pedestrian, otherPedestrians);
dx = (getAgentPotential(dxPos, pedestrian, otherPedestrians) - potential) / epsilon;
dy = (getAgentPotential(dyPos, pedestrian, otherPedestrians) - potential) / epsilon;
return new Vector2D(dx, dy);*/
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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