add tests for dots

Author: Remi-Gau

src/dot/initDots.m

@@ -14,9 +14,13 @@
     % thisEvent.speed
     %
     %
-
-    % TODO
-    % bound direction between 0 and 360 ??
+    % dots.direction
+    % dots.isSignal : signal dots (1) and those are noise dots (0)
+    % dots.directionAllDots
+    % dots.lifeTime : in frames
+    % dots.speeds : [ndots, 2] ; horizontal and vertical speed ; in pixels per
+    %   frame
+    % dots.speedPixPerFrame
 
     dots.direction = thisEvent.direction(1);
 

src/dot/setDotDirection.m

@@ -1,8 +1,26 @@
 function dots = setDotDirection(cfg, dots)
+    % dots = setDotDirection(cfg, dots)
+    %
+    % creates some new direction for the dots
+    %
+    % coherent dots have a true value in the vector dots.isSignal and get
+    % assigned a value equals to the one in dots.direction
+    %
+    % all the other dots get a random value between 0 and 360.
+    %
+    % all directions are in end expressed between 0 and 360
 
     directionAllDots = nan(cfg.dot.number, 1);
 
     % Coherent dots
+    
+    if numel(dots.direction) == 1
+        dots.direction = ones(sum(dots.isSignal), 1) * dots.direction;
+    elseif numel(dots.direction) ~= sum(dots.isSignal)
+        error(['dots.direction must have one element' ...
+               'or as many element as there are coherent dots'])
+    end
+    
     directionAllDots(dots.isSignal) = dots.direction;
 
     if strcmp(cfg.design.motionType, 'radial')
@@ -11,6 +29,7 @@
     end
 
     % Random direction for the non coherent dots
+    
     directionAllDots(~dots.isSignal) = rand(sum(~dots.isSignal), 1) * 360;
     directionAllDots = rem(directionAllDots, 360);
 

tests/test_initDots.m

@@ -7,9 +7,9 @@
 end
 
 function test_initDotsBasic()
-
+    
     %% set up
-
+    
     % % Dot life time in seconds
     % cfg.dot.lifeTime
     % % Number of dots
@@ -21,7 +21,7 @@ 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
@@ -30,34 +30,37 @@ function test_initDotsBasic()
     cfg.screen.winWidth = 2000; % in pixels
     cfg.timing.eventDuration = 1; % in seconds
     cfg.screen.ifi = 0.01; % in seconds
-
+    
     thisEvent.direction = 0;
     thisEvent.speed = 10;
-
-    %     [dots] = initDots(cfg, thisEvent);
-
+    
+    [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));
-
+    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;
     expectedStructure.isSignal = ones(10, 1);
     expectedStructure.speeds = repmat([1 0], 10, 1) * 10;
-
+    expectedStructure.speedPixPerFrame = 10;
+    expectedStructure.direction = zeros(10, 1);
+    expectedStructure.directionAllDots = zeros(10, 1);
+    
     % remove undeterministic output
-    %     dots = rmfield(dots, 'time');
-    %     dots = rmfield(dots, 'positions');
-
+    dots = rmfield(dots, 'time');
+    dots = rmfield(dots, 'positions');
+    
     %% test
-    %     assertEqual(expectedStructure, dots);
-
+    assertEqual(expectedStructure, dots);
+    
 end
 
 function test_initDotsStatic()
-
+    
     cfg.design.motionType = 'translation';
     cfg.dot.number = 10;
     cfg.dot.coherence = 1; % proportion
@@ -66,28 +69,31 @@ function test_initDotsStatic()
     cfg.screen.winWidth = 2000; % in pixels
     cfg.timing.eventDuration = 1; % in seconds
     cfg.screen.ifi = 0.01; % in seconds
-
+    
     thisEvent.direction = -1;
     thisEvent.speed = 10;
-
-    %     [dots] = initDots(cfg, thisEvent);
-
+    
+    [dots] = initDots(cfg, thisEvent);
+    
     % remove undeterministic output
-    %     dots = rmfield(dots, 'time');
-    %     dots = rmfield(dots, 'positions');
-
+    dots = rmfield(dots, 'time');
+    dots = rmfield(dots, 'positions');
+    
     %% data to test against
     expectedStructure.lifeTime = Inf;
     expectedStructure.isSignal = ones(10, 1);
     expectedStructure.speeds = zeros(10, 2);
-
+    expectedStructure.speedPixPerFrame = 0;
+    expectedStructure.direction = -1 * ones(10, 1);
+    expectedStructure.directionAllDots = -1 * ones(10, 1);
+    
     %% test
-    %     assertEqual(expectedStructure, dots);
-
+    assertEqual(expectedStructure, dots);
+    
 end
 
 function test_initDotsRadial()
-
+    
     cfg.design.motionType = 'radial';
     cfg.dot.number = 10;
     cfg.dot.coherence = 1; % proportion
@@ -96,20 +102,20 @@ function test_initDotsRadial()
     cfg.screen.winWidth = 2000; % in pixels
     cfg.timing.eventDuration = 1; % in seconds
     cfg.screen.ifi = 0.01; % in seconds
-
+    
     thisEvent.direction = 666; % outward motion
     thisEvent.speed = 10;
-
-    %     [dots] = initDots(cfg, thisEvent);
-
+    
+    [dots] = initDots(cfg, thisEvent);
+    
     %% 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;
-
+    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);
-
+%     assertEqual(speeds, dots.speeds);
+    
 end

tests/test_reseedDots.m

@@ -7,47 +7,47 @@
 end
 
 function test_reseedDotsBasic()
-
+    
     cfg.screen.winWidth = 2000;
-
+    
     cfg.design.motionType = 'radial';
-
+    
     cfg.dot.matrixWidth = 50; % in pixels
     cfg.dot.number = 5;
     cfg.dot.sizePix = 20;
     cfg.dot.proportionKilledPerFrame = 0;
-
+    
     cfg.fixation.widthPix = 20;
-
+    
     dots.lifeTime = 100;
     dots.speedPixPerFrame = 3;
     dots.direction = 90;
     dots.isSignal = true(5, 1);
-
+    
     dots.positions = [ ...
         49, 1; % OK
         490, 2043; % out of frame
         -104, 392; % out of frame
         492, 402; % OK
         1000, 1000; % on the fixation cross
         ];
-
+    
     dots.time = [ ...
         6; ... OK
         4; ... OK
         56; ... OK
         300; ... % exceeded its life time
         50]; % OK
-
-    %     dots = reseedDots(dots, cfg);
-
+    
+    dots = reseedDots(dots, cfg);
+    
     reseeded = [ ...
         6;
         1;
         1;
         1;
         1];
-
-    %     assertEqual(reseeded, dots.time);
-
+    
+    assertEqual(reseeded, dots.time);
+    
 end

tests/test_setDotDirection.m

@@ -0,0 +1,26 @@
+function test_suite = test_setDotDirection %#ok<*STOUT>
+    try % assignment of 'localfunctions' is necessary in Matlab >= 2016
+        test_functions = localfunctions(); %#ok<*NASGU>
+    catch % no problem; early Matlab versions can use initTestSuite fine
+    end
+    initTestSuite;
+end
+
+function test_setDotDirectionBasic()
+    % create 5 coherent dots with direction == 362 (that should give 2 in the
+    % end)
+    % also creates 955 additonal dots with random direction between 0 and 360
+    
+    cfg.dot.number = 1000;
+    cfg.design.motionType = 'translation';
+    dots.direction = 362;
+    
+    dots.isSignal = [true(5,1) ; false(1000 - 5,1)];
+        
+    dots = setDotDirection(cfg, dots);
+    
+    assertTrue(all(dots.directionAllDots(1:5) == 2 * ones(5,1)));
+    assertTrue(all(dots.directionAllDots >= 0 ));
+    assertTrue(all(dots.directionAllDots <= 360 ));
+     
+end