Changeset 687 for mds-and-trees

Timestamp:

09/03/17 17:37:43 (7 years ago)

Author:

konrad

Message:

Using "inherited' to decide horizontal distance from the parent

File:

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

mds-and-trees/tree-genealogy.py

@@ -471 +471 @@
                 if len(self.tree.parents[child]) == 1:
                 # if current_node is the only parent
-                    parent = [par for par, v in self.tree.parents[child].items()][0]
+                    parent, similarity = [(par, v) for par, v in self.tree.parents[child].items()][0]
 
                     if self.JITTER:
-                        dissimilarity = random.gauss(0, 0.5)
+                        dissimilarity = (1-similarity) + random.gauss(0, 0.5) + 0.001
                     else:
-                        dissimilarity = 1
+                        dissimilarity = (1-similarity) + 0.001
                     add_node({'id':child, 'y':ypos, 'x':
                              self.xmin_crowd(self.positions[parent]['x']-dissimilarity,
@@ -690 +690 @@
                             else:
                                 parent_id = get_id("virtual_parent")
-                            inherited = 1 #(creature["Inherited"][i] if 'Inherited' in creature else 1) #ONLY FOR NOW
+                            inherited = (creature["Inherited"][i] if 'Inherited' in creature else 1)
                             self.parents[creature_id][parent_id] = inherited