Commit db06dbea authored by Stefan Schuhbaeck's avatar Stefan Schuhbaeck
Browse files

add missing attribute transformations and sort them

parent 03f802fd
......@@ -14,6 +14,92 @@
"vadere": {
"mainModel": "vadere.&",
"attributesModel": {
"org.vadere.state.attributes.models.AttributesOSM": {
"stepCircleResolution" : "vadere.&2.&1.&0",
"numberOfCircles" : "vadere.&2.&1.&0",
"varyStepDirection" : "vadere.&2.&1.&0",
"stepLengthIntercept" : "vadere.&2.&1.&0",
"stepLengthSlopeSpeed" : "vadere.&2.&1.&0",
"stepLengthSD" : "vadere.&2.&1.&0",
"movementThreshold" : "vadere.&2.&1.&0",
"optimizationType" : "vadere.&2.&1.&0",
"movementType" : "vadere.&2.&1.&0",
"dynamicStepLength" : "vadere.&2.&1.&0",
"updateType" : "vadere.&2.&1.&0",
"seeSmallWalls" : "vadere.&2.&1.&0",
"minimumStepLength" : "vadere.&2.&1.&0",
"targetPotentialModel" : "vadere.&2.&1.&0",
"pedestrianPotentialModel" : "vadere.&2.&1.&0",
"obstaclePotentialModel" : "vadere.&2.&1.&0",
"submodels" : "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesBHM": {
"stepLengthIntercept": "vadere.&2.&1.&0",
"stepLengthSlopeSpeed": "vadere.&2.&1.&0",
"stepLengthSD": "vadere.&2.&1.&0",
"stepLengthDeviation": "vadere.&2.&1.&0",
"navigationCluster": "vadere.&2.&1.&0",
"navigationFollower": "vadere.&2.&1.&0",
"directionWallDistance": "vadere.&2.&1.&0",
"tangentialEvasion": "vadere.&2.&1.&0",
"sidewaysEvasion": "vadere.&2.&1.&0",
"onlyEvadeContraFlow": "vadere.&2.&1.&0",
"makeSmallSteps": "vadere.&2.&1.&0",
"followerProximityNavigation": "vadere.&2.&1.&0",
"differentBehaviour": "vadere.&2.&1.&0",
"differentEvasionBehaviourPercentage": "vadere.&2.&1.&0",
"varyingBehaviour": "vadere.&2.&1.&0",
"adaptiveBehaviourDensity": "vadere.&2.&1.&0",
"adaptiveBehaviourStepsRemained": "vadere.&2.&1.&0",
"switchBehaviour": "vadere.&2.&1.&0",
"evasionDetourThreshold": "vadere.&2.&1.&0",
"onlyEvadeContraFlowAngle": "vadere.&2.&1.&0",
"followerAngleMovement": "vadere.&2.&1.&0",
"followerAnglePosition": "vadere.&2.&1.&0",
"followerDistance": "vadere.&2.&1.&0",
"smallStepResolution": "vadere.&2.&1.&0",
"plannedStepsAhead": "vadere.&2.&1.&0",
"obstacleRepulsionReach": "vadere.&2.&1.&0",
"obstacleRepulsionMaxWeight": "vadere.&2.&1.&0",
"distanceToKeep": "vadere.&2.&1.&0",
"backwardsAngle": "vadere.&2.&1.&0",
"reconsiderOldTargets": "vadere.&2.&1.&0",
"targetThresholdX": "vadere.&2.&1.&0",
"targetThresholdY": "vadere.&2.&1.&0",
"spaceToKeep": "vadere.&2.&1.&0",
"stepAwayFromCollisions": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesBMM": {
"reachedStepTolerance": "vadere.&2.&1.&0",
"acceleration": "vadere.&2.&1.&0",
"stepwiseDecisions": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesGNM": {
"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"
},
"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"
},
"org.vadere.state.attributes.models.AttributesOVM": {
"attributesODEIntegrator": {
"solverType": "vadere.&3.&2.&1.&0",
......@@ -31,7 +117,44 @@
},
"ignoreOtherCars": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesPotentialCompact": {
"org.vadere.state.attributes.models.AttributesCGM": {
"groupMemberRepulsionFactor": "vadere.&2.&1.&0",
"leaderAttractionFactor": "vadere.&2.&1.&0",
"groupSizeDistribution": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesGFM": {
"gravityFactor": "vadere.&2.&1.&0",
"normalParticleStiffness": "vadere.&2.&1.&0",
"dampingParticle": "vadere.&2.&1.&0",
"normalObstacleStiffness": "vadere.&2.&1.&0",
"dampingObstacle": "vadere.&2.&1.&0",
"timeStepSize": "vadere.&2.&1.&0",
"dynamicFrictionParticle": "vadere.&2.&1.&0",
"staticFrictionParticle": "vadere.&2.&1.&0",
"dynamicFrictionObstacle": "vadere.&2.&1.&0",
"staticFrictionObstacle": "vadere.&2.&1.&0",
"addhesionCoefficient": "vadere.&2.&1.&0",
"tangentialStiffness": "vadere.&2.&1.&0",
"tangentialDissipation": "vadere.&2.&1.&0",
"startAccelerationX": "vadere.&2.&1.&0",
"startAccelerationY": "vadere.&2.&1.&0",
"accelerationTime": "vadere.&2.&1.&0",
"accelerationId": "vadere.&2.&1.&0",
"massParticle": "vadere.&2.&1.&0",
"momOfInertia": "vadere.&2.&1.&0",
"startOmega": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesParticles": {
"attributesODEIntegrator": {
"solverType": "vadere.&3.&1.&1.&0",
"stepSizeMin": "vadere.&3.&1.&1.&0",
"stepSizeMax": "vadere.&3.&1.&1.&0",
"toleranceAbsolute": "vadere.&3.&1.&1.&0",
"toleranceRelative": "vadere.&3.&1.&1.&0"
},
"floorGradientProviderType": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesPotentialCompact": {
"pedPotentialWidth": "vadere.&2.&1.&0",
"pedPotentialHeight": "vadere.&2.&1.&0",
"obstPotentialWidth": "vadere.&2.&1.&0",
......@@ -40,25 +163,15 @@
"obstDistanceDeviation": "vadere.&2.&1.&0",
"visionFieldRadius": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesOSM": {
"stepCircleResolution": "vadere.&2.&1.&0",
"numberOfCircles": "vadere.&2.&1.&0",
"varyStepDirection": "vadere.&2.&1.&0",
"stepLengthIntercept": "vadere.&2.&1.&0",
"stepLengthSlopeSpeed": "vadere.&2.&1.&0",
"stepLengthSD": "vadere.&2.&1.&0",
"movementThreshold": "vadere.&2.&1.&0",
"optimizationType": "vadere.&2.&1.&0",
"movementType": "vadere.&2.&1.&0",
"dynamicStepLength": "vadere.&2.&1.&0",
"updateType": "vadere.&2.&1.&0",
"seeSmallWalls": "vadere.&2.&1.&0",
"minimumStepLength": "vadere.&2.&1.&0",
"targetPotentialModel": "vadere.&2.&1.&0",
"pedestrianPotentialModel": "vadere.&2.&1.&0",
"obstaclePotentialModel": "vadere.&2.&1.&0",
"groupModel": "vadere.&2.&1.&0",
"submodels": "vadere.&2.&1.&0"
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell": {
"pedPotentialIntimateSpaceWidth": "vadere.&2.&1.&0",
"pedPotentialPersonalSpaceWidth": "vadere.&2.&1.&0",
"pedPotentialHeight": "vadere.&2.&1.&0",
"obstPotentialWidth": "vadere.&2.&1.&0",
"obstPotentialHeight": "vadere.&2.&1.&0",
"intimateSpaceFactor": "vadere.&2.&1.&0",
"personalSpacePower": "vadere.&2.&1.&0",
"intimateSpacePower": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesFloorField": {
"createMethod": "vadere.&2.&1.&0",
......@@ -83,37 +196,66 @@
"obstacleBodyPotential": "vadere.&2.&1.&0",
"obstacleRepulsionStrength": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesGNM": {
"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"
"org.vadere.state.attributes.models.AttributesPotentialOSM": {
"pedestrianBodyPotential": "vadere.&2.&1.&0",
"pedestrianRepulsionWidth": "vadere.&2.&1.&0",
"pedestrianRepulsionStrength": "vadere.&2.&1.&0",
"aPedOSM": "vadere.&2.&1.&0",
"bPedOSM": "vadere.&2.&1.&0",
"pedestrianRecognitionDistance": "vadere.&2.&1.&0",
"personalDensityFactor": "vadere.&2.&1.&0",
"obstacleBodyPotential": "vadere.&2.&1.&0",
"obstacleRepulsionWidth": "vadere.&2.&1.&0",
"obstacleRepulsionStrength": "vadere.&2.&1.&0",
"aObsOSM": "vadere.&2.&1.&0",
"bObsOSM": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesPotentialSFM": {
"org.vadere.state.attributes.models.AttributesPotentialParticles": {
"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"
"org.vadere.state.attributes.models.AttributesPotentialRingExperiment": {
"center": {
"x": "vadere.&3.&2.&1.&0",
"y": "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"
"radius1": "vadere.&2.&1.&0",
"radius2": "vadere.&2.&1.&0",
"pedestrianTrajectory1": "vadere.&2.&1.&0",
"pedestrianTrajectory2": "vadere.&2.&1.&0",
"allowedTrajectoryWidth": "vadere.&2.&1.&0",
"pedestrianRadius": "vadere.&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.AttributesQueuingGame": {
"queuingFloorField": "vadere.&2.&1.&0",
"navigationFloorField": "vadere.&2.&1.&0",
"competitiveProbability": "vadere.&2.&1.&0",
"expectedGentleTimeInSec": "vadere.&2.&1.&0",
"expectedCompetitiveTimeInSec": "vadere.&2.&1.&0"
},
"org.vadere.state.attributes.scenario.AttributesCar": {
"id": "vadere.&2.&1.&0",
"radius": "vadere.&2.&1.&0",
"densityDependentSpeed": "vadere.&2.&1.&0",
"speedDistributionMean": "vadere.&2.&1.&0",
"speedDistributionStandardDeviation": "vadere.&2.&1.&0",
"minimumSpeed": "vadere.&2.&1.&0",
"maximumSpeed": "vadere.&2.&1.&0",
"acceleration": "vadere.&2.&1.&0",
"length": "vadere.&2.&1.&0",
"width": "vadere.&2.&1.&0",
"direction": {
"x": "vadere.&3.&1.&1.&0",
"y": "vadere.&3.&1.&1.&0"
}
}
},
"attributesSimulation": {
......
......@@ -24,6 +24,25 @@
"scenario": {
"mainModel": "scenario.mainModel",
"attributesModel": {
"org.vadere.state.attributes.models.AttributesOSM": {
"stepCircleResolution": "scenario.&2.&1.&0",
"numberOfCircles": "scenario.&2.&1.&0",
"varyStepDirection": "scenario.&2.&1.&0",
"stepLengthIntercept": "scenario.&2.&1.&0",
"stepLengthSlopeSpeed": "scenario.&2.&1.&0",
"stepLengthSD": "scenario.&2.&1.&0",
"movementThreshold": "scenario.&2.&1.&0",
"optimizationType": "scenario.&2.&1.&0",
"movementType": "scenario.&2.&1.&0",
"dynamicStepLength": "scenario.&2.&1.&0",
"updateType": "scenario.&2.&1.&0",
"seeSmallWalls": "scenario.&2.&1.&0",
"minimumStepLength": "scenario.&2.&1.&0",
"targetPotentialModel": "scenario.&2.&1.&0",
"pedestrianPotentialModel": "scenario.&2.&1.&0",
"obstaclePotentialModel": "scenario.&2.&1.&0",
"submodels": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesBHM": {
"stepLengthIntercept": "scenario.&2.&1.&0",
"stepLengthSlopeSpeed": "scenario.&2.&1.&0",
......@@ -65,50 +84,6 @@
"acceleration": "scenario.&2.&1.&0",
"stepwiseDecisions": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesCGM": {
"groupMemberRepulsionFactor": "scenario.&2.&1.&0",
"leaderAttractionFactor": "scenario.&2.&1.&0",
"groupSizeDistribution": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesFloorField": {
"createMethod": "scenario.&2.&1.&0",
"potentialFieldResolution": "scenario.&2.&1.&0",
"obstacleGridPenalty": "scenario.&2.&1.&0",
"targetAttractionStrength": "scenario.&2.&1.&0",
"timeCostAttributes": {
"standardDerivation": "scenario.&3.&2.&1.&0",
"type": "scenario.&3.&2.&1.&0",
"obstacleDensityWeight": "scenario.&3.&2.&1.&0",
"pedestrianSameTargetDensityWeight": "scenario.&3.&2.&1.&0",
"pedestrianOtherTargetDensityWeight": "scenario.&3.&2.&1.&0",
"pedestrianWeight": "scenario.&3.&2.&1.&0",
"queueWidthLoading": "scenario.&3.&2.&1.&0",
"pedestrianDynamicWeight": "scenario.&3.&2.&1.&0",
"loadingType": "scenario.&3.&2.&1.&0"
}
},
"org.vadere.state.attributes.models.AttributesGFM": {
"gravityFactor": "scenario.&2.&1.&0",
"normalParticleStiffness": "scenario.&2.&1.&0",
"dampingParticle": "scenario.&2.&1.&0",
"normalObstacleStiffness": "scenario.&2.&1.&0",
"dampingObstacle": "scenario.&2.&1.&0",
"timeStepSize": "scenario.&2.&1.&0",
"dynamicFrictionParticle": "scenario.&2.&1.&0",
"staticFrictionParticle": "scenario.&2.&1.&0",
"dynamicFrictionObstacle": "scenario.&2.&1.&0",
"staticFrictionObstacle": "scenario.&2.&1.&0",
"addhesionCoefficient": "scenario.&2.&1.&0",
"tangentialStiffness": "scenario.&2.&1.&0",
"tangentialDissipation": "scenario.&2.&1.&0",
"startAccelerationX": "scenario.&2.&1.&0",
"startAccelerationY": "scenario.&2.&1.&0",
"accelerationTime": "scenario.&2.&1.&0",
"accelerationId": "scenario.&2.&1.&0",
"massParticle": "scenario.&2.&1.&0",
"momOfInertia": "scenario.&2.&1.&0",
"startOmega": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesGNM": {
"attributesODEIntegrator": {
"solverType": "scenario.&3.&2.&1.&0",
......@@ -122,31 +97,18 @@
"pedestrianPotentialModel": "scenario.&2.&1.&0",
"obstaclePotentialModel": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesODEIntegrator": {
"solverType": "scenario.&2.&1.&0",
"stepSizeMin": "scenario.&2.&1.&0",
"stepSizeMax": "scenario.&2.&1.&0",
"toleranceAbsolute": "scenario.&2.&1.&0",
"toleranceRelative": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesOSM": {
"stepCircleResolution": "scenario.&2.&1.&0",
"numberOfCircles": "scenario.&2.&1.&0",
"varyStepDirection": "scenario.&2.&1.&0",
"stepLengthIntercept": "scenario.&2.&1.&0",
"stepLengthSlopeSpeed": "scenario.&2.&1.&0",
"stepLengthSD": "scenario.&2.&1.&0",
"movementThreshold": "scenario.&2.&1.&0",
"optimizationType": "scenario.&2.&1.&0",
"movementType": "scenario.&2.&1.&0",
"dynamicStepLength": "scenario.&2.&1.&0",
"updateType": "scenario.&2.&1.&0",
"seeSmallWalls": "scenario.&2.&1.&0",
"minimumStepLength": "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",
"submodels": "scenario.&2.&1.&0"
"obstaclePotentialModel": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesOVM": {
"attributesODEIntegrator": {
......@@ -165,6 +127,33 @@
},
"ignoreOtherCars": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesCGM": {
"groupMemberRepulsionFactor": "scenario.&2.&1.&0",
"leaderAttractionFactor": "scenario.&2.&1.&0",
"groupSizeDistribution": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesGFM": {
"gravityFactor": "scenario.&2.&1.&0",
"normalParticleStiffness": "scenario.&2.&1.&0",
"dampingParticle": "scenario.&2.&1.&0",
"normalObstacleStiffness": "scenario.&2.&1.&0",
"dampingObstacle": "scenario.&2.&1.&0",
"timeStepSize": "scenario.&2.&1.&0",
"dynamicFrictionParticle": "scenario.&2.&1.&0",
"staticFrictionParticle": "scenario.&2.&1.&0",
"dynamicFrictionObstacle": "scenario.&2.&1.&0",
"staticFrictionObstacle": "scenario.&2.&1.&0",
"addhesionCoefficient": "scenario.&2.&1.&0",
"tangentialStiffness": "scenario.&2.&1.&0",
"tangentialDissipation": "scenario.&2.&1.&0",
"startAccelerationX": "scenario.&2.&1.&0",
"startAccelerationY": "scenario.&2.&1.&0",
"accelerationTime": "scenario.&2.&1.&0",
"accelerationId": "scenario.&2.&1.&0",
"massParticle": "scenario.&2.&1.&0",
"momOfInertia": "scenario.&2.&1.&0",
"startOmega": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesParticles": {
"attributesODEIntegrator": {
"solverType": "scenario.&3.&2.&1.&0",
......@@ -194,6 +183,23 @@
"personalSpacePower": "scenario.&2.&1.&0",
"intimateSpacePower": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesFloorField": {
"createMethod": "scenario.&2.&1.&0",
"potentialFieldResolution": "scenario.&2.&1.&0",
"obstacleGridPenalty": "scenario.&2.&1.&0",
"targetAttractionStrength": "scenario.&2.&1.&0",
"timeCostAttributes": {
"standardDerivation": "scenario.&3.&2.&1.&0",
"type": "scenario.&3.&2.&1.&0",
"obstacleDensityWeight": "scenario.&3.&2.&1.&0",
"pedestrianSameTargetDensityWeight": "scenario.&3.&2.&1.&0",
"pedestrianOtherTargetDensityWeight": "scenario.&3.&2.&1.&0",
"pedestrianWeight": "scenario.&3.&2.&1.&0",
"queueWidthLoading": "scenario.&3.&2.&1.&0",
"pedestrianDynamicWeight": "scenario.&3.&2.&1.&0",
"loadingType": "scenario.&3.&2.&1.&0"
}
},
"org.vadere.state.attributes.models.AttributesPotentialGNM": {
"pedestrianBodyPotential": "scenario.&2.&1.&0",
"pedestrianRecognitionDistance": "scenario.&2.&1.&0",
......@@ -245,18 +251,28 @@
"expectedGentleTimeInSec": "scenario.&2.&1.&0",
"expectedCompetitiveTimeInSec": "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"
"org.vadere.state.attributes.scenario.AttributesCar": {
"id": "scenario.&2.&1.&0",
"radius": "scenario.&2.&1.&0",
"densityDependentSpeed": "scenario.&2.&1.&0",
"speedDistributionMean": "scenario.&2.&1.&0",
"speedDistributionStandardDeviation": "scenario.&2.&1.&0",
"minimumSpeed": "scenario.&2.&1.&0",
"maximumSpeed": "scenario.&2.&1.&0",
"acceleration": "scenario.&2.&1.&0",
"length": "scenario.&2.&1.&0",
"width": "scenario.&2.&1.&0",
"direction": {
"x": "scenario.&3.&2.&1.&0",
"y": "scenario.&3.&2.&1.&0"
}
},
"org.vadere.state.attributes.models.AttributesODEIntegrator": {
"solverType": "scenario.&2.&1.&0",
"stepSizeMin": "scenario.&2.&1.&0",
"stepSizeMax": "scenario.&2.&1.&0",
"toleranceAbsolute": "scenario.&2.&1.&0",
"toleranceRelative": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesSTOM": {
"operation": "scenario.&2.&1.&0",
......@@ -300,22 +316,6 @@
"queueWidthLoading": "scenario.&2.&1.&0",
"pedestrianDynamicWeight": "scenario.&2.&1.&0",
"loadingType": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.scenario.AttributesCar": {
"id": "scenario.&2.&1.&0",
"radius": "scenario.&2.&1.&0",
"densityDependentSpeed": "scenario.&2.&1.&0",
"speedDistributionMean": "scenario.&2.&1.&0",
"speedDistributionStandardDeviation": "scenario.&2.&1.&0",
"minimumSpeed": "scenario.&2.&1.&0",
"maximumSpeed": "scenario.&2.&1.&0",
"acceleration": "scenario.&2.&1.&0",
"length": "scenario.&2.&1.&0",
"width": "scenario.&2.&1.&0",
"direction": {
"x": "scenario.&3.&2.&1.&0",
"y": "scenario.&3.&2.&1.&0"
}
}
//end attributesModel
......
......@@ -8,6 +8,92 @@
"vadere": {
"mainModel": "scenario.mainModel",
"attributesModel": {
"org.vadere.state.attributes.models.AttributesOSM": {
"stepCircleResolution": "scenario.&2.&1.&0",
"numberOfCircles": "scenario.&2.&1.&0",
"varyStepDirection": "scenario.&2.&1.&0",
"stepLengthIntercept": "scenario.&2.&1.&0",
"stepLengthSlopeSpeed": "scenario.&2.&1.&0",
"stepLengthSD": "scenario.&2.&1.&0",
"movementThreshold": "scenario.&2.&1.&0",
"optimizationType": "scenario.&2.&1.&0",
"movementType": "scenario.&2.&1.&0",
"dynamicStepLength": "scenario.&2.&1.&0",
"updateType": "scenario.&2.&1.&0",
"seeSmallWalls": "scenario.&2.&1.&0",
"minimumStepLength": "scenario.&2.&1.&0",
"targetPotentialModel": "scenario.&2.&1.&0",
"pedestrianPotentialModel": "scenario.&2.&1.&0",
"obstaclePotentialModel": "scenario.&2.&1.&0",
"submodels": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesBHM": {
"stepLengthIntercept": "scenario.&2.&1.&0",
"stepLengthSlopeSpeed": "scenario.&2.&1.&0",
"stepLengthSD": "scenario.&2.&1.&0",
"stepLengthDeviation": "scenario.&2.&1.&0",
"navigationCluster": "scenario.&2.&1.&0",
"navigationFollower": "scenario.&2.&1.&0",
"directionWallDistance": "scenario.&2.&1.&0",
"tangentialEvasion": "scenario.&2.&1.&0",
"sidewaysEvasion": "scenario.&2.&1.&0",
"onlyEvadeContraFlow": "scenario.&2.&1.&0",
"makeSmallSteps": "scenario.&2.&1.&0",
"followerProximityNavigation": "scenario.&2.&1.&0",
"differentBehaviour": "scenario.&2.&1.&0",
"differentEvasionBehaviourPercentage": "scenario.&2.&1.&0",
"varyingBehaviour": "scenario.&2.&1.&0",
"adaptiveBehaviourDensity": "scenario.&2.&1.&0",
"adaptiveBehaviourStepsRemained": "scenario.&2.&1.&0",
"switchBehaviour": "scenario.&2.&1.&0",
"evasionDetourThreshold": "scenario.&2.&1.&0",
"onlyEvadeContraFlowAngle": "scenario.&2.&1.&0",
"followerAngleMovement": "scenario.&2.&1.&0",
"followerAnglePosition": "scenario.&2.&1.&0",
"followerDistance": "scenario.&2.&1.&0",
"smallStepResolution": "scenario.&2.&1.&0",
"plannedStepsAhead": "scenario.&2.&1.&0",
"obstacleRepulsionReach": "scenario.&2.&1.&0",
"obstacleRepulsionMaxWeight": "scenario.&2.&1.&0",
"distanceToKeep": "scenario.&2.&1.&0",
"backwardsAngle": "scenario.&2.&1.&0",
"reconsiderOldTargets": "scenario.&2.&1.&0",
"targetThresholdX": "scenario.&2.&1.&0",
"targetThresholdY": "scenario.&2.&1.&0",
"spaceToKeep": "scenario.&2.&1.&0",
"stepAwayFromCollisions": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesBMM": {
"reachedStepTolerance": "scenario.&2.&1.&0",
"acceleration": "scenario.&2.&1.&0",
"stepwiseDecisions": "scenario.&2.&1.&0"
},
"org.vadere.state.attributes.models.AttributesGNM": {
"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"
},
"org.vadere.state.attributes.models.AttributesSFM": {
"attributesODEIntegrator": {
"solverType": "scenario.&3.&2.&1.&0",