JaggedJaggedArray was reporting one too many levels deep; fixed now

Author: jpivarski

tests/test_stlvector.py

@@ -54,7 +54,7 @@ def test_vector_of_numbers(self):
 
     def test_vector_of_vector_of_numbers(self):
         branch = uproot.open("tests/samples/vectorVectorDouble.root")["t"]["x"]
-        self.assertEqual(branch.array().tolist(), [[[]], [[[], []]], [[[10.0], [], [10.0, 20.0]]], [[[20.0, -21.0, -22.0]]], [[[200.0], [-201.0], [202.0]]]])
+        self.assertEqual(branch.array().tolist(), [[], [[], []], [[10.0], [], [10.0, 20.0]], [[20.0, -21.0, -22.0]], [[200.0], [-201.0], [202.0]]])
 
     def test_strings1(self):
         tree = uproot.open("tests/samples/small-evnt-tree-fullsplit.root")["tree"]

uproot/interp/jagged.py

@@ -365,23 +365,29 @@ def __init__(self, jaggedarray, fromdtype):
 
     def interpret(self, item):
         i = 0
+        size, = item[i : i + 4].view(JaggedJaggedArray.indexdtype)
+        i += 4
         out = []
         while i < len(item):
             size, = item[i : i + 4].view(JaggedJaggedArray.indexdtype)
             i += 4
-            outi = []
-            for j in range(size):
-                size, = item[i : i + 4].view(JaggedJaggedArray.indexdtype)
-                i += 4
-                numbytes = size*self.fromdtype.itemsize
-                outi.append(item[i : i + numbytes].view(self.fromdtype).tolist())
-                i += numbytes
-            out.append(outi)
+            numbytes = size*self.fromdtype.itemsize
+            out.append(item[i : i + numbytes].view(self.fromdtype))
+            i += numbytes
         return out
 
+    def __str__(self):
+        if len(self) > 6:
+            return "[{0} ... {1}]".format(", ".join(repr([y.tolist() for y in self[i]]) for i in range(3)), ", ".join(repr([y.tolist() for y in self[i]]) for i in range(-3, 0)))
+        else:
+            return "[{0}]".format(", ".join(repr([y.tolist() for y in x]) for x in self))
+
     def __repr__(self):
         return "jaggedjaggedarray({0})".format(str(self))
 
+    def tolist(self):
+        return [[y.tolist() for y in x] for x in self]
+
 if numba is not None:
     class JaggedArrayType(numba.types.Type):
         concrete = {}