Changeset 566

Timestamp:

08/06/16 02:16:56 (8 years ago)

Author:

konrad

Message:

Added REAL time option for tree-genealogy.py, renamed previous REAL time to BIRTHS time

File:

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

mds-and-trees/tree-genealogy.py

@@ -81 +81 @@
                     if not creature["FromIDs"][0] in nodes:
                         firstnode = creature["FromIDs"][0]
+                if "Time" in creature:
+                    time[creature["ID"]] = creature["Time"]
 
     for k, v in sorted(nodes.items()):
@@ -150 +152 @@
         #print(node + "->" + c)
         dissimilarity = 0.5 #random.gauss(0,0.3)
-        if TIME == "REAL":
+        if TIME == "BIRTHS":
             id = ""
             if c[0] == "c":
@@ -159 +161 @@
         elif TIME == "GENERATIONAL":
             positions[c] = [xmin_crowd(positions[node][0]-dissimilarity, positions[node][0]+dissimilarity, positions[node][1]+1), positions[node][1]+1]
+        elif TIME == "REAL":
+            positions[c] = [xmin_crowd(positions[node][0]-dissimilarity, positions[node][0]+dissimilarity, time[c]), time[c]]
 
     for c in inv_nodes[node]:
@@ -166 +170 @@
 def prepos_children():
     global max_height, max_width, min_width
+
+    if not bool(time):
+        print("REAL time requested, but no real time data provided. Assuming BIRTHS time instead.")
+        TIME = "BIRTHS"
 
     positions[firstnode] = [0, 0]
@@ -258 +266 @@
 positions = {}
 depth = {}
+time = {}
 
 def main():
@@ -278 +287 @@
 
     #TODO: better names for those parameters
-    parser.add_argument('--time', default='REAL', dest='time', help='values on vertical axis (REAL/GENERATIONAL)')
+    parser.add_argument('--time', default='BIRTHS', dest='time', help='values on vertical axis (REAL/GENERATIONAL)')
     parser.add_argument('--balance', default='MIN',dest='balance', help='method of placing node in the tree (RANDOM/MIN/DENSITY)')