Commit 26fdaf19 authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck

Merge branch 'ped_overlap' into develop

# Conflicts:
#	VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
#	VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
parent 23485de6
......@@ -39,7 +39,7 @@
"id" : 4,
"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 4
"pedestrianOverlapProcessorId" : 3
}
} ],
"isTimestamped" : true
......
{
"name" : "rimea_09_public_room_2_exits_nelder_mead",
"name" : "rimea_09_public_room_2_exits_NELDER_MEAD",
"description" : "",
"release" : "0.4",
"processWriters" : {
......@@ -270,4 +270,4 @@
"attributesCar" : null
}
}
}
\ No newline at end of file
}
......@@ -9,7 +9,7 @@ public class SimulationResult {
private String scenarioName;
private Duration runTime;
private int totalOverlaps;
private int totalOverlaps = -1;
private String state;
private Instant startTime;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment