mh autofix

Author: Remi-Gau

src/dot/computeRadialMotionDirection.m

@@ -1,16 +1,16 @@
 function direction = computeRadialMotionDirection(cfg, positions, direction)
     if strcmp(cfg.design.motionType, 'radial')
-        
+
         cartesianCoordinates = positions - cfg.screen.winWidth /  2;
-        
-        [angle, ~] = cart2pol(cartesianCoordinates(:,1), cartesianCoordinates(:,2));
+
+        [angle, ~] = cart2pol(cartesianCoordinates(:, 1), cartesianCoordinates(:, 2));
         angle = angle / pi * 180;
-        
+
         if direction == -666
             angle = angle - 180;
         end
-        
+
         direction = angle;
-        
+
     end
-end
+end

src/dot/initDots.m

@@ -14,12 +14,12 @@
     % thisEvent.speed
     %
     %
-    
+
     % TODO
     % bound direction between 0 and 360 ??
-    
+
     direction = thisEvent.direction(1);
-    
+
     speedPixPerFrame = thisEvent.speed(1);
 
     lifeTime = cfg.dot.lifeTime;
@@ -33,30 +33,30 @@
         lifeTime = Inf;
         isSignal = true(cfg.dot.number, 1);
     end
-    
+
     %% Set an array of dot positions [xposition, yposition]
     % These can never be bigger than 1 or lower than 0
     % [0,0] is the top / left of the square
     % [1,1] is the bottom / right of the square
     positions = rand(cfg.dot.number, 2) * cfg.screen.winWidth;
 
-    %% Set vertical and horizontal speed for all dots 
+    %% Set vertical and horizontal speed for all dots
     directionAllDots = setDotDirection(cfg, positions, direction, isSignal);
-    
+
     [horVector, vertVector] = decomposeMotion(directionAllDots);
     speeds = [horVector, vertVector];
-    
+
     % we were working with unit vectors. we now switch to pixels
     speeds = speeds * speedPixPerFrame;
 
     %% Create a vector to update to dotlife time of each dot
     % Not all set to 1 so the dots will die at different times
     % The maximum value is the duraion of the event in frames
     time = floor(rand(cfg.dot.number, 1) * cfg.eventDuration / cfg.screen.ifi);
-    
+
     %% Convert from seconds to frames
     lifeTime = ceil(lifeTime / cfg.screen.ifi);
-    
+
     %%
     dots.lifeTime = lifeTime;
     dots.time = time;
@@ -66,17 +66,15 @@
 end
 
 function directionAllDots = setDotDirection(cfg, positions, direction, isSignal)
-    
+
     directionAllDots = nan(cfg.dot.number, 1);
-    
+
     direction = computeRadialMotionDirection(cfg, positions, direction);
-    
+
     % Coherent dots
     directionAllDots(isSignal) = direction;
     % Random direction for the non coherent dots
     directionAllDots(~isSignal) = rand(sum(~isSignal), 1) * 360;
-    directionAllDots = rem(directionAllDots,360);
-    
-end
-
+    directionAllDots = rem(directionAllDots, 360);
 
+end

src/dot/reseedDots.m

@@ -1,5 +1,5 @@
 function dots = reseedDots(dots, cfg)
-    
+
     % Create a logical vector to detect any dot that has:
     % - an xy position inferior to 0
     % - an xy position superior to winWidth
@@ -17,5 +17,5 @@
         dots.positions(N, :) = rand(sum(N), 2) * cfg.screen.winWidth;
         dots.time(N, 1) = 1;
     end
-    
-end
+
+end

tests/test_computeRadialMotionDirection.m

@@ -13,27 +13,26 @@ function test_computeRadialMotionDirectionBasic()
     cfg.design.motionType = 'radial';
     cfg.screen.winWidth = 100; % in pixels
     direction = 666;
-    
+
     positions = [
-        100, 100/2; ... % middle of right side
+        100, 100 / 2; ... % middle of right side
         100, 100; ... % top right corner
-        100/2, 100; ...
-        0, 100/2; ...
+        100 / 2, 100; ...
+        0, 100 / 2; ...
         0, 0; ...
-        100/2, 0];
-    
+        100 / 2, 0];
+
     direction = computeRadialMotionDirection(cfg, positions, direction);
-    
+
     expectedDirection = [
         0; ... right
         45; ... up-right
         90; ... up
         180; ... left
         -135; ... down left
         -90]; % down
-    
-  
+
     %% test
     assertEqual(expectedDirection, direction);
 
-end
+end

tests/test_initDots.m

@@ -9,7 +9,7 @@
 function test_initDotsBasic()
 
     %% set up
-    
+
     % % Dot life time in seconds
     % cfg.dot.lifeTime
     % % Number of dots
@@ -21,32 +21,32 @@ function test_initDotsBasic()
     % thisEvent.direction
     % % Speed expressed in pixels per frame
     % thisEvent.speed
-    
+
     cfg.design.motionType = 'translation';
     cfg.dot.number = 10;
     cfg.dot.coherence = 1; % proportion
     cfg.dot.lifeTime = 0.250; % in seconds
     cfg.screen.winWidth = 2000; % in pixels
     cfg.eventDuration = 1; % in seconds
     cfg.screen.ifi = 0.01; % in seconds
-    
+
     thisEvent.direction = 0;
     thisEvent.speed = 10;
 
     [dots] = initDots(cfg, thisEvent);
-    
+
     %% Undeterministic ouput
     assertTrue(all(dots.positions(:) >= 0));
     assertTrue(all(dots.positions(:) <= 2000));
     assertTrue(all(dots.time(:) >= 0));
     assertTrue(all(dots.time(:) <= 1 / 0.01));
 
-    %% Deterministic output : data to test against 
-    expectedStructure.lifeTime = 25; 
+    %% Deterministic output : data to test against
+    expectedStructure.lifeTime = 25;
     expectedStructure.isSignal = ones(10, 1);
     expectedStructure.speeds = repmat([1 0], 10, 1) * 10;
-    
-    % remove undeterministic output 
+
+    % remove undeterministic output
     dots = rmfield(dots, 'time');
     dots = rmfield(dots, 'positions');
 
@@ -64,27 +64,26 @@ function test_initDotsStatic()
     cfg.screen.winWidth = 2000; % in pixels
     cfg.eventDuration = 1; % in seconds
     cfg.screen.ifi = 0.01; % in seconds
-    
+
     thisEvent.direction = -1;
     thisEvent.speed = 10;
 
     [dots] = initDots(cfg, thisEvent);
-    
+
     % remove undeterministic output
     dots = rmfield(dots, 'time');
     dots = rmfield(dots, 'positions');
 
-    %% data to test against 
-    expectedStructure.lifeTime = Inf; 
+    %% data to test against
+    expectedStructure.lifeTime = Inf;
     expectedStructure.isSignal = ones(10, 1);
     expectedStructure.speeds = zeros(10, 2);
-    
+
     %% test
     assertEqual(expectedStructure, dots);
 
 end
 
-
 function test_initDotsRadial()
 
     cfg.design.motionType = 'radial';
@@ -94,20 +93,20 @@ function test_initDotsRadial()
     cfg.screen.winWidth = 2000; % in pixels
     cfg.eventDuration = 1; % in seconds
     cfg.screen.ifi = 0.01; % in seconds
-    
+
     thisEvent.direction = 666; % outward motion
     thisEvent.speed = 10;
 
     [dots] = initDots(cfg, thisEvent);
-    
-    %% data to test against 
-    XY = dots.positions - 2000/2; 
-    angle = cart2pol(XY(:,1), XY(:,2));
+
+    %% data to test against
+    XY = dots.positions - 2000 / 2;
+    angle = cart2pol(XY(:, 1), XY(:, 2));
     angle = angle / pi * 180;
     [horVector, vertVector] = decomposeMotion(angle);
     speeds = [horVector, vertVector] * 10;
 
     %% test
     assertEqual(speeds, dots.speeds);
 
-end
+end

tests/test_setDefaultsPTB.m

@@ -7,39 +7,39 @@
 end
 
 function test_setDefaultsPtbBasic()
-    
+
     % set up
     cfg = setDefaultsPTB;
-    
+
     % test data
     expectedCfg = returnExpectedCFG();
 
     % test
     assertEqual(expectedCfg, cfg);
-    
+
 end
 
 function test_setDefaultsPtbOverwrite()
 
     % set up
     cfg.screen.monitorWidth = 36;
     cfg = setDefaultsPTB(cfg);
-    
+
     % test data
     expectedCfg = returnExpectedCFG();
     expectedCfg.screen.monitorWidth = 36;
 
     % test
     assertEqual(expectedCfg, cfg);
-    
+
 end
 
 function test_setDefaultsPtbAudio()
 
     % set up
     cfg.audio.do = 1;
     cfg = setDefaultsPTB(cfg);
-    
+
     % test data
     expectedCfg = returnExpectedCFG();
     expectedCfg.audio = struct( ...
@@ -54,11 +54,11 @@ function test_setDefaultsPtbAudio()
 
     % test
     assertEqual(expectedCfg, cfg);
-    
+
 end
 
 function expectedCFG = returnExpectedCFG()
-    
+
     expectedCFG =  struct( ...
         'testingDevice', 'pc', ...
         'debug',  struct('do', true, 'transpWin',  true, 'smallWin',  true), ...
@@ -68,21 +68,21 @@ function test_setDefaultsPtbAudio()
         'screen', struct( ...
         'monitorWidth', 42, ...
         'monitorDistance', 134));
-    
+
     % fixation cross or dot
     expectedCFG.fixation.type = 'cross';
     expectedCFG.fixation.xDisplacement = 0;
     expectedCFG.fixation.yDisplacement = 0;
     expectedCFG.fixation.color = [255 255 255];
     expectedCFG.fixation.width = 1;
     expectedCFG.fixation.lineWidthPix = 5;
-    
+
     % define visual apperture field
     expectedCFG.aperture.type = 'none';
-    
+
     expectedCFG.keyboard.keyboard = [];
     expectedCFG.keyboard.responseBox = [];
     expectedCFG.keyboard.responseKey = {};
     expectedCFG.keyboard.escapeKey = 'ESCAPE';
-    
+
 end