Changeset 682 for mds-and-trees

Timestamp:

09/02/17 14:12:51 (7 years ago)

Author:

konrad

Message:

Broken last lines in input logs will not crash the script anymore (the last, faulty entry will be ignored)

File:

• mds-and-trees/tree-genealogy.py (modified) (4 diffs)

mds-and-trees/tree-genealogy.py

@@ -390 +390 @@
         x1_dist = 0
         x2_dist = 0
-        miny = y-20
-        maxy = y+20
+        miny = y-2000
+        maxy = y+2000
         i_left = bisect.bisect_left(self.y_sorted, miny)
         i_right = bisect.bisect_right(self.y_sorted, maxy)
@@ -524 +524 @@
         visited[0] = 1
         self.props["depth"][0] = 0
-
         while True:
             current_node = nodes_to_visit[0]
+
             for child in self.tree.children[current_node]:
                 if visited[child] == 0:
@@ -657 +657 @@
                     line_arr = line_arr[1].split(' ', 1)
                 if line_arr[0] == "[OFFSPRING]":
-                    creature = json.loads(line_arr[1])
+                    try:
+                        creature = json.loads(line_arr[1])
+                    except ValueError:
+                        print("Json format error - the line cannot be read. Breaking the loading loop.")
+                        # fixing arrays by removing the last element
+                        # ! assuming that only the last line is broken !
+                        self.parents.pop()
+                        self.children.pop()
+                        self.time.pop()
+                        self.kind.pop()
+                        self.life_lenght.pop()
+                        nodes -= 1
+                        break
+
                     if "FromIDs" in creature:
 
@@ -769 +782 @@
     tree.load(dir, max_nodes=args.max_nodes)
 
+
     designer = Designer(tree, jitter=JITTER, time=TIME, balance=BALANCE)
     designer.calculate_measures()