Fix Bag for Python3 (still 1.0.3).

Author: jpivarski

histogrammar/primitives/bag.py

@@ -239,9 +239,31 @@ def children(self):
 
     @inheritdoc(Container)
     def toJsonFragment(self, suppressName):
-        aslist = sorted(x for x in self.values.items() if x[0] != "nan")
-        if "nan" in self.values:
-            aslist.append(("nan", self.values["nan"]))
+        if self.range == "N":
+            aslist = sorted(x for x in self.values.items() if x[0] != "nan")
+            if "nan" in self.values:
+                aslist.append(("nan", self.values["nan"]))
+
+        elif self.range[0] == "N":
+            class Sorter(object):
+                def __init__(self, x):
+                    self.x = x
+                def __lt__(self, other):
+                    for xi, yi in zip(self.x, other.x):
+                        if isinstance(xi, str) and isinstance(yi, float):
+                            return False
+                        elif isinstance(xi, float) and isinstance(yi, str):
+                            return True
+                        elif xi < yi:
+                            return True
+                        elif xi > yi:
+                            return False
+                    return False
+            aslist = sorted((x for x in self.values.items()), key=lambda y: tuple(Sorter(z) for z in y))
+
+        else:
+            aslist = sorted(x for x in self.values.items())
+
         return maybeAdd({
             "entries": floatToJson(self.entries),
             "values": [{"w": floatToJson(n), "v": rangeToJson(v)} for v, n in aslist],
@@ -318,8 +340,34 @@ def __eq__(self, other):
         if len(self.values) != len(other.values):
             return False
 
-        one = sorted(x for x in self.values.items() if x[0] != "nan") + [("nan", self.values.get("nan"))]
-        two = sorted(x for x in other.values.items() if x[0] != "nan") + [("nan", other.values.get("nan"))]
+        if self.range != other.range:
+            return False
+
+        if self.range == "N":
+            one = sorted(x for x in self.values.items() if x[0] != "nan") + [("nan", self.values.get("nan"))]
+            two = sorted(x for x in other.values.items() if x[0] != "nan") + [("nan", other.values.get("nan"))]
+
+        elif self.range[0] == "N":
+            class Sorter(object):
+                def __init__(self, x):
+                    self.x = x
+                def __lt__(self, other):
+                    for xi, yi in zip(self.x, other.x):
+                        if isinstance(xi, str) and isinstance(yi, float):
+                            return False
+                        elif isinstance(xi, float) and isinstance(yi, str):
+                            return True
+                        elif xi < yi:
+                            return True
+                        elif xi > yi:
+                            return False
+                    return False
+            one = sorted((x for x in self.values.items()), key=lambda y: tuple(Sorter(z) for z in y))
+            two = sorted((x for x in other.values.items()), key=lambda y: tuple(Sorter(z) for z in y))
+
+        else:
+            one = sorted(x for x in self.values.items())
+            two = sorted(x for x in other.values.items())
 
         for (v1, w1), (v2, w2) in zip(one, two):
             if isinstance(v1, basestring) and isinstance(v2, basestring):
@@ -349,7 +397,7 @@ def __eq__(self, other):
             else:
                 return False
 
-        return isinstance(other, Bag) and self.quantity == other.quantity and numeq(self.entries, other.entries) and self.range == other.range
+        return isinstance(other, Bag) and self.quantity == other.quantity and numeq(self.entries, other.entries)
 
     def __ne__(self, other): return not self == other
 

tests/testspec.py

@@ -14,6 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import codecs
 import json
 import math
 import sys
@@ -45,16 +46,17 @@ def compare(self, x, y, name):
             self.assertEqual(Factory.fromJson(x), Factory.fromJson(y))
 
     def runTest(self):
+        reader = codecs.getreader("utf-8")
         sys.stdout.write("Downloading expected results, generated by specification {0}...\n".format(histogrammar.version.specification))
         try:
-            testdata = json.load(urlopen("http://histogrammar.org/test/{0}/test-data.json".format(histogrammar.version.specification)))
+            testdata = json.load(reader(urlopen("http://histogrammar.org/test/{0}/test-data.json".format(histogrammar.version.specification))))
         except Exception as err:
             sys.stdout.write("could not download http://histogrammar.org/test/{0}/test-data.json\nbecause of {1}: {2}\n".format(histogrammar.version.specification, err.__class__.__name__, str(err)))
             return
         try:
-            testresults = json.load(urlopen("http://histogrammar.org/test/{0}/test-results.json".format(histogrammar.version.specification)))
+            testresults = json.load(reader(urlopen("http://histogrammar.org/test/{0}/test-results.json".format(histogrammar.version.specification))))
         except Exception as err:
-            sys.stdout.write("could not download http://histogrammar.org/test/{0}/test-results.jsonbecause of {1}: {2}\n\n".format(histogrammar.version.specification, err.__class__.__name__, str(err)))
+            sys.stdout.write("could not download http://histogrammar.org/test/{0}/test-results.json\nbecause of {1}: {2}\n\n".format(histogrammar.version.specification, err.__class__.__name__, str(err)))
             return
 
         for x in testdata:
@@ -71,6 +73,9 @@ def stripNames(x):
                 stripNames(xi)
 
         for testresult in testresults:
+            testresult["expr"] = testresult["expr"].replace('"round(withholes)"', 'named("round(withholes)", lambda x: round(x["withholes"]) if math.isfinite(x["withholes"]) else x["withholes"])')
+            testresult["expr"] = testresult["expr"].replace('"[round(withholes), 2*round(withholes), 3*round(withholes)]"', 'named("[round(withholes), 2*round(withholes), 3*round(withholes)]", lambda x: [round(x["withholes"]), 2*round(x["withholes"]), 3*round(x["withholes"])] if math.isfinite(x["withholes"]) else [x["withholes"], x["withholes"], x["withholes"]])')
+
             sys.stderr.write(testresult["expr"] + "\n")
 
             zero = testresult["zero-named"]