Commit 9e34daec authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

add missing attributes to transformv01->v02 and v01 identity

parent 023a8507
Pipeline #62062 failed with stage
in 45 seconds
...@@ -74,6 +74,7 @@ ...@@ -74,6 +74,7 @@
"targetPotentialModel": "vadere.&2.&1.&0", "targetPotentialModel": "vadere.&2.&1.&0",
"pedestrianPotentialModel": "vadere.&2.&1.&0", "pedestrianPotentialModel": "vadere.&2.&1.&0",
"obstaclePotentialModel": "vadere.&2.&1.&0", "obstaclePotentialModel": "vadere.&2.&1.&0",
"groupModel": "vadere.&2.&1.&0",
"submodels": "vadere.&2.&1.&0" "submodels": "vadere.&2.&1.&0"
}, },
"org.vadere.state.attributes.models.AttributesFloorField": { "org.vadere.state.attributes.models.AttributesFloorField": {
...@@ -127,6 +128,25 @@ ...@@ -127,6 +128,25 @@
"x": "vadere.&3.&2.&1.&0", "x": "vadere.&3.&2.&1.&0",
"y": "vadere.&3.&2.&1.&0" "y": "vadere.&3.&2.&1.&0"
} }
},
"org.vadere.state.attributes.models.AttributesPotentialSFM": {
"pedestrianBodyPotential": "vadere.&2.&1.&0",
"pedestrianRecognitionDistance": "vadere.&2.&1.&0",
"obstacleBodyPotential": "vadere.&2.&1.&0",
"obstacleRepulsionStrength": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesSFM": {
"attributesODEIntegrator": {
"solverType": "vadere.&3.&2.&1.&0",
"stepSizeMin": "vadere.&3.&2.&1.&0",
"stepSizeMax": "vadere.&3.&2.&1.&0",
"toleranceAbsolute": "vadere.&3.&2.&1.&0",
"toleranceRelative": "vadere.&3.&2.&1.&0"
},
"floorGradientProviderType": "vadere.&2.&1.&0",
"targetPotentialModel": "vadere.&2.&1.&0",
"pedestrianPotentialModel": "vadere.&2.&1.&0",
"obstaclePotentialModel": "vadere.&2.&1.&0"
} }
}, },
"attributesSimulation": { "attributesSimulation": {
......
...@@ -226,6 +226,25 @@ ...@@ -226,6 +226,25 @@
"x": "scenario.&3.&2.&1.&0", "x": "scenario.&3.&2.&1.&0",
"y": "scenario.&3.&2.&1.&0" "y": "scenario.&3.&2.&1.&0"
} }
},
"org.vadere.state.attributes.models.AttributesPotentialSFM": {
"pedestrianBodyPotential": "scenario.&2.&1.&0",
"pedestrianRecognitionDistance": "scenario.&2.&1.&0",
"obstacleBodyPotential": "scenario.&2.&1.&0",
"obstacleRepulsionStrength": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesSFM": {
"attributesODEIntegrator": {
"solverType": "scenario.&3.&2.&1.&0",
"stepSizeMin": "scenario.&3.&2.&1.&0",
"stepSizeMax": "scenario.&3.&2.&1.&0",
"toleranceAbsolute": "scenario.&3.&2.&1.&0",
"toleranceRelative": "scenario.&3.&2.&1.&0"
},
"floorGradientProviderType": "scenario.&2.&1.&0",
"targetPotentialModel": "scenario.&2.&1.&0",
"pedestrianPotentialModel": "scenario.&2.&1.&0",
"obstaclePotentialModel": "scenario.&2.&1.&0"
} }
} }
} }
...@@ -238,8 +257,21 @@ ...@@ -238,8 +257,21 @@
"description": "", "description": "",
"release": "0.2", "release": "0.2",
"processWriters": { "processWriters": {
"files[]": {}, "files[]": {
"processors[]": {}, "0": {
"type": "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename": "postvis.trajectories",
"processors": [
1
]
}
},
"processors[]": {
"0": {
"type": "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id": 1
}
},
"isTimestamped": "true" "isTimestamped": "true"
}, },
"scenario": { "scenario": {
......
...@@ -79,6 +79,16 @@ public class JoltIdentityTransformationTest { ...@@ -79,6 +79,16 @@ public class JoltIdentityTransformationTest {
} }
} }
@Test
public void DirInTarget() {
String path = "target/TestRun";
try {
Files.createDirectory(Paths.get(path));
} catch (IOException e) {
e.printStackTrace();
}
}
@Test @Test
public void transformv1t0v2() throws IOException { public void transformv1t0v2() throws IOException {
Path scenario = Paths.get("../VadereModelTestsV0.1/TestOSM/scenarios/basic_1_chicken_osm1.scenario"); Path scenario = Paths.get("../VadereModelTestsV0.1/TestOSM/scenarios/basic_1_chicken_osm1.scenario");
...@@ -156,7 +166,7 @@ public class JoltIdentityTransformationTest { ...@@ -156,7 +166,7 @@ public class JoltIdentityTransformationTest {
FileVisitor<Path> visitor = new FileVisitor<Path>() { FileVisitor<Path> visitor = new FileVisitor<Path>() {
@Override @Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException { public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
if (dir.endsWith("output") || dir.endsWith("TestSFM")) { if (dir.endsWith("output")) {
return FileVisitResult.SKIP_SUBTREE; return FileVisitResult.SKIP_SUBTREE;
} else { } else {
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
......
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