Changeset 1584

Timestamp:

21/03/11 20:13:09 (14 months ago)

Author:

Peter Peterson

Message:

For scalars just compare them directly. Fixes #265.

File:

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

trunk/applications/nxdiff

@@ -1 +1 @@
 #!/usr/bin/env python
-VERSION = "1.4.1"
+VERSION = "1.4.2"
 
 import nxs
@@ -133 +133 @@
             return
         else:
+            if left.data.size == 1 and right.data.size == 1:
+                self.details.append("DATA MISMATCH %s != %s" \
+                                    % (str(left.data), str(right.data)))
+                return
             diffs = getPercentDiff(left.data, right.data)
             if numpy.nanmax(diffs) <= 0.:
@@ -279 +283 @@
     myarray.sort()
     length = myarray.size
-    avg = numpy.average(myarray)
-    minimum = numpy.nanmin(myarray)
-    maximum = numpy.nanmax(myarray)
-    median = myarray[(length/2)-1]
-    stddev = myarray.std()
+    if length ==0 and length < origLength:
+        avg = NAN
+        minimum = NAN
+        maximum  = NAN
+        median = NAN
+        stddev = NAN
+    else:
+        avg = numpy.average(myarray)
+        minimum = numpy.nanmin(myarray)
+        maximum = numpy.nanmax(myarray)
+        median = myarray[(length/2)-1]
+        stddev = myarray.std()
     result = map(lambda x: "%.2f%%" % x,
                  (minimum, maximum, median, avg, stddev))