瀏覽代碼

Updated documentation

Ioannis Agtzidis 4 年之前
父節點
當前提交
7fc469689f
共有 4 個文件被更改,包括 10 次插入10 次删除
  1. 2 2
      DetectSaccades360File.m
  2. 5 5
      DetectSaccades360FileRegex.m
  3. 2 2
      DetectSaccades360IVTFile.m
  4. 1 1
      larsson_360/DetectLarsson360File.m

+ 2 - 2
DetectSaccades360File.m

@@ -6,8 +6,8 @@
 %
 % input:
 %   inputfile   - ARFF file containing gaze coordinates
-%   outputfile  - ARFF file to store detected fixations
-%   outputAtt   - attribute that holds detected fixations in the output ARFF file
+%   outputfile  - ARFF file to store detected saccades
+%   outputAtt   - attribute that holds detected saccades in the output ARFF file
 %   typeOfMotion- 1 -> eye FOV, 2 -> eye+head
 %   paramfile   - (optional) txt file containing parameters for saccade detection (explanation below)
 %

+ 5 - 5
DetectSaccades360FileRegex.m

@@ -1,19 +1,19 @@
 % DetectSaccades360FileRegex.m
 %
-% This function calls the CombineViews functino for all the files in the regular
-% expression
+% This function calls the saccades detector of the Dorr et al. 2010 for the provided
+% files in the regular expression
 %
 % input:
 %   regex       - regular expression to ARFF files
 %   outDir      - output directory
+%   outputAtt   - attribute that holds detected fixations in the output ARFF file
 %   typeOfMotion - 1 -> eye FOV, 2 -> eye+head
 %   paramfile   - file containing saccade detection parameters
 %
-% ex. DetectSaccades360Regex('/mnt/syno8/data/VideoGaze360/gaze/labelled_ioannis/*.arff', '/mnt/scratch/VideoGaze360_buffer/labelled_files_algorithm/', 1, 'params_saccades_fov.txt')
+% ex. DetectSaccades360FileRegex('/mnt/syno8/data/VideoGaze360/gaze/labelled_ioannis/*.arff', '/mnt/scratch/VideoGaze360_buffer/labelled_files_algorithm/', 'saccades', 1, 'params_saccades_fov.txt')
                                                                                 
 
 function DetectSaccades360FileRegex(regex, outDir, outputAtt, typeOfMotion, paramfile)
-    c_outAtt = 'saccades';
     filelist = glob(regex);
 
     for i=1:size(filelist,1)
@@ -23,6 +23,6 @@ function DetectSaccades360FileRegex(regex, outDir, outputAtt, typeOfMotion, para
 
         outFile = fullfile(outDir, [name ext]);
 
-        DetectSaccades360File(filename, outFile, c_outAtt, typeOfMotion, paramfile);
+        DetectSaccades360File(filename, outFile, outputAtt, typeOfMotion, paramfile);
     end
 end

+ 2 - 2
DetectSaccades360IVTFile.m

@@ -6,8 +6,8 @@
 %
 % input:
 %   arffFile     - file to label
-%   outputfile   - ARFF file to store detected fixations
-%   outputAtt    - attribute that holds detected fixations in the output ARFF file
+%   outputfile   - ARFF file to store detected saccades
+%   outputAtt    - attribute that holds detected saccades in the output ARFF file
 %   typeOfMotion - 1 -> eye FOV, 2 -> eye+head
 %   velThreshold - velocity threshold for I-Vt
 

+ 1 - 1
larsson_360/DetectLarsson360File.m

@@ -39,7 +39,7 @@ function DetectLarsson360File(inputfile, outputfile, outputAtt, typeOfMotion, pa
     c_sacc = 2;
     c_sp = 3;
     c_noise = 4;
-	attType = '{unassigned,fixation,saccade,sp,noise}';
+	attType = '{unassigned,fixation,saccade,SP,noise}';
 
     [data, metadata, attributes, relation, comments] = LoadArff(inputfile);