Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
vadere
vadere
Commits
34af2891
Commit
34af2891
authored
Oct 17, 2019
by
Benedikt Kleinmeier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into add_target_changer
parents
ebe7b44e
5f7ad726
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
167 additions
and
119 deletions
+167
-119
VadereGui/src/org/vadere/gui/postvisualization/view/AdjustPanel.java
...rc/org/vadere/gui/postvisualization/view/AdjustPanel.java
+2
-2
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_2group.scenario
+13
-13
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_2group_sparse.scenario
+13
-13
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_3group.scenario
+13
-13
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_3group_sparse.scenario
+13
-13
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_4group.scenario
+13
-13
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario
...enarios/group_OSM_CGM_density_flow_4group_sparse.scenario
+13
-13
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario
...tion/scenarios/group_OSM_CGM_density_flow_5group.scenario
+13
-13
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario
...m_calibration_minStepSize_0_11_ignore_free_space.scenario
+9
-3
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario
...ation/scenarios/osm_calibration_minStepSize_0_17.scenario
+9
-3
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario
...ation/scenarios/osm_calibration_minStepSize_0_25.scenario
+9
-3
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario
...ation/scenarios/osm_calibration_minStepSize_0_35.scenario
+9
-3
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario
...ion/scenarios/osm_calibration_minStepSize_0_4625.scenario
+9
-3
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario
...scenarios/osm_calibration_minStepSize_0_4625_p18.scenario
+9
-3
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario
.../scenarios/osm_calibration_minStepSize_0_4625_p4.scenario
+9
-3
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario
...libration/scenarios/osm_calibration_sivers_2016b.scenario
+9
-3
VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFMMEikMesh.java
...ere/simulator/models/potential/solver/TestFMMEikMesh.java
+2
-2
No files found.
VadereGui/src/org/vadere/gui/postvisualization/view/AdjustPanel.java
View file @
34af2891
...
...
@@ -114,7 +114,7 @@ public class AdjustPanel extends JPanel implements Observer {
SwingUtilities
.
invokeLater
(()
->
{
synchronized
(
model
)
{
// update view
slider
.
setValueIsAdjusting
(
true
);
//
slider.setValueIsAdjusting(true);
if
(
model
.
hasOutputChanged
())
{
slider
.
setMaximum
(
model
.
getLastStep
());
slider
.
setMinimum
(
model
.
getFirstStep
());
...
...
@@ -126,7 +126,7 @@ public class AdjustPanel extends JPanel implements Observer {
sVisTimeStepLength
.
setValue
(
model
.
getVisTimeStepLength
());
sTime
.
setValue
(
model
.
getSimTimeInSec
());
//((SpinnerNumberModel)sModelTime).setStepSize(model.getSimTimeInSec());
slider
.
setValueIsAdjusting
(
false
);
//
slider.setValueIsAdjusting(false);
}
});
}
...
...
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario
View file @
34af2891
...
...
@@ -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
,
6
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
7
,
8
,
9
,
10
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -17,12 +17,6 @@
"processors" : [ 4 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
...
...
@@ -33,11 +27,17 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupIDProcessor",
"id" : 5
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepGroupIDProcessor",
"id" : 9
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
GroupSizeProcessor",
"id" :
6
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
FootStep
GroupSizeProcessor",
"id" :
10
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario
View file @
34af2891
...
...
@@ -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
,
6
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
7
,
8
,
9
,
10
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -17,12 +17,6 @@
"processors" : [ 4 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
...
...
@@ -33,11 +27,17 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupIDProcessor",
"id" : 5
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepGroupIDProcessor",
"id" : 9
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
GroupSizeProcessor",
"id" :
6
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
FootStep
GroupSizeProcessor",
"id" :
10
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario
View file @
34af2891
...
...
@@ -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
,
6
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
7
,
8
,
9
,
10
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -17,12 +17,6 @@
"processors" : [ 4 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
...
...
@@ -33,11 +27,17 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupIDProcessor",
"id" : 5
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepGroupIDProcessor",
"id" : 9
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
GroupSizeProcessor",
"id" :
6
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
FootStep
GroupSizeProcessor",
"id" :
10
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario
View file @
34af2891
...
...
@@ -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
,
6
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
7
,
8
,
9
,
10
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -17,12 +17,6 @@
"processors" : [ 4 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
...
...
@@ -33,11 +27,17 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupIDProcessor",
"id" : 5
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepGroupIDProcessor",
"id" : 9
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
GroupSizeProcessor",
"id" :
6
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
FootStep
GroupSizeProcessor",
"id" :
10
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario
View file @
34af2891
...
...
@@ -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
,
6
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
7
,
8
,
9
,
10
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -17,12 +17,6 @@
"processors" : [ 4 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
...
...
@@ -33,11 +27,17 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupIDProcessor",
"id" : 5
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepGroupIDProcessor",
"id" : 9
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
GroupSizeProcessor",
"id" :
6
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
FootStep
GroupSizeProcessor",
"id" :
10
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario
View file @
34af2891
...
...
@@ -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
,
6
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
7
,
8
,
9
,
10
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -17,12 +17,6 @@
"processors" : [ 4 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
...
...
@@ -33,11 +27,17 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupIDProcessor",
"id" : 5
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepGroupIDProcessor",
"id" : 9
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
GroupSizeProcessor",
"id" :
6
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
FootStep
GroupSizeProcessor",
"id" :
10
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario
View file @
34af2891
...
...
@@ -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
,
6
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [
7
,
8
,
9
,
10
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -17,12 +17,6 @@
"processors" : [ 4 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
...
...
@@ -33,11 +27,17 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianGroupIDProcessor",
"id" : 5
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepGroupIDProcessor",
"id" : 9
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
Pedestrian
GroupSizeProcessor",
"id" :
6
"type" : "org.vadere.simulator.projects.dataprocessing.processor.
FootStep
GroupSizeProcessor",
"id" :
10
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario
View file @
34af2891
...
...
@@ -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
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 1
7
,
18
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -100,6 +100,12 @@
"pedestrianPositionProcessorId" : 1,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 17
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 18
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario
View file @
34af2891
...
...
@@ -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
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 1
7
,
18
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -100,6 +100,12 @@
"pedestrianPositionProcessorId" : 1,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 17
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 18
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario
View file @
34af2891
...
...
@@ -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
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 1
7
,
18
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -100,6 +100,12 @@
"pedestrianPositionProcessorId" : 1,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 17
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 18
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario
View file @
34af2891
...
...
@@ -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
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 1
7
,
18
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -100,6 +100,12 @@
"pedestrianPositionProcessorId" : 1,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 17
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 18
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario
View file @
34af2891
...
...
@@ -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
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 1
7
,
18
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -100,6 +100,12 @@
"pedestrianPositionProcessorId" : 1,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 17
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 18
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario
View file @
34af2891
...
...
@@ -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
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 1
7
,
18
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -100,6 +100,12 @@
"pedestrianPositionProcessorId" : 1,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 17
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 18
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario
View file @
34af2891
...
...
@@ -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
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 1
7
,
18
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -100,6 +100,12 @@
"pedestrianPositionProcessorId" : 1,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 17
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 18
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario
View file @
34af2891
...
...
@@ -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
]
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.
Eventtime
PedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 1
7
,
18
]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
...
...
@@ -100,6 +100,12 @@
"pedestrianPositionProcessorId" : 1,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 17
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 18
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
...
...
VadereSimulator/tests/org/vadere/simulator/models/potential/solver/TestFMMEikMesh.java
View file @
34af2891
...
...
@@ -53,8 +53,8 @@ public class TestFMMEikMesh {
MeshPolyWriter
<
PVertex
,
PHalfEdge
,
PFace
>
meshPolyWriter
=
new
MeshPolyWriter
<>();
System
.
out
.
println
(
meshPolyWriter
.
to2DPoly
(
triangulation
.
getMesh
(),
1
,
i
->
"potential"
,
v
->
false
));
//
System.out.println(meshPolyWriter.to2DPoly(triangulation.getMesh(), 1, i -> "potential", v -> false));
//
System.out.println(mesh.toPythonTriangulation(v -> triangulation.getMesh().getDoubleData(v, "potential")));
System
.
out
.
println
(
mesh
.
toPythonTriangulation
(
v
->
triangulation
.
getMesh
().
getDoubleData
(
v
,
"potential"
)));
}
}
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