Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
4
Merge Requests
4
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
8b05aaa8
Commit
8b05aaa8
authored
Feb 15, 2019
by
Benedikt Kleinmeier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
In "PedestrianOSM.java", added getters and setters for "combinedPotentialStrategy".
parent
e9f110be
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
2 deletions
+12
-2
VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java
...or/src/org/vadere/simulator/models/osm/PedestrianOSM.java
+12
-2
No files found.
VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java
View file @
8b05aaa8
...
...
@@ -41,7 +41,7 @@ public class PedestrianOSM extends Pedestrian {
private
transient
IPotentialFieldTarget
potentialFieldTarget
;
private
transient
PotentialFieldObstacle
potentialFieldObstacle
;
private
transient
PotentialFieldAgent
potentialFieldPedestrian
;
//
TODO: Provide method to change object here according to stragey pattern
.
//
A setter is provided to be able to change strategy at runtime (e.g. by events)
.
private
transient
CombinedPotentialStrategy
combinedPotentialStrategy
;
private
transient
List
<
SpeedAdjuster
>
speedAdjusters
;
private
transient
List
<
StepSizeAdjuster
>
stepSizeAdjusters
;
...
...
@@ -240,7 +240,9 @@ public class PedestrianOSM extends Pedestrian {
strides
.
clear
();
}
// Getters...
// TODO: Group getters and setters correctly.
// Getters
public
double
getTargetPotential
(
VPoint
pos
)
{
return
potentialFieldTarget
.
getPotential
(
pos
,
this
);
...
...
@@ -263,6 +265,10 @@ public class PedestrianOSM extends Pedestrian {
new
Vector2D
(
0
,
0
),
this
,
relevantPedestrians
);
}
public
CombinedPotentialStrategy
getCombinedPotentialStrategy
()
{
return
combinedPotentialStrategy
;
}
public
double
getTimeOfNextStep
()
{
return
timeOfNextStep
;
}
...
...
@@ -307,6 +313,10 @@ public class PedestrianOSM extends Pedestrian {
this
.
relevantPedestrians
=
relevantPedestrians
;
}
public
void
setCombinedPotentialStrategy
(
CombinedPotentialStrategy
combinedPotentialStrategy
)
{
this
.
combinedPotentialStrategy
=
combinedPotentialStrategy
;
}
public
Collection
<?
extends
Agent
>
getRelevantPedestrians
()
{
return
relevantPedestrians
;
}
...
...
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