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
ebcdabc9
Commit
ebcdabc9
authored
Oct 16, 2019
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://gitlab.lrz.de/vadere/vadere
parents
41cfac7a
ccbc2610
Changes
50
Hide whitespace changes
Inline
Side-by-side
Showing
50 changed files
with
342 additions
and
213 deletions
+342
-213
CHANGELOG.md
CHANGELOG.md
+2
-1
VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java
...i/onlinevisualization/view/OnlineVisualisationWindow.java
+10
-8
VadereGui/src/org/vadere/gui/postvisualization/control/ActionSetTimeStep.java
...dere/gui/postvisualization/control/ActionSetTimeStep.java
+4
-5
VadereGui/src/org/vadere/gui/postvisualization/control/EJSliderAction.java
.../vadere/gui/postvisualization/control/EJSliderAction.java
+13
-9
VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java
...e/gui/postvisualization/view/PostvisualizationWindow.java
+16
-16
VadereGui/src/org/vadere/gui/projectview/view/ProjectView.java
...eGui/src/org/vadere/gui/projectview/view/ProjectView.java
+2
-2
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
...n/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
.../TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
...stOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
.../TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
+5
-5
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario
+7
-4
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario
+7
-4
pom.xml
pom.xml
+2
-2
No files found.
CHANGELOG.md
View file @
ebcdabc9
...
...
@@ -7,7 +7,8 @@
### Added
### Changed
-
`PedestrianFootStepProcessor`
interpolates the pedestrian's foot step to obtain a more precise position.
-
`FootStepProcessor`
interpolates the pedestrian's foot step to obtain a more precise position.
Was previously known as
`PedestrianFootStepProcessor`
# v1.4 (2019-09-05)
...
...
VadereGui/src/org/vadere/gui/onlinevisualization/view/OnlineVisualisationWindow.java
View file @
ebcdabc9
...
...
@@ -3,11 +3,7 @@ package org.vadere.gui.onlinevisualization.view;
import
com.jgoodies.forms.layout.CellConstraints
;
import
com.jgoodies.forms.layout.FormLayout
;
import
org.apache.commons.configuration2.Configuration
;
import
org.vadere.gui.components.control.ActionGeneratePoly
;
import
org.vadere.gui.components.control.IViewportChangeListener
;
import
org.vadere.gui.components.control.JViewportChangeListener
;
import
org.vadere.gui.components.control.PanelResizeListener
;
import
org.vadere.gui.components.control.ViewportChangeListener
;
import
org.vadere.gui.components.control.*
;
import
org.vadere.gui.components.control.simulation.*
;
import
org.vadere.gui.components.utils.Messages
;
import
org.vadere.gui.components.utils.Resources
;
...
...
@@ -240,10 +236,16 @@ public class OnlineVisualisationWindow extends JPanel implements Observer {
SwingUtils
.
addActionToToolbar
(
toolbar
,
openSettingsDialog
,
Messages
.
getString
(
"ProjectView.btnSettings.tooltip"
));
add
(
toolbar
,
cc
.
xyw
(
2
,
2
,
3
));
add
(
scrollPane
,
cc
.
xy
(
2
,
4
));
JSplitPane
splitPaneForTopographyAndJsonPane
=
new
JSplitPane
();
splitPaneForTopographyAndJsonPane
.
setResizeWeight
(
0.8
);
splitPaneForTopographyAndJsonPane
.
resetToPreferredSizes
();
splitPaneForTopographyAndJsonPane
.
setLeftComponent
(
scrollPane
);
splitPaneForTopographyAndJsonPane
.
setRightComponent
(
jsonPanel
);
scrollPane
.
setPreferredSize
(
new
Dimension
(
1
,
windowHeight
));
add
(
jsonPanel
,
cc
.
xy
(
4
,
4
));
add
(
toolbar
,
cc
.
xyw
(
2
,
2
,
3
));
add
(
splitPaneForTopographyAndJsonPane
,
cc
.
xywh
(
2
,
4
,
4
,
1
));
add
(
infoPanel
,
cc
.
xyw
(
2
,
6
,
3
));
repaint
();
...
...
VadereGui/src/org/vadere/gui/postvisualization/control/ActionSetTimeStep.java
View file @
ebcdabc9
...
...
@@ -42,10 +42,9 @@ public class ActionSetTimeStep extends ActionVisualization implements ChangeList
@Override
public
void
stateChanged
(
final
ChangeEvent
event
)
{
JSlider
source
=
(
JSlider
)
event
.
getSource
();
if
(!
source
.
getValueIsAdjusting
())
{
model
.
setStep
(
source
.
getValue
());
model
.
notifyObservers
();
}
JSlider
slider
=
(
JSlider
)
event
.
getSource
();
model
.
setStep
(
slider
.
getValue
());
model
.
notifyObservers
();
}
}
VadereGui/src/org/vadere/gui/postvisualization/control/EJSliderAction.java
View file @
ebcdabc9
...
...
@@ -20,23 +20,17 @@ public class EJSliderAction implements MouseListener {
@Override
public
void
mousePressed
(
final
MouseEvent
e
)
{
setSliderValue
(
e
);
}
@Override
public
void
mouseReleased
(
final
MouseEvent
e
)
{
Point
p
=
e
.
getPoint
();
double
percent
=
p
.
x
/
((
double
)
slider
.
getWidth
());
int
range
=
slider
.
getMaximum
()
-
slider
.
getMinimum
();
double
newVal
=
range
*
percent
;
int
result
=
(
int
)
(
Math
.
ceil
(
slider
.
getMinimum
()
+
newVal
));
// logger.info("change to step: " + Thread.currentThread().getName() + (result+1));
slider
.
setValue
(
result
);
setSliderValue
(
e
);
}
@Override
public
void
mouseClicked
(
MouseEvent
e
)
{
setSliderValue
(
e
);
}
@Override
...
...
@@ -48,4 +42,14 @@ public class EJSliderAction implements MouseListener {
public
void
mouseExited
(
MouseEvent
e
)
{
}
private
void
setSliderValue
(
MouseEvent
e
)
{
Point
sliderPosition
=
e
.
getPoint
();
double
percent
=
sliderPosition
.
x
/
((
double
)
slider
.
getWidth
());
int
sliderRange
=
slider
.
getMaximum
()
-
slider
.
getMinimum
();
double
newValue
=
sliderRange
*
percent
;
int
result
=
(
int
)
(
Math
.
ceil
(
slider
.
getMinimum
()
+
newValue
));
slider
.
setValue
(
result
);
}
}
VadereGui/src/org/vadere/gui/postvisualization/view/PostvisualizationWindow.java
View file @
ebcdabc9
...
...
@@ -4,16 +4,8 @@ import com.jgoodies.forms.layout.CellConstraints;
import
com.jgoodies.forms.layout.FormLayout
;
import
org.apache.commons.configuration2.Configuration
;
import
org.jetbrains.annotations.NotNull
;
import
org.vadere.gui.components.control.IViewportChangeListener
;
import
org.vadere.gui.components.control.JViewportChangeListener
;
import
org.vadere.gui.components.control.PanelResizeListener
;
import
org.vadere.gui.components.control.ViewportChangeListener
;
import
org.vadere.gui.components.control.simulation.ActionGeneratePNG
;
import
org.vadere.gui.components.control.ActionGeneratePoly
;
import
org.vadere.gui.components.control.simulation.ActionGenerateSVG
;
import
org.vadere.gui.components.control.simulation.ActionGenerateTikz
;
import
org.vadere.gui.components.control.simulation.ActionSwapSelectionMode
;
import
org.vadere.gui.components.control.simulation.ActionVisualization
;
import
org.vadere.gui.components.control.*
;
import
org.vadere.gui.components.control.simulation.*
;
import
org.vadere.gui.components.model.IDefaultModel
;
import
org.vadere.gui.components.utils.Messages
;
import
org.vadere.gui.components.utils.Resources
;
...
...
@@ -115,20 +107,28 @@ public class PostvisualizationWindow extends JPanel implements Observer, DropTar
if
(
CONFIG
.
getBoolean
(
"PostVis.enableJsonInformationPanel"
))
{
layout
=
new
FormLayout
(
"2dlu, default:grow(0.75), 2dlu, default:grow(0.25), 2dlu"
,
// col
"2dlu, default, 2dlu, default, 2dlu, default, 2dlu"
);
// rows
setLayout
(
layout
);
textView
=
new
ScenarioElementView
(
model
);
textView
.
setEditable
(
false
);
textView
.
setPreferredSize
(
new
Dimension
(
1
,
windowHeight
));
setLayout
(
layout
);
add
(
toolbar
,
cc
.
xyw
(
2
,
2
,
4
));
add
(
scrollPane
,
cc
.
xy
(
2
,
4
));
JSplitPane
splitPaneForTopographyAndJsonPane
=
new
JSplitPane
();
splitPaneForTopographyAndJsonPane
.
setResizeWeight
(
0.8
);
splitPaneForTopographyAndJsonPane
.
resetToPreferredSizes
();
splitPaneForTopographyAndJsonPane
.
setLeftComponent
(
scrollPane
);
splitPaneForTopographyAndJsonPane
.
setRightComponent
(
textView
);
add
(
toolbar
,
cc
.
xyw
(
2
,
2
,
3
));
add
(
splitPaneForTopographyAndJsonPane
,
cc
.
xywh
(
2
,
4
,
4
,
1
));
add
(
adjustPanel
,
cc
.
xyw
(
2
,
6
,
4
));
add
(
textView
,
cc
.
xy
(
4
,
4
));
// model.addObserver(textView);
}
else
{
layout
=
new
FormLayout
(
"2dlu, default:grow, 2dlu"
,
// col
"2dlu, default, 2dlu, default, 2dlu, default, 2dlu"
);
// rows
textView
=
null
;
setLayout
(
layout
);
textView
=
null
;
add
(
toolbar
,
cc
.
xy
(
2
,
2
));
add
(
scrollPane
,
cc
.
xy
(
2
,
4
));
add
(
adjustPanel
,
cc
.
xy
(
2
,
6
));
...
...
VadereGui/src/org/vadere/gui/projectview/view/ProjectView.java
View file @
ebcdabc9
...
...
@@ -296,8 +296,8 @@ public class ProjectView extends JFrame implements ProjectFinishedListener, Sing
private
void
openLastUsedProject
(
final
ProjectViewModel
model
)
{
String
lastUsedProjectPath
=
VadereConfig
.
getConfig
().
getString
(
"History.lastUsedProject"
,
null
);
if
(
lastUsedProjectPath
!=
null
)
{
VadereConfig
.
getConfig
().
getString
(
"History.lastUsedProject"
);
if
(
lastUsedProjectPath
!=
null
&&
lastUsedProjectPath
.
isBlank
()
==
false
)
{
if
(
Files
.
exists
(
Paths
.
get
(
lastUsedProjectPath
)))
{
ActionLoadProject
.
loadProjectByPath
(
model
,
lastUsedProjectPath
);
}
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -49,7 +49,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -138,6 +138,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Timestep
PedestrianIdOutputFile",
"filename" : "postvis.traj
ectories
",
"processors" : [
1, 2,
5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
5, 1
5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
FootStepProcessor",
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
...
...
@@ -142,6 +142,9 @@
"voronoiMeasurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 15
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
View file @
ebcdabc9
...
...
@@ -4,9 +4,9 @@
"release" : "1.4",