Commit 6f81337e authored by Christina's avatar Christina
Browse files

Merge branch 'master' into generalize_stimulus_ranking

parents d12545da 4c38ef02
Pipeline #623734 passed with stages
in 154 minutes and 50 seconds
......@@ -73,7 +73,6 @@ public class RouteChoice extends ControlModel {
}
}
}
......
......@@ -227,6 +227,8 @@ public class StimulusController {
stimulusInfo.setTimeframe(new Timeframe(0, simTimeNextTimeStep, false, 0));
stimulusInfo.setStimuli(newStimulus);
stimuliList.add(stimulusInfo);
pedSpecificStimuli.put(ped, stimuliList);
}
......
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