Changeset 627

Timestamp:

10/26/16 19:13:26 (8 years ago)

Author:

konrad

Message:

tree-genealogy.py is now supporting multiple virtual parents (they are merged into one virtual parent)

File:

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

mds-and-trees/tree-genealogy.py

@@ -64 +64 @@
                 'width': {
                     'meaning': 'adepth',
-                    'start': 1,
+                    'start': 0.1,
                     'end': 4,
                     'bias': 3
@@ -585 +585 @@
         ids = {}
         def get_id(id):
-            if not id in ids:
+            if id not in ids:
                 ids[id] = len(ids)
             return ids[id]
@@ -624 +624 @@
                         # make sure that ID's of parents are lower than that of their children
                         for i in range(0, len(creature["FromIDs"])):
-                            get_id(creature["FromIDs"][i])
+                            if creature["FromIDs"][i] not in ids:
+                                get_id("virtual_parent")
 
                         creature_id = get_id(creature["ID"])
@@ -635 +636 @@
                         # we assign to each parent its contribution to the genotype of the child
                         for i in range(0, len(creature["FromIDs"])):
-                            parent_id = get_id(creature["FromIDs"][i])
+                            if creature["FromIDs"][i] in ids:
+                                parent_id = get_id(creature["FromIDs"][i])
+                            else:
+                                parent_id = get_id("virtual_parent")
                             inherited = 1 #(creature["Inherited"][i] if 'Inherited' in creature else 1) #ONLY FOR NOW
                             self.parents[creature_id][parent_id] = inherited