Skip to content

GitLab

Commit ebcdabc9 authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

Merge branch 'master' of https://gitlab.lrz.de/vadere/vadere

parents 41cfac7a ccbc2610
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 97 deletions
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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -49,7 +49,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"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.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 5, 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
......@@ -53,7 +53,7 @@
"pedestrianOverlapProcessorId" : 3