Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
vadere
vadere
Commits
a08441b0
Commit
a08441b0
authored
Apr 21, 2020
by
Christina
Browse files
fixed test ?
parent
16ef5ae1
Pipeline
#239890
passed with stages
in 132 minutes and 14 seconds
Changes
14
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario
View file @
a08441b0
{
"name" : "05-SimplifiedExperiment-SFM-PsychDisabled",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...
...
@@ -220,7 +219,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -268,7 +270,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -316,7 +321,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -364,7 +372,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -412,7 +423,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -460,7 +474,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -508,7 +525,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -556,7 +576,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -604,7 +627,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -652,7 +678,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -700,7 +729,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -748,7 +780,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -796,7 +831,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -844,7 +882,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -892,7 +933,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -940,7 +984,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -988,7 +1035,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario
View file @
a08441b0
{
"name" : "06-OriginalExperiment-OSMEventDriven-PsychEnabled",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -295,7 +294,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -343,7 +345,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -391,7 +396,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -439,7 +447,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -487,7 +498,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -535,7 +549,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -583,7 +600,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -631,7 +651,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -679,7 +702,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -727,7 +753,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -775,7 +804,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -823,7 +855,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
@@ -871,7 +906,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario
View file @
a08441b0
{
"name" : "08-UnidirectionalFlow-OSMSequential-PsychEnabled",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled.scenario
View file @
a08441b0
{
"name" : "09-CounterFlow-OSMSequential-PsychEnabled",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario
View file @
a08441b0
{
"name" : "10-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario
View file @
a08441b0
{
"name" : "11-CounterFlowChicken-OSMEventDriven-PsychEnabled",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario
View file @
a08441b0
{
"name" : "12-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario
View file @
a08441b0
{
"name" : "13-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-ThreatShort-SelfCatThreatModel.scenario
View file @
a08441b0
{
"name" : "14-ThreatShort-SelfCatThreatModel",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -318,7 +317,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatLong-SelfCatThreatModel.scenario
View file @
a08441b0
{
"name" : "15-ThreatLong-SelfCatThreatModel",
"description" : "",
"release" : "1.11",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"release" : "1.12",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -318,7 +317,10 @@
"latestThreatUnhandled" : false
},
"selfCategory" : "TARGET_ORIENTED",
"groupMembership" : "OUT_GROUP"
"groupMembership" : "OUT_GROUP",
"knowledgeBase" : {
"knowledge" : [ ]
}
},
"groupIds" : [ ],
"groupSizes" : [ ],
...
...
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-Threat-ImitatingBehavior-SelfCatThreatModel.scenario
View file @
a08441b0
{
"name" : "16-Threat-ImitatingBehavior-SelfCatThreatModel",
"description" : "",
"release" : "1.1
1
",
"release" : "1.1
2
",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : {
"files" : [ {
...
...
@@ -455,4 +455,4 @@
} ]
} ]
}
}
\ No newline at end of file
}
Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario
View file @
a08441b0
{
"name" : "17-ScriptAgents-ChangeTargetScriptedCognitionModel",
"description" : "",
"release" : "1.1
1
",
"release" : "1.1
2
",
"commithash" : "8b612bace24cbe5d7fa92b4b47687a9726a2a719",
"processWriters" : {
"files" : [ {
...
...
@@ -319,4 +319,4 @@
} ]
} ]
}
}
\ No newline at end of file
}
VadereSimulator/log.out-04-21-20-14-49-52-1.log.gz
0 → 100644
View file @
a08441b0
File added
VadereState/src/org/vadere/state/psychology/perception/types/Stimulus.java
View file @
a08441b0
...
...
@@ -36,7 +36,7 @@ import java.util.List;
@Type
(
value
=
Wait
.
class
,
name
=
"Wait"
),
@Type
(
value
=
WaitInArea
.
class
,
name
=
"WaitInArea"
),
@Type
(
value
=
ChangeTarget
.
class
,
name
=
"ChangeTarget"
),
@Type
(
value
=
InformationStimulus
.
class
,
name
=
"InformationAvailable
"
)
@Type
(
value
=
ChangeTargetScripted
.
class
,
name
=
"ChangeTargetScripted
"
)
})
// "time" is set when the stimulus is injected into the simulation run and must not be de-/serialized.
@JsonIgnoreProperties
({
"time"
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment