11.08., 9:00 - 11:00: Due to updates GitLab will be unavailable for some minutes between 09:00 and 11:00.

Commit 7d64df7a authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck

ignore touching overlap test. Behaviour changed after osm calibration

parent d8bccfd6
......@@ -2,7 +2,6 @@
"name" : "group_OSM_1Source1Place",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -25,8 +24,8 @@
"attributes" : {
"pedestrianPositionProcessorId" : 0,
"scale" : 10.0,
"obstacleDensity" : true,
"standardDeviation" : null
"standardDeviation" : 0.0,
"obstacleDensity" : true
}
} ],
"isTimestamped" : true
......@@ -151,6 +150,7 @@
"groupSizeDistribution" : [ 0.0, 0.0, 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -160,6 +160,7 @@
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
......@@ -175,8 +176,8 @@
"x" : 1.0,
"y" : 0.0
}
},
"dynamicElements" : [ ]
}
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
......@@ -2,7 +2,6 @@
"name" : "group_OSM_1Source1Place_noGroup",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -134,6 +133,7 @@
"groupSizeDistribution" : [ 0.0, 0.0, 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -143,6 +143,7 @@
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
......@@ -158,8 +159,8 @@
"x" : 1.0,
"y" : 0.0
}
},
"dynamicElements" : [ ]
}
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
......@@ -2,7 +2,6 @@
"name" : "group_OSM_1Source2Places",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -197,6 +196,7 @@
"groupSizeDistribution" : [ 0.0, 0.0, 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -206,6 +206,7 @@
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
......@@ -221,8 +222,8 @@
"x" : 1.0,
"y" : 0.0
}
},
"dynamicElements" : [ ]
}
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
......@@ -2,7 +2,6 @@
"name" : "group_OSM_1Source2Places_noGroups",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -208,6 +207,7 @@
"groupSizeDistribution" : [ 0.0, 0.0, 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -217,6 +217,7 @@
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
......@@ -232,8 +233,8 @@
"x" : 1.0,
"y" : 0.0
}
},
"dynamicElements" : [ ]
}
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
......@@ -2,7 +2,6 @@
"name" : "group_OSM_2Sources1Place",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -179,6 +178,7 @@
"groupSizeDistribution" : [ 0.0, 0.0, 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -188,6 +188,7 @@
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
......@@ -203,8 +204,8 @@
"x" : 1.0,
"y" : 0.0
}
},
"dynamicElements" : [ ]
}
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
......@@ -2,7 +2,6 @@
"name" : "group_OSM_2Sources1Place_2Group_and_3Group",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -197,6 +196,7 @@
"groupSizeDistribution" : [ 0.0, 1.0, 0.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -206,6 +206,7 @@
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
......@@ -221,8 +222,8 @@
"x" : 1.0,
"y" : 0.0
}
},
"dynamicElements" : [ ]
}
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
......@@ -33,7 +33,7 @@ public class PedestrianOverlapProcessorTest extends ProcessorTest {
super.doUpdate();
}
@Test @Ignore //todo
@Test @Ignore
public void doUpdateWithTouching() throws Exception {
((PedestrianOverlapProcessorTestEnv)processorTestEnv).touching();
super.doUpdate();
......
......@@ -140,7 +140,7 @@ public class PedestrianOverlapProcessorTestEnv extends ProcessorTestEnv<Timestep
void verySmallNotOverlapping() {
AttributesAgent a = new AttributesAgent();
double distAtAxis = a.getRadius()*2 + 0.001; // this should count as overlap
double distAtAxis = a.getRadius()*2 + 0.001; // this should not count as overlap
double vertDistAt45deg = Math.sqrt(2)*a.getRadius() + 0.001;
addMockStates(a.getRadius(), distAtAxis, new VPoint(vertDistAt45deg, vertDistAt45deg));
}
......
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