Changeset 1198

Timestamp:

05/02/09 17:05:28 (3 years ago)

Author:

Peter Peterson

Message:

Minor modification in comparison to make the code clearer to read. Refs #158.

File:

• trunk/applications/nxdiff (modified) (3 diffs)

trunk/applications/nxdiff

@@ -37 +37 @@
 
 def getPercentDiff(left, right, nandiff=float("nan")):
-    return 100. * numpy.fabs((left-right)/left)
+    diffs = 100. * numpy.fabs((left-right)/left)
+    try:
+        diffs[0]
+        return diffs
+    except IndexError:
+        return [diffs]
 
 class Diff:
@@ -120 +125 @@
         else:
             diffs = getPercentDiff(left.data, right.data)
-            try:
-                if numpy.nanmax(diffs) <= 0.:
-                    return
-            except IndexError:
-                if diffs <= 0.:
-                    return
-                diffs = [diffs]
+            if numpy.nanmax(diffs) <= 0.:
+                return
             stats = getStats(diffs)
             self.details.append("MISMATCH [min%s,max%s,med%s,avg%s,dev%s]" \
@@ -263 +263 @@
         return [myarray]
 
-def getStats(array):
+def getStats(array, **kwargs):
     myarray = numpy.copy(array)
     myarray = myarray.ravel()