Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Error because of label change fixed

  • Loading branch information...
commit f7b085cabac12dc17a1f76eb2a121b9ec7be03ef 1 parent 86b8719
@helenegauchou authored
Showing with 10 additions and 5 deletions.
  1. +2 −1  func_questions.m
  2. +8 −4 run_TS_02.m
View
3  func_questions.m
@@ -1,7 +1,6 @@
function [ID question_ID_subject part_number question_part_number task_type search_type block_number ISI number_of_trial] = func_questions
global win0 winclear
-%global ID question_ID_subject part_number task_type search_type block_number ISI number_of_trial question_part_number
HideCursor;
@@ -31,6 +30,8 @@
Screen('CopyWindow',winclear,win0);
question_search_type = GetEchoString(win0,'FOR EXPERIMENTER ONLY - Search type? Feature [1] or Conjunction [2]?',settings.LOCATION_TEXT_X,settings.LOCATION_TEXT_Y,settings.LETTER_COLOR_INSTRUCTIONS,settings.BACKGROUND_COLOR);
search_type = str2num(question_search_type);
+else
+ task_type = 999;
end
% Block number
View
12 run_TS_02.m
@@ -47,15 +47,19 @@
% Displays trials and retrieves data
for current_trial = 1:number_of_trial;
+
if task_type == settings.BLOCKED_SEARCH
current_trial_parameters = matrix_block(current_trial,:);
else
current_trial_parameters = get_matrix_line(current_trial, matrix_block(:,:,settings.FEATURE_SEARCH), matrix_block(:,:,settings.CONJUNCTION_SEARCH));
end
- [response_detection accuracy_detection response_time response_time_log excentricity quadrant] = Exp(current_trial_parameters(1,1),...
- current_trial_parameters(1,2),...
- current_trial_parameters(1,3),...
- ISI);
+
+ [response_detection accuracy_detection response_time response_time_log excentricity quadrant] =...
+ Exp(current_trial_parameters(1,1),...
+ current_trial_parameters(1,2),...
+ current_trial_parameters(1,3),...
+ ISI);
+
if task_type == settings.MIXED_SEARCH
if mod(current_trial,2)== 1
trial_type = settings.SWITCH_TRIAL;
Please sign in to comment.
Something went wrong with that request. Please try again.