Merge branch '665-eg-FMRI' into 683-eg-CON_Workflow

Author: egolol

braph2/workflows/Functional/SubjectFNC.m

@@ -461,18 +461,10 @@ function save_to_txt(cohort, varargin)
                     % get subject data
                     subject = subjects_list{j};
                     id = subject.getID();
-                    label = subject.getLabel();
-                    notes = subject.getNotes();
                     data = subject.getData('FNC').getValue();
 
                     % create table
-                    extra_info = cell(2, size(data, 2));
-                    extra_info{1, 1} = label;
-                    extra_info{2, 1} = notes;
-                    tab = [
-                        extra_info;
-                        num2cell(data)
-                        ];
+                    tab = num2cell(data);
 
                     % save
                     file = [root_directory filesep() cohort.getGroups().getValue(i).getID() filesep() id '.txt'];

braph2/workflows/Functional/test_AnalysisFNC_BUD.m

@@ -133,7 +133,7 @@
     measure = measures{i};
     analysis = AnalysisFNC_BUD('id', 'label', 'notes', cohort, {}, {}, {}, 'density', 2);
     number_of_randomizations = 10;
-    calculate_comparison = analysis.getRandomComparison(measure, group1, 'RandomComparisonFNC.RandomizationNumber', number_of_randomizations);
+    calculate_comparison = analysis.getRandomComparison(measure, group1, 'RandomizationNumber', number_of_randomizations);
 
     assert(~isempty(calculate_comparison), ...
         [BRAPH2.STR ':AnalysisFNC_BUD:calculateComparison'], ...
@@ -297,7 +297,7 @@
     measure = measures{i};
     analysis = AnalysisFNC_BUD('id', 'label', 'notes', cohort, {}, {}, {}, 'density', 2);
     number_of_permutations = 10;
-    calculate_comparison = analysis.getComparison(measure, group1, group2, 'ComparisonFNC.PermutationNumber', number_of_permutations);
+    calculate_comparison = analysis.getComparison(measure, group1, group2, 'PermutationNumber', number_of_permutations);
 
     assert(~isempty(calculate_comparison), ...
         [BRAPH2.STR ':AnalysisFNC_BUD:calculateComparison'], ...

braph2/workflows/Functional/test_AnalysisFNC_BUT.m

@@ -133,7 +133,7 @@
     measure = measures{i};
     analysis = AnalysisFNC_BUT('id', 'label', 'notes', cohort, {}, {}, {}, 'threshold', 0.7);
     number_of_randomizations = 10;
-    calculate_comparison = analysis.getRandomComparison(measure, group1, 'RandomComparisonFNC.RandomizationNumber', number_of_randomizations);
+    calculate_comparison = analysis.getRandomComparison(measure, group1, 'RandomizationNumber', number_of_randomizations);
 
     assert(~isempty(calculate_comparison), ...
         [BRAPH2.STR ':AnalysisFNC_BUT:calculateComparison'], ...
@@ -297,7 +297,7 @@
     measure = measures{i};
     analysis = AnalysisFNC_BUT('id', 'label', 'notes', cohort, {}, {}, {}, 'threshold', 0.7);
     number_of_permutations = 10;
-    calculate_comparison = analysis.getComparison(measure, group1, group2, 'ComparisonFNC.PermutationNumber', number_of_permutations);
+    calculate_comparison = analysis.getComparison(measure, group1, group2, 'PermutationNumber', number_of_permutations);
 
     assert(~isempty(calculate_comparison), ...
         [BRAPH2.STR ':AnalysisFNC_BUT:calculateComparison'], ...

braph2/workflows/Functional/test_AnalysisFNC_WU.m

@@ -130,7 +130,7 @@
     measure = measures{i};
     analysis = AnalysisFNC_WU('id', 'label', 'notes', cohort, {}, {}, {});
     number_of_randomizations = 10;
-    calculate_comparison = analysis.getRandomComparison(measure, group1, 'RandomComparisonFNC.RandomizationNumber', number_of_randomizations);
+    calculate_comparison = analysis.getRandomComparison(measure, group1, 'RandomizationNumber', number_of_randomizations);
 
     assert(~isempty(calculate_comparison), ...
         [BRAPH2.STR ':AnalysisFNC_WU:calculateComparison'], ...
@@ -294,7 +294,7 @@
     measure = measures{i};
     analysis = AnalysisFNC_WU('id', 'label', 'notes', cohort, {}, {}, {});
     number_of_permutations = 10;
-    calculate_comparison = analysis.getComparison(measure, group1, group2, 'ComparisonFNC.PermutationNumber', number_of_permutations);
+    calculate_comparison = analysis.getComparison(measure, group1, group2, 'PermutationNumber', number_of_permutations);
 
     assert(~isempty(calculate_comparison), ...
         [BRAPH2.STR ':AnalysisFNC_WU:calculateComparison'], ...