Commit 778ef1aa authored by Daniel Lehmberg's avatar Daniel Lehmberg

clear split between header and indices + improves tests + resolve name conflicts in header

parent 2a34665d
......@@ -582,9 +582,12 @@ class DataProcessingView extends JPanel implements IJsonView {
c.gridy = 2;
panel.add(new JLabel(Messages.getString("DataProcessingView.dialogOutputIndicesSelection.label")+":"), c);
// Only the indices are shown, not the entire header. > Entire header can be quite a lot of text (which may
// not fit in the GUI) + the processors (with the header information) are not inserted and removed on the fly,
// but only when the simulation is started.
c.gridx = 1;
c.gridy = 2;
panel.add(new JLabel(outputFile.getIndices()), c);
panel.add(new JLabel(outputFile.getIndicesLine()), c);
c.gridx = 0;
c.gridy = 3;
......
......@@ -6,19 +6,7 @@
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "density.txt",
"processors" : [ 1 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "out.txt",
"processors" : [ 3 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "out1.txt",
"processors" : [ 4 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2 ]
"processors" : [ 1, 6 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityCountingProcessor",
......@@ -48,8 +36,17 @@
"attributes" : {
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityCountingProcessor",
"id" : 6,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianDensityCountingProcessor",
"attributes" : {
"pedestrianPositionProcessorId" : 2,
"radius" : 1.0E-6
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......@@ -104,7 +101,7 @@
}
},
"attributesSimulation" : {
"finishTime" : 200.0,
"finishTime" : 5.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
......
......@@ -37,7 +37,8 @@
"pedestrianOverlapProcessorId" : 3
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -54,7 +54,8 @@
"pedestrianOverlapProcessorId" : 3
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -64,7 +64,8 @@
"minimalWaitingTime" : 0.0
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -64,7 +64,8 @@
"pedestrianOverlapProcessorId" : 6
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -40,7 +40,8 @@
"pedestrianOverlapProcessorId" : 4
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -56,7 +56,8 @@
"pedestrianOverlapProcessorId" : 6
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -56,7 +56,8 @@
"pedestrianOverlapProcessorId" : 6
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -32,7 +32,8 @@
"pedestrianOverlapProcessorId" : 3
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -53,7 +53,8 @@
"pedestrianOverlapProcessorId" : 3
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -53,7 +53,8 @@
"pedestrianOverlapProcessorId" : 3
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -53,7 +53,8 @@
"pedestrianOverlapProcessorId" : 3
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -57,7 +57,8 @@
"pedestrianOverlapProcessorId" : 5
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -57,7 +57,8 @@
"pedestrianOverlapProcessorId" : 5
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -146,7 +146,8 @@
"pedestrianVelocityProcessorId" : 7
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -146,7 +146,8 @@
"pedestrianVelocityProcessorId" : 7
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -146,7 +146,8 @@
"pedestrianVelocityProcessorId" : 7
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -146,7 +146,8 @@
"pedestrianVelocityProcessorId" : 7
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -146,7 +146,8 @@
"pedestrianVelocityProcessorId" : 7
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -74,7 +74,8 @@
"pedestrianOverlapProcessorId" : 6
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -57,7 +57,8 @@
"pedestrianOverlapProcessorId" : 5
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -57,7 +57,8 @@
"pedestrianOverlapProcessorId" : 5
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -57,7 +57,8 @@
"pedestrianOverlapProcessorId" : 5
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -64,7 +64,8 @@
"pedestrianOverlapProcessorId" : 6
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -64,7 +64,8 @@
"pedestrianOverlapProcessorId" : 6
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -64,7 +64,8 @@
"pedestrianOverlapProcessorId" : 6
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -64,7 +64,8 @@
"pedestrianOverlapProcessorId" : 6
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -60,7 +60,8 @@
"pedestrianOverlapProcessorId" : 8
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -22,7 +22,8 @@
"pedestrianOverlapProcessorId" : 1
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -29,7 +29,8 @@
"pedestrianOverlapProcessorId" : 2
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -29,7 +29,8 @@
"pedestrianOverlapProcessorId" : 2
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -29,7 +29,8 @@
"pedestrianOverlapProcessorId" : 2
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -29,7 +29,8 @@
"pedestrianOverlapProcessorId" : 2
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -29,7 +29,8 @@
"pedestrianOverlapProcessorId" : 2
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -29,7 +29,8 @@
"pedestrianOverlapProcessorId" : 2
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -60,7 +60,8 @@
"pedestrianOverlapProcessorId" : 4
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
......
......@@ -60,7 +60,8 @@
"pedestrianOverlapProcessorId" : 4
}
} ],
"isTimestamped" : true
"isTimestamped" : true,
"writeMetaData" : false