Changeset 617

Timestamp:

09/21/16 17:52:27 (8 years ago)

Author:

konrad

Message:

Added non-recurrent verion of tree drawing function, draw_children_norec(). Not tested yet! Should it work, it will take the place of the current, recurrent method.

File:

• mds-and-trees/tree-genealogy.py (modified) (1 diff)

mds-and-trees/tree-genealogy.py

@@ -314 +314 @@
     svg_add_dot( (w_margin+w_no_margs*(positions[firstnode][0]-min_width)/(max_width-min_width), h_margin+h_no_margs*positions[firstnode][1]/max_height), dot_style)
 
+
+
+def draw_children_norec():
+    global visited
+    visited = {}
+    visited[firstnode] = True
+
+    max_depth = 0
+    for k, v in depth.items():
+            max_depth = max(max_depth, v)
+
+    nodes_to_visit = [firstnode]
+    while True:
+        current_node = nodes_to_visit[0]
+
+        for c in inv_nodes[current_node]:
+
+            # we want to draw the node just once
+            if not all_parents_visited(c):
+                continue
+            else:
+                visited[c] = True
+
+            if c in inv_nodes:
+                nodes_to_visit.append(c)
+
+            line_style = ""
+            if COLORING == "NONE":
+                line_style = svg_line_style
+            elif COLORING == "TYPE":
+                line_style = (svg_mutation_line_style if len(nodes[c]) == 1 else svg_crossover_line_style)
+            else: # IMPORTANCE, default
+                line_style = svg_generate_line_style(depth[c]/max_depth)
+
+            for k, v in sorted(nodes[c].items()):
+                svg_add_line( (w_margin+w_no_margs*(positions[k][0]-min_width)/(max_width-min_width), h_margin+h_no_margs*positions[k][1]/max_height),
+                    (w_margin+w_no_margs*(positions[c][0]-min_width)/(max_width-min_width), h_margin+h_no_margs*positions[c][1]/max_height), line_style)
+
+            if DOT_STYLE == "NONE":
+                continue
+            elif DOT_STYLE == "TYPE":
+                dot_style = svg_generate_dot_style(kind[c] if c in kind else 0) #type
+            else: # NORMAL, default
+                dot_style = svg_clear_dot_style #svg_generate_dot_style(depth[c]/max_depth)
+            svg_add_dot( (w_margin+w_no_margs*(positions[c][0]-min_width)/(max_width-min_width), h_margin+h_no_margs*positions[c][1]/max_height), dot_style)
+            #svg_add_text( str(depth[c]), (w_margin+w_no_margs*(positions[c][0]-min_width)/(max_width-min_width), h_margin+h_no_margs*positions[c][1]/max_height), "end")
+
+        # we remove the current node from the list
+        nodes_to_visit = nodes_to_visit[1:]
+        # if none left, we can stop
+        if len(nodes_to_visit) == 0:
+            break
+
+    if DOT_STYLE == "NONE":
+        return
+    elif DOT_STYLE == "TYPE":
+        dot_style = svg_generate_dot_style(kind[firstnode] if firstnode in kind else 0)
+    else: # NORMAL, default
+        dot_style = svg_clear_dot_style #svg_generate_dot_style(depth[c]/max_depth)
+    svg_add_dot( (w_margin+w_no_margs*(positions[firstnode][0]-min_width)/(max_width-min_width), h_margin+h_no_margs*positions[firstnode][1]/max_height), dot_style)
+
 def draw_spine_recurrent(node):
     global visited