[Avida-SVN] r2767 - development/source/main

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2008-09-02 18:14:25 -0400 (Tue, 02 Sep 2008)
New Revision: 2767

Modified:
   development/source/main/cEventList.cc
   development/source/main/cEventList.h
Log:
Add new event trigger based on total population births.

Modified: development/source/main/cEventList.cc
===================================================================
--- development/source/main/cEventList.cc	2008-08-29 15:31:39 UTC (rev 2766)
+++ development/source/main/cEventList.cc	2008-09-02 22:14:25 UTC (rev 2767)
@@ -133,6 +133,9 @@
   case GENERATION:
     t_val = m_world->GetStats().SumGeneration().Average();
     break;
+  case BIRTHS:
+    t_val = m_world->GetStats().GetTotCreatures();
+    break;
   case UNDEFINED:
     break;
   }
@@ -251,6 +254,9 @@
       case IMMEDIATE:
         os << "immediate ";
         break;
+      case BIRTHS:
+        os << "births ";
+        break;
       default:
         os << "undefined ";
     }
@@ -306,6 +312,9 @@
   } else if( cur_word == "g" || cur_word == "generation") {
     trigger = GENERATION;
     cur_word = cur_line.PopWord();
+  } else if (cur_word == "b" || cur_word == "births") {
+    trigger = BIRTHS;
+    cur_word = cur_line.PopWord();
   } else {
     // If Trigger is skipped so assume IMMEDIATE
     trigger = IMMEDIATE;

Modified: development/source/main/cEventList.h
===================================================================
--- development/source/main/cEventList.h	2008-08-29 15:31:39 UTC (rev 2766)
+++ development/source/main/cEventList.h	2008-09-02 22:14:25 UTC (rev 2767)
@@ -52,7 +52,7 @@
   tMemTrack<cEventList> mt;
 #endif
 public:
-  enum eTriggerType { UPDATE, GENERATION, IMMEDIATE, UNDEFINED };
+  enum eTriggerType { UPDATE, GENERATION, IMMEDIATE, BIRTHS, UNDEFINED };
   
   static const double TRIGGER_BEGIN;
   static const double TRIGGER_END;