Changeset 1194 for trunk/applications/nxdiff

Timestamp:

04/02/09 20:37:07 (3 years ago)

Author:

Peter Peterson

Message:

Fixed code so it works again. Refs #158.

File:

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

trunk/applications/nxdiff

@@ -134 +134 @@
         else:
             diffs = getPercentDiff(left.data, right.data)
-            if numpy.nanmax(diffs) <= 0.:
-                return
+            try:
+                if numpy.nanmax(diffs) <= 0.:
+                    return
+            except IndexError:
+                if diffs <= 0.:
+                    return
+                diffs = [diffs]
             stats = getStats(diffs)
             self.details.append("MISMATCH [min%s,max%s,med%s,avg%s,dev%s]" \
@@ -272 +277 @@
         return array
     return numpy.delete(array, indices.tolist())
+    try:
+        len(myarray)
+        return myarray
+    except TypeError:
+        return [myarray]
 
 def getStats(array):
     myarray = numpy.copy(array)
-    myarray.ravel()
+    myarray = myarray.ravel()
     origLength = myarray.size
     myarray = removeNaN(myarray)
@@ -283 +293 @@
     minimum = numpy.nanmin(myarray)
     maximum = numpy.nanmax(myarray)
+    median = myarray[(length/2)-1]
     stddev = myarray.std()
     result = map(lambda x: "%.2f%%" % x,
-               (minimum, maximum, myarray[(length/2)-1], avg, stddev))
+                 (minimum, maximum, median, avg, stddev))
     result.append(origLength) # add the number of elements
     result.append(origLength - length) # number of NaNs found