[avida-cvs] avida(kaben) CVS commits: /current/source/main population.cc

[kaben]

kaben		Mon Dec 22 10:54:40 2003 EDT

  Modified files:              (Branch: kaben)
    /avida/current/source/main	population.cc 
  Log:
  Sync with cvs commit on branch HEAD by mercere99 Wed Dec 10 14:18:43 2003 EDT
  
  
  
Index: avida/current/source/main/population.cc
diff -u avida/current/source/main/population.cc:1.124.2.2 avida/current/source/main/population.cc:1.124.2.3
--- avida/current/source/main/population.cc:1.124.2.2	Mon Dec 22 10:43:18 2003
+++ avida/current/source/main/population.cc	Mon Dec 22 10:54:40 2003
@@ -703,7 +703,14 @@
 
   // First, check if there is an empty organism to work with (always preferred)
   tList<cPopulationCell> & conn_list = parent_cell.ConnectionList();
-  FindEmptyCell(conn_list, found_list);
+
+  if (cConfig::GetPreferEmpty() == false &&
+      cConfig::GetBirthMethod == POSITION_CHILD_RANDOM) {
+    found_list.Append(conn_list);
+    if (parent_ok == true) found_list.Push(&parent_cell);
+  } else {
+    FindEmptyCell(conn_list, found_list);
+  }
 
   // If we have not found an empty organism, we must use the specified function
   // to determine how to choose among the filled organisms.