Changeset 594 for mds-and-trees

Timestamp:

08/23/16 18:13:31 (8 years ago)

Author:

konrad

Message:

Fixed drawing the spine and the skeleton for the tree-genealogy.py

File:

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

mds-and-trees/tree-genealogy.py

@@ -65 +65 @@
     from_col = [100, 70, 0]
     to_col = [60, 0, 0]
-    from_col = [0, 0, 0]
-    to_col = [80, 0, 80]
     # lava
     # from_col = [100, 80, 0]
@@ -295 +293 @@
             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")
 def draw_children():
     global visited
@@ -314 +313 @@
 
 def draw_spine_recurrent(node):
+    global visited
     for c in inv_nodes[node]:
+
+        # we want to draw the node just once
+        if all_parents_visited(c):
+            visited[c] = True
+
+            if depth[c] == depth[node] - 1:
+                if c in inv_nodes:
+                    draw_spine_recurrent(c)
+
         if depth[c] == depth[node] - 1:
-            if c in inv_nodes:
-                draw_spine_recurrent(c)
-
             line_style = svg_spine_line_style
             svg_add_line( (w_margin+w_no_margs*(positions[node][0]-min_width)/(max_width-min_width), h_margin+h_no_margs*positions[node][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)
-            #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), svg_spine_dot_style)
+        #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), svg_spine_dot_style)
 def draw_spine():
+    global visited
+    visited = {}
+    visited[firstnode] = True
+
     draw_spine_recurrent(firstnode)
     #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), svg_spine_dot_style)
 
-def draw_skeleton_reccurent(node, max_depth):
+def draw_skeleton_reccurent(node):
+    global visited
     for c in inv_nodes[node]:
-        if depth[c] >= min_skeleton_depth or depth[c] == max([depth[q] for q in inv_nodes[node]]):
-            if c in inv_nodes:
-                draw_skeleton_reccurent(c, max_depth)
-
+
+        if all_parents_visited(c):
+            visited[c] = True
+
+            if depth[c] >= min_skeleton_depth: # or depth[c] == max([depth[q] for q in inv_nodes[node]]):
+                if c in inv_nodes:
+                    draw_skeleton_reccurent(c)
+
+        if depth[c] >= min_skeleton_depth: # or depth[c] == max([depth[q] for q in inv_nodes[node]]):
+            #print([depth[q] for q in inv_nodes[node]])
             line_style = svg_spine_line_style
             svg_add_line( (w_margin+w_no_margs*(positions[node][0]-min_width)/(max_width-min_width), h_margin+h_no_margs*positions[node][1]/max_height),
@@ -339 +356 @@
             #             svg_spine_dot_style)
 def draw_skeleton():
-    max_depth = 0
-    for k, v in depth.items():
-            max_depth = max(max_depth, v)
-
-    draw_skeleton_reccurent(firstnode, max_depth)
+    global visited
+    visited = {}
+    visited[firstnode] = True
+
+    draw_skeleton_reccurent(firstnode)
     #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),
     #             svg_spine_dot_style)