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
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
94b03e24
Commit
94b03e24
authored
Aug 23, 2019
by
Daniel Lehmberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor changes
parent
6799a555
Pipeline
#147358
failed with stages
in 61 minutes and 1 second
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
11 deletions
+6
-11
VadereModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario
...ents/BangEvent/scenarios/02_bang_event_one_agent.scenario
+1
-1
VadereSimulator/tests/org/vadere/simulator/utils/PedestrianListBuilder.java
...sts/org/vadere/simulator/utils/PedestrianListBuilder.java
+2
-1
VadereState/src/org/vadere/state/scenario/Pedestrian.java
VadereState/src/org/vadere/state/scenario/Pedestrian.java
+3
-4
VadereState/src/org/vadere/state/simulation/VTrajectory.java
VadereState/src/org/vadere/state/simulation/VTrajectory.java
+0
-5
No files found.
VadereModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario
View file @
94b03e24
...
...
@@ -95,7 +95,7 @@
"attributesSimulation" : {
"finishTime" : 50.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.
4
,
"realTimeSimTimeRatio" : 0.
1
,
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
...
...
VadereSimulator/tests/org/vadere/simulator/utils/PedestrianListBuilder.java
View file @
94b03e24
...
...
@@ -9,7 +9,6 @@ import org.vadere.state.simulation.FootStep;
import
org.vadere.state.simulation.VTrajectory
;
import
org.vadere.util.geometry.shapes.VPoint
;
import
java.lang.reflect.Field
;
import
java.util.ArrayList
;
import
java.util.LinkedList
;
import
java.util.List
;
...
...
@@ -58,6 +57,8 @@ public class PedestrianListBuilder {
for
(
FootStep
fs
:
trajectory
){
p
.
getTrajectory
().
add
(
fs
);
}
// Set the pedestrian position to the last known position where he started a step.
p
.
setPosition
(
p
.
getTrajectory
().
getFootSteps
().
getLast
().
getStart
());
out
.
add
(
p
);
return
this
;
...
...
VadereState/src/org/vadere/state/scenario/Pedestrian.java
View file @
94b03e24
...
...
@@ -110,10 +110,9 @@ public class Pedestrian extends Agent {
}
public
VPoint
getInterpolatedFootStepPosition
(
double
time
){
if
(
this
.
trajectory
.
getLastFootStepCapacity
()
<=
0
){
throw
new
RuntimeException
(
"Cannot interpolate foot steps if there is no foot steps storage capacity (see "
+
"scenario attribute 'lastFootStepsToStore'"
);
if
(
this
.
trajectory
.
getLastFootSteps
().
getCapacity
()
<=
0
){
throw
new
IllegalArgumentException
(
"Cannot interpolate foot steps if there is no capacity (larger than zero) "
+
"for storing foot steps (see 'scenario.attributesPedestrian.footStepsToStore' field)"
);
}
FootStep
currentFootStep
=
this
.
trajectory
.
getLastFootSteps
().
getYoungestFootStep
();
...
...
VadereState/src/org/vadere/state/simulation/VTrajectory.java
View file @
94b03e24
...
...
@@ -22,7 +22,6 @@ public class VTrajectory implements Iterable<FootStep> {
}
public
VTrajectory
(
int
lastFootStepCapacity
){
this
.
lastFootStepCapacity
=
lastFootStepCapacity
;
footSteps
=
new
LinkedList
<>();
lastFootSteps
=
new
LastFootSteps
(
lastFootStepCapacity
);
}
...
...
@@ -32,10 +31,6 @@ public class VTrajectory implements Iterable<FootStep> {
return
new
LinkedList
<>(
footSteps
);
}
public
int
getLastFootStepCapacity
()
{
return
lastFootStepCapacity
;
}
public
LastFootSteps
getLastFootSteps
()
{
return
lastFootSteps
;
}
...
...
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