fixed order

Author: chrisgorgo

nipype/algorithms/icc.py

@@ -38,16 +38,16 @@ def _run_interface(self, runtime):
         maskdata = np.logical_not(np.logical_or(maskdata == 0, np.isnan(maskdata)))
 
         session_datas = [[nb.load(fname).get_data()[maskdata].reshape(-1, 1) for fname in sessions] for sessions in self.inputs.subjects_sessions]
-        list_of_sessions = [np.hstack(session_data) for session_data in session_datas]
-        all_data = np.dstack(list_of_sessions)
+        list_of_sessions = [np.dstack(session_data) for session_data in session_datas]
+        all_data = np.hstack(list_of_sessions)
         icc = np.zeros(session_datas[0][0].shape)
         session_F = np.zeros(session_datas[0][0].shape)
         session_var = np.zeros(session_datas[0][0].shape)
         subject_var = np.zeros(session_datas[0][0].shape)
 
         for x in range(icc.shape[0]):
             Y = all_data[x, :, :]
-            icc[x], session_var[x], subject_var[x], session_F[x], self._df1, self._df2 = ICC_rep_anova(Y)
+            icc[x], subject_var[x], session_var[x],  session_F[x], self._df1, self._df2 = ICC_rep_anova(Y)
 
         nim = nb.load(self.inputs.subjects_sessions[0][0])
         new_data = np.zeros(nim.get_shape())
@@ -79,7 +79,7 @@ def _list_outputs(self):
         outputs['sessions_df_1'] = self._df1
         outputs['sessions_df_2'] = self._df2
         outputs['session_var_map'] = os.path.abspath('session_var_map.nii')
-        outputs['session_var_map'] = os.path.abspath('session_var_map.nii')
+        outputs['subject_var_map'] = os.path.abspath('subject_var_map.nii')
         return outputs
 
 

nipype/algorithms/tests/test_icc.py

@@ -13,8 +13,9 @@ def test_ICC_rep_anova():
                   [10, 5, 6, 9],
                   [6, 2, 4, 7]])
 
-    icc, _, _ , _, dfc, dfe = ICC_rep_anova(Y)
+    icc, r_var, e_var , _, dfc, dfe = ICC_rep_anova(Y)
     #see table 4
     yield assert_equal, round(icc, 2), 0.71
     yield assert_equal, dfc, 3
     yield assert_equal, dfe, 15
+    yield assert_equal, r_var/(r_var + e_var), icc