[Avida-cvs] [avida-svn] r860 - branches/developers/avida-edward/source/python/AvidaGui2

[baerb@myxo.css.msu.edu]

Author: baerb
Date: 2006-07-31 18:49:59 -0400 (Mon, 31 Jul 2006)
New Revision: 860

Modified:
   branches/developers/avida-edward/source/python/AvidaGui2/pyReadFreezer.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyWriteGenesisEvent.py
   branches/developers/avida-edward/source/python/AvidaGui2/pyWriteToFreezer.py
Log:

First attempt to add code that reads ancestor information.



Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyReadFreezer.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyReadFreezer.py	2006-07-31 20:19:01 UTC (rev 859)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyReadFreezer.py	2006-07-31 22:49:59 UTC (rev 860)
@@ -28,7 +28,10 @@
           section_key = line[1:].upper()
           self.dictionary[section_key] = {}
         else:
-          var_name, value = string.split(line)
+
+          # split into key and value (which could be multiple words)
+
+          var_name, value = line.split(' ',1)
           self.dictionary[section_key][var_name.upper()] = value
 	
   def GetDictionary(self):

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyWriteGenesisEvent.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyWriteGenesisEvent.py	2006-07-31 20:19:01 UTC (rev 859)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyWriteGenesisEvent.py	2006-07-31 22:49:59 UTC (rev 860)
@@ -26,12 +26,22 @@
     if in_dict.has_key("CELLS"): 
       cells_dict = in_dict["CELLS"]
       organisms_dict = in_dict["ORGANISMS"]
+      if in_dict.has_key("ANCESTOR_NAMES"):
+        session_mdl.m_ancestors_dict = in_dict["ANCESTOR_NAMES"]
+      else:
+        session_mdl.m_ancestors_dict = {};
+      if in_dict.has_key("ANCESTOR_LINKS"):
+        ancestor_link_dict = in_dict["ANCESTOR_LINKS"]
+      else:
+        ancestor_link_dict = {}
       self.m_session_mdl.m_founding_cells_dict = cells_dict
 
     #if it is not a full petri dish
     else:
       cells_dict = {}
       organisms_dict = {}
+      session_mdl.m_ancestors_dict = {}
+      ancestor_link_dict = {}
       if settings_dict.has_key("START_CREATURE0"):
         world_x = settings_dict["WORLD-X"]
         world_y = settings_dict["WORLD-Y"]
@@ -46,6 +56,8 @@
 
         for i in range(num_ancestors):
           start_creature = settings_dict["START_CREATURE" + str(i)]
+          session_mdl.m_ancestors_dict[i] = start_creature
+          ancestor_link_dict[str(i)] = str(i)
 
           self.start_cell_location = self.find_location(world_x, world_y, 
              num_ancestors, i)
@@ -67,7 +79,7 @@
           organisms_dict[str(i)] = org_string
 
 
-    self.modifyEventFile(cells_dict, organisms_dict, 
+    self.modifyEventFile(cells_dict, organisms_dict, ancestor_link_dict,
       os.path.join(tmp_in_dir, "events.cfg"), tmp_out_dir)
     
     shutil.copyfile(os.path.join(workspace_dir, "inst_set.default"), os.path.join(tmp_in_dir, "inst_set.default"))
@@ -163,8 +175,8 @@
 
     out_environment_file.close()
 
-  def modifyEventFile(self, cells_dict, organisms_dict, event_file_name, 
-    tmp_out_dir = None):
+  def modifyEventFile(self, cells_dict, organisms_dict, ancestor_link_dict, 
+    event_file_name, tmp_out_dir = None):
 
     # Routine to add to the event.cfg file by inject creatures into the
     # population and adding print statements into the correct directory
@@ -173,7 +185,10 @@
     for cell in cells_dict.keys():
       part1 = "u begin inject_sequence " +  organisms_dict[cells_dict[cell]]
       part2 = " " + cell + " " + str(int(cell)+1) + " -1 "
-      part3 = cells_dict[cell] + "\n"
+      if (ancestor_link_dict.has_key(cells_dict[cell])):
+        part3 = ancestor_link_dict[cells_dict[cell]] + "\n"
+      else:
+        part3 ="\n"
       event_out_file.write(part1 +  part2 + part3)
     
     # write the .dat files to the correct directory

Modified: branches/developers/avida-edward/source/python/AvidaGui2/pyWriteToFreezer.py
===================================================================
--- branches/developers/avida-edward/source/python/AvidaGui2/pyWriteToFreezer.py	2006-07-31 20:19:01 UTC (rev 859)
+++ branches/developers/avida-edward/source/python/AvidaGui2/pyWriteToFreezer.py	2006-07-31 22:49:59 UTC (rev 860)
@@ -68,6 +68,8 @@
       organism_dict = {}
       in_dict["ORGANISMS"] = {}
       in_dict["CELLS"] = {}
+      in_dict["ANCESTOR_NAMES"] = {}
+      in_dict["ANCESTOR_LINKS"] = {}
       new_genome_num = 0
       for cell in pop_dict.keys():
         genome = pop_dict[cell]