RF: anticipated files of different shapes, fixed table display, corrected tests

Author: chrispycheng

nibabel/cmdline/diff.py

@@ -165,42 +165,45 @@ def get_data_diff(files, max_abs=0, max_rel=0):
 
         for j, d2 in enumerate(data[i + 1:], i + 1):
 
-            abs_diff = np.abs(d1 - d2)
-            mean_abs = (np.abs(d1) + np.abs(d2)) * 0.5
-            candidates = np.logical_or(mean_abs != 0, abs_diff != 0)
-
-            if max_abs:
-                candidates[abs_diff <= max_abs] = False
-
-            max_abs_diff = np.max(abs_diff)
-            if np.any(candidates):
-                rel_diff = abs_diff[candidates] / mean_abs[candidates]
-                if max_rel:
-                    sub_thr = rel_diff <= max_rel
-                    # Since we operated on sub-selected values already, we need
-                    # to plug them back in
-                    candidates[
-                        tuple((indexes[sub_thr] for indexes in np.where(candidates)))
-                    ] = False
-                max_rel_diff = np.max(rel_diff)
-            else:
-                max_rel_diff = 0
-
-            if np.any(candidates):
+            if d1.shape == d2.shape:
+                abs_diff = np.abs(d1 - d2)
+                mean_abs = (np.abs(d1) + np.abs(d2)) * 0.5
+                candidates = np.logical_or(mean_abs != 0, abs_diff != 0)
+
+                if max_abs:
+                    candidates[abs_diff <= max_abs] = False
+
+                max_abs_diff = np.max(abs_diff)
+                if np.any(candidates):
+                    rel_diff = abs_diff[candidates] / mean_abs[candidates]
+                    if max_rel:
+                        sub_thr = rel_diff <= max_rel
+                        # Since we operated on sub-selected values already, we need
+                        # to plug them back in
+                        candidates[
+                            tuple((indexes[sub_thr] for indexes in np.where(candidates)))
+                        ] = False
+                    max_rel_diff = np.max(rel_diff)
+                else:
+                    max_rel_diff = 0
+
+                if np.any(candidates):
+
+                    diff_rec = OrderedDict()  # so that abs goes before relative
+
+                    diff_rec['abs'] = max_abs_diff
+                    diff_rec['rel'] = max_rel_diff
+                    diffs1.append(diff_rec)
+                else:
+                    diffs1.append(None)
 
-                diff_rec = OrderedDict()  # so that abs goes before relative
-
-                diff_rec['abs'] = max_abs_diff
-                diff_rec['rel'] = max_rel_diff
-                diffs1.append(diff_rec)
             else:
-                diffs1.append(None)
+                diffs1.append({'CMP': "incompat"})
 
         if any(diffs1):
 
             diffs['DATA(diff %d:)' % (i + 1)] = diffs1
 
-
     return diffs
 
 
@@ -219,13 +222,14 @@ def display_diff(files, diff):
     """
     output = ""
     field_width = "{:<15}"
+    filename_width = "{:<53}"
     value_width = "{:<55}"
 
     output += "These files are different.\n"
     output += field_width.format('Field/File')
 
     for i, f in enumerate(files, 1):
-        output += "%d:%s" % (i, value_width.format(os.path.basename(f)))
+        output += "%d:%s" % (i, filename_width.format(os.path.basename(f)))
 
     output += "\n"
 

nibabel/cmdline/tests/test_utils.py

@@ -96,9 +96,9 @@ def test_display_diff():
         ("bitpix", [np.array(8).astype(dtype="uint8"), np.array(16).astype(dtype="uint8")])
     ])
 
-    expected_output = "These files are different.\n" + "Field/File          hellokitty.nii.gz" \
-                                                       "                                 " \
-                                                       "privettovarish.nii.gz                                  \n" \
+    expected_output = "These files are different.\n" + "Field/File     1:hellokitty.nii.gz" \
+                                                       "                                    " \
+                                                       "2:privettovarish.nii.gz                                \n" \
                                                        "datatype       " \
                                                        "2                                                      " \
                                                        "4                                                      \n" \

nibabel/tests/test_scripts.py

@@ -75,8 +75,11 @@ def check_nib_diff_examples():
     checked_fields = ["Field/File", "regular", "dim_info", "dim", "datatype", "bitpix", "pixdim", "slice_end",
                       "xyzt_units", "cal_max", "descrip", "qform_code", "sform_code", "quatern_b",
                       "quatern_c", "quatern_d", "qoffset_x", "qoffset_y", "qoffset_z", "srow_x",
-                      "srow_y", "srow_z", "DATA(md5)"]
+                      "srow_y", "srow_z", "DATA(md5)", "DATA(diff 1:)"]
     for item in checked_fields:
+        if item not in stdout:
+            print(item)
+            print(stdout)
         assert_true(item in stdout)
 
     fnames2 = [pjoin(DATA_PATH, f)