Changeset 622 for mds-and-trees

Timestamp:

10/11/16 16:48:23 (8 years ago)

Author:

konrad

Message:

Added an option to restrict the tree to first X nodes.

File:

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

mds-and-trees/tree-genealogy.py

@@ -101 +101 @@
     global firstnode, nodes, inv_nodes, time
     f = open(dir)
+    loaded = 0
+
     for line in f:
         sline = line.split(' ', 1)
@@ -127 +129 @@
                     kind[creature["ID"]] = creature["Kind"]
 
+                loaded += 1
+        if loaded == max_nodes and max_nodes != 0:
+            break
+
     for k, v in sorted(nodes.items()):
         for val in sorted(v):
@@ -138 +144 @@
     global firstnode, nodes, inv_nodes
     f = open(dir)
+    loaded = 0
+
     for line in f:
         sline = line.split()
@@ -148 +156 @@
         else:
             firstnode = sline[0]
+
+        loaded += 1
+        if loaded == max_nodes and max_nodes != 0:
+            break
 
     for k, v in sorted(nodes.items()):
@@ -181 +193 @@
         x1_dist = 0
         x2_dist = 0
+        ymin = y-10
+        ymax = y+10
         for pos in positions:
             pos = positions[pos]
-            if pos[1] > y-10 or pos[1] < y+10:
-                dy = pos[1]-y
+            if pos[1] > ymin or pos[1] < ymax:
+                dysq = (pos[1]-y)**2
                 dx1 = pos[0]-x1
                 dx2 = pos[0]-x2
 
-                x1_dist += math.sqrt(dy**2 + dx1**2)
-                x2_dist += math.sqrt(dy**2 + dx2**2)
+
+                x1_dist += math.sqrt(dysq + dx1**2)
+                x2_dist += math.sqrt(dysq + dx2**2)
         return (x1 if x1_dist > x2_dist else x2)
 
 # ------------------------------------
-
-# def prepos_children_reccurent(node):
-#     global visited
-#     for c in inv_nodes[node]:
-#
-#         # we want to visit the node just once, after all of its parents
-#         if not all_parents_visited(c):
-#             continue
-#         else:
-#             visited[c] = True
-#
-#         cy = 0
-#         if TIME == "BIRTHS":
-#             if c[0] == "c":
-#                 cy = int(c[1:])
-#             else:
-#                 cy = int(c)
-#         elif TIME == "GENERATIONAL":
-#             cy = positions[node][1]+1
-#         elif TIME == "REAL":
-#             cy = time[c]
-#
-#         if len(nodes[c]) == 1:
-#             dissimilarity = 0
-#             if JITTER == True:
-#                 dissimilarity = random.gauss(0,1)
-#             else:
-#                 dissimilarity = 1
-#             positions[c] = [xmin_crowd(positions[node][0]-dissimilarity, positions[node][0]+dissimilarity, cy), cy]
-#         else:
-#             vsum = sum([v for k, v in nodes[c].items()])
-#             cx = sum([positions[k][0]*v/vsum for k, v in nodes[c].items()])
-#
-#             if JITTER == True:
-#                 positions[c] = [cx + random.gauss(0, 0.1), cy]
-#             else:
-#                 positions[c] = [cx, cy]
-#
-#
-#         if c in inv_nodes:
-#             prepos_children_reccurent(c)
 
 def prepos_children():
@@ -451 +425 @@
 
 min_skeleton_depth = 0
+max_nodes = 0
 
 firstnode = None
@@ -462 +437 @@
 
 def main():
-    global svg_file, min_skeleton_depth, args, \
+    global svg_file, min_skeleton_depth, max_nodes, args, \
         TIME, BALANCE, DOT_STYLE, COLORING, JITTER, \
         svg_mutation_line_style, svg_crossover_line_style
@@ -499 +474 @@
 
     parser.add_argument('--simple-data', type=bool, dest='simple_data', help='input data are given in a simple format (#child #parent)')
+
+
+    parser.add_argument('-x', '--max-nodes', type=int, default=0, dest='max_nodes', help='maximum number of nodes drawn (starting from the first one)')
 
     parser.set_defaults(draw_tree=True)
@@ -528 +506 @@
     dir = args.input
     min_skeleton_depth = args.min_skeleton_depth
+    max_nodes = args.max_nodes
     seed = args.seed
     if seed == -1: