Skip to content
GitLab
Commit e1bb6ac6 authored by Christina's avatar Christina
Browse files

Merge branch 'master' into target_changer_prob_list

parents b859cefa 2d5d4900
Pipeline #257249 passed with stages
in 140 minutes and 51 seconds
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ e1bb6ac6
# Build artifacts, log and preference files
*.out
javac.*.args
*.preferences.xml
**/current_commit_hash.txt
**/log.out
**/*.log.gz
bin/
swing-inspector-linux-1.2.3/
target/
javac.*.args
# C extensions
*.so
......
CHANGELOG.md
View file @ e1bb6ac6
......@@ -6,6 +6,7 @@
### Added
- The TikZ snapshot button allows to export either the whole topography or only the current (scaled) view. This is useful when visualizing parts of bigger topographies.
- Added "--version" to "vadere-console.jar".
- Added a Vadere logo (a simple "V") as window and task bar icon to get rid of the lame default Java icon.
- Added "Psychology" tab in GUI which shows all psychology-related attributes of a scenario (which are stored in JSON node "attributesPsychology").
......@@ -65,7 +66,6 @@ Was previously known as `PedestrianFootStepProcessor`
3. `cacheDir` is relative and `Vadere.cache.useGlobalCacheBaseDir=true`:
Lookup `Vadere.cache.flobalCacheBaseDir` and use this as the base path for the relative
`cacheDir` path. `Vadere.cache.flobalCacheBaseDir` defaults to `${user.home}\.cache\vadere`
## v1.4 (2019-09-05)
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled.scenario → Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario
View file @ e1bb6ac6
{
"name" : "09-CounterFlow-OSMSequential-PsychEnabled",
"name" : "Liddle_osm_v4",
"description" : "",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 7, 8, 9, 10 ]
"processors" : [ 1, 2 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
"filename" : "overlap.csv",
"processors" : [ 3 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "overlapCount.txt",
"processors" : [ 4 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestriansNearbyIdOutputFile",
"filename" : "contacts.txt",
"processors" : [ 5 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
......@@ -27,17 +37,15 @@
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepSelfCategoryProcessor",
"id" : 9
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepMostImportantStimulusProcessor",
"id" : 10
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestriansNearbyProcessor",
"id" : 5,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianNearbyProcessor",
"attributes" : {
"maxDistanceForANearbyPedestrian" : 1.5,
"sampleEveryNthStep" : 1,
"allowedAbsenceTimestepsIfContactReturns" : 0,
"minTimespanOfContactTimesteps" : 1
}
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
......@@ -49,7 +57,7 @@
"stepCircleResolution" : 4,
"numberOfCircles" : 1,
"optimizationType" : "NELDER_MEAD",
"varyStepDirection" : true,
"varyStepDirection" : false,
"movementType" : "ARBITRARY",
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
......@@ -59,7 +67,7 @@
"minimumStepLength" : true,
"maxStepDuration" : 1.7976931348623157E308,
"dynamicStepLength" : true,
"updateType" : "SEQUENTIAL",
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
......@@ -99,19 +107,19 @@
}
},
"attributesSimulation" : {
"finishTime" : 180.0,
"finishTime" : 30.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"realTimeSimTimeRatio" : 0.5,
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 6138355022448163583,
"simulationSeed" : 6138355022448163583
"useFixedSeed" : false,
"fixedSeed" : 1,
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : true,
"usePsychologyLayer" : false,
"psychologyLayer" : {
"perception" : "SimplePerceptionModel",
"cognition" : "CooperativeCognitionModel"
......@@ -123,40 +131,59 @@
"x" : 0.0,
"y" : 0.0,
"width" : 20.0,
"height" : 2.0
"height" : 15.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"absorbing" : true,
"obstacles" : [ {
"shape" : {
"x" : 3.0,
"y" : 9.0,
"width" : 5.0,
"height" : 6.0,
"type" : "RECTANGLE"
},
"id" : 1
}, {
"shape" : {
"x" : 3.0,
"y" : 0.0,
"width" : 5.0,
"height" : 6.0,
"type" : "RECTANGLE"
},
"id" : 2
} ],
"measurementAreas" : [ {
"shape" : {
"x" : 18.5,
"y" : 0.5,
"x" : 8.5,
"y" : 6.0,
"width" : 1.0,
"height" : 1.0,
"height" : 3.0,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
"id" : 1
}, {
"id" : 2,
"shape" : {
"x" : 8.0,
"y" : 5.6,
"width" : 2.0,
"height" : 4.0,
"type" : "RECTANGLE"
},
"id" : 2
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"absorbing" : true,
"shape" : {
"x" : 0.5,
"y" : 0.5,
"width" : 1.0,
"height" : 1.0,
"x" : 1.0,
"y" : 6.8,
"width" : 1.4,
"height" : 1.4,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
......@@ -172,56 +199,34 @@
"sources" : [ {
"id" : 3,
"shape" : {
"x" : 1.6,
"y" : 0.5,
"width" : 1.0,
"height" : 1.0,
"x" : 14.0,
"y" : 2.5,
"width" : 5.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 20,
"spawnNumber" : 100,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtRandomPositions" : true,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
}, {
"id" : 4,
"shape" : {
"x" : 17.4,
"y" : 0.5,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 20,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : false,
"spawnAtGridPositionsCA" : false,
"useFreeSpaceOnly" : true,
"targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN",
"attributesPedestrian" : null
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.2,
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"minimumSpeed" : 0.01,
"maximumSpeed" : 5.0,
"acceleration" : 2.0,
"footstepHistorySize" : 4,
"searchRadius" : 1.0,
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario
View file @ e1bb6ac6
......@@ -6,38 +6,35 @@
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 7, 8, 9, 10 ]
"processors" : [ 3, 4, 5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
"processors" : [ 3 ]
"processors" : [ 1 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "overlapCount.txt",
"processors" : [ 4 ]
"processors" : [ 2 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 4,
"id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 3
"pedestrianOverlapProcessorId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
"id" : 3
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepSelfCategoryProcessor",
"id" : 9
"id" : 4
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepMostImportantStimulusProcessor",
"id" : 10
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepPsychologyStatusProcessor",
"id" : 5
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
......@@ -214,7 +211,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -262,7 +262,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -310,7 +313,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -358,7 +364,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -406,7 +415,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -454,7 +466,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -502,7 +517,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -550,7 +568,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -598,7 +619,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -646,7 +670,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -694,7 +721,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -742,7 +772,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -790,7 +823,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario
View file @ e1bb6ac6
......@@ -6,38 +6,35 @@
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 7, 8, 9, 10 ]
"processors" : [ 3, 4, 5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
"processors" : [ 3 ]
"processors" : [ 1 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "overlapCount.txt",
"processors" : [ 4 ]
"processors" : [ 2 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 4,
"id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 3
"pedestrianOverlapProcessorId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 7
"id" : 3
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 8
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepSelfCategoryProcessor",
"id" : 9
"id" : 4
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepMostImportantStimulusProcessor",
"id" : 10
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepPsychologyStatusProcessor",
"id" : 5
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
......@@ -214,7 +211,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -262,7 +262,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -310,7 +313,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -358,7 +364,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
......@@ -406,7 +415,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},