forked from chri4354/nofeedback_trust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Tweaks to halo effect * Core extensions to cover edge cases in HaloEffect
- Loading branch information
mjaquiery
committed
Feb 15, 2018
1 parent
d9f8c15
commit cb010a0
Showing
9 changed files
with
124 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
%% STUDY 3 - agreement in confidence and uncertainty ##################### | ||
%% script by Niccolo Pescetelli %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
% [email protected] | ||
%% outline by Niccolo Pescetelli | ||
%% Extensions by Matt Jaquiery | ||
% [email protected] | ||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% | ||
|
@@ -104,7 +103,7 @@ | |
end | ||
%% save and break | ||
if trials(t).break | ||
%% Save dataon break trials | ||
%% Save data on break trials | ||
save([cfg.path.results osSlash subject.dir osSlash subject.fileName '_' num2str(round(t/20))],'trials', 'cfg', 't') | ||
%% break | ||
Screen('TextSize',Sc.window,cfg.instr.textSize.large); | ||
|
@@ -118,16 +117,11 @@ | |
instructions(trials(t).block); | ||
end | ||
%% introduce observers | ||
if trials(t).block>1 && trials(t-1).block<5 && trials(t).block ~= trials(t-1).block | ||
if isnan(trials(t).advisorId) % first trial is a null trial | ||
for n = t:cfg.block.trialset_count*(cfg.trialset.real+cfg.trialset.null) | ||
if n>0 && trials(n).block == trials(t).block && ~isnan(trials(n).advisorId) | ||
introduce_observers(trials(n).advisorId); | ||
break; | ||
end | ||
end | ||
if t > 1 && trials(t).block ~= trials(t-1).block | ||
if trials(t).practice | ||
introduce_observers(NaN,1); | ||
else | ||
introduce_observers(trials(t).advisorId); | ||
introduce_observers(); | ||
end | ||
end | ||
%% questionnaire | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters