Commit cf8ef64d authored by hm-schuhba1's avatar hm-schuhba1

add new test for version v0.6

Changes for v0.6:

Processors:
* remove PedestrianOverlapDistProcessor and add functionality in
  PedestrianOverlapProcessor.
* show overlap distance in PedestrianOverlapProcessor as a positive
  delta
* refactor NumberOverlapsProcessor to use PedestrianOverlapProcessor
  as dependency
* refactor MaxOverlapProcessor to use PedestrianOverlapProcessor
  as dependency

JsonTransform Tests:

To test transformation and manipulate Jackson's JsonNode representation
four new Interface are included.

* JsonNodeExplorer: Methods to travers, delete and add JsonNodes in an
  existing Json representation. Many methods will throw Exceptions if
  a path does not exist or the operation does not work. Included are
  helpers for eays path traversal (i.e. path(root, "path/to/node"))

* TestJsonNodeExplorer: This extends the JsonNodeExplorer and overwrites
  all Methods with exceptions and insted inclueds Assertions and
  Junit test to indicate an error. Thus for example the method
  pathMustExist contains an assertion test that the path exists. This
  can be used in UnitTest as assertions.

* TestJsonNodeHelper: Create JsonNode tree from text files

* TestResourceHandler: Allows to load file based resources for test
  and will create backups of test files so the test enviroment can be
  resotred if a test fails. This helps in the development process.
parent 16081320
Pipeline #67927 passed with stages
in 58 minutes and 38 seconds
......@@ -146,13 +146,13 @@ public class ActionLoadProject extends AbstractAction {
"Log-files have been created in legacy/scenarios and legacy/output.\n\n";
if (untouched > 0)
message += untouched + " of the scenarios were already up to date.\n\n";
message += "(" + untouched + "/" + total + ") of the scenarios were already up to date.\n\n";
if (nonmigratable > 0)
message += nonmigratable
+ " scenarios could not automatically be upgraded and were moved to the legacy-folder. They can't be opened unless the upgrade is done manually.\n\n";
message += "(" + nonmigratable + "/" + total
+ ") scenarios could not automatically be upgraded and were moved to the legacy-folder. They can't be opened unless the upgrade is done manually.\n\n";
if (migrated > 0)
message += migrated
+ " scenarios were successfully upgraded. The old versions were moved to the legacy-folder.\n\n";
message += "(" + migrated + "/" + total
+ ") scenarios were successfully upgraded. The old versions were moved to the legacy-folder.\n\n";
JOptionPane.showMessageDialog(
ProjectView.getMainWindow(),
......
{
"name" : "Neues_Szenario",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "output_ts_pid.txt",
"processors" : [ 1, 2, 3, 5, 13, 14, 17 ],
"processors" : [ 1, 2, 3, 5, 13, 17 ],
"separator" : ";"
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -29,6 +29,10 @@
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "evacuationTimes.txt",
"processors" : [ 20, 21 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "out1.txt",
"processors" : [ "14" ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
......@@ -334,8 +338,8 @@
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"dynamicElements" : [ ],
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
......@@ -31,7 +31,7 @@ public class TestVadereTestProject {
assertEquals("Neues_Szenario", srm.getName());
assertEquals(3, srm.getModelAttributes().size());
assertEquals(21, srm.getDataProcessingJsonManager().getDataProcessors().size());
assertEquals(6, srm.getDataProcessingJsonManager().getOutputFiles().size());
assertEquals(7, srm.getDataProcessingJsonManager().getOutputFiles().size());
assertTrue(srm.getAttributesPedestrian() != null);
assertTrue(srm.getAttributesSimulation() != null);
assertTrue(srm.getTopography() != null);
......
{
"name" : "basic_5_1_roadReachTarget_ovm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -108,7 +109,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "CAR"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -133,7 +133,8 @@
"x" : 1.0,
"y" : 0.0
}
}
},
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "basic_5_2_roadReachTarget_ovm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -125,7 +126,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "CAR"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -150,7 +150,8 @@
"x" : 1.0,
"y" : 0.0
}
}
},
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "testtrafficlight",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -137,7 +138,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -162,7 +162,8 @@
"x" : 1.0,
"y" : 0.0
}
}
},
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "basic_1_chicken_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -138,7 +139,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -148,7 +148,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "basic_1_chicken_gnm2",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -138,7 +139,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -148,7 +148,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "basic_2_density_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -147,7 +148,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -157,7 +157,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "basic_3_1_wall_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -120,7 +121,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,7 +130,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "basic_3_2_wall_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -120,7 +121,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,7 +130,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "basic_3_3_wall_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -120,7 +121,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,7 +130,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "basic_4_1_wall_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -120,7 +121,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,7 +130,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "basic_4_2_wall_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -120,7 +121,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -130,7 +130,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_01_pathway_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -111,7 +112,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,7 +121,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_04_flow_gnm1_025_h",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -111,7 +112,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,7 +121,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_04_flow_gnm1_050_h",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -111,7 +112,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,7 +121,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_04_flow_gnm1_075_h",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -111,7 +112,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,7 +121,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_04_flow_gnm1_100_h",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -111,7 +112,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,7 +121,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_04_flow_gnm1_125_h",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -111,7 +112,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,7 +121,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_05_react_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -129,7 +130,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -139,7 +139,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_06_corner_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -129,7 +130,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -139,7 +139,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_07_speeds_gnm1",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -111,7 +112,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -121,7 +121,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_09_publicRoom_gnm1_2",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -213,7 +214,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -223,7 +223,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,
"dynamicElements" : [ ]
}
}
}
\ No newline at end of file
{
"name" : "rimea_09_publicRoom_gnm1_4",
"description" : "",
"release" : "0.5",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
......@@ -195,7 +196,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
......@@ -205,7 +205,8 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null
"attributesCar" : null,