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

[dknoester at myxo.css.msu.edu]

Author: dknoester
Date: 2008-02-28 13:31:51 -0500 (Thu, 28 Feb 2008)
New Revision: 2393

Modified:
   development/source/main/cAvidaConfig.h
   development/source/main/cPopulation.cc
Log:
Removed DEMES_HAVE_MERIT config option; deme merit is applied (or not) based on reaction processes.

Modified: development/source/main/cAvidaConfig.h
===================================================================
--- development/source/main/cAvidaConfig.h	2008-02-28 16:16:03 UTC (rev 2392)
+++ development/source/main/cAvidaConfig.h	2008-02-28 18:31:51 UTC (rev 2393)
@@ -296,7 +296,6 @@
   CONFIG_ADD_GROUP(DEME_GROUP, "Demes and Germlines");
   CONFIG_ADD_VAR(NUM_DEMES, int, 1, "Number of independent groups in the\npopulation (default=1).");
   CONFIG_ADD_VAR(DEMES_USE_GERMLINE, int, 0, "Whether demes use a distinct germline (default=0).");
-  CONFIG_ADD_VAR(DEMES_HAVE_MERIT, int, 0, "Whether demes have merit (default=0).");
   CONFIG_ADD_VAR(DEMES_PREVENT_STERILE, int, 0, "Whether to prevent sterile demes from\nreplicating (default=0).");
   CONFIG_ADD_VAR(DEMES_RESET_RESOURCES, int, 0, "Reset resources in demes on replication. \n0 = reset both demes \n1 = reset target deme \n2 = deme resources remain unchanged\n");
   CONFIG_ADD_VAR(DEMES_REPLICATE_SIZE, int, 1, "Number of identical organisms to create or copy from the\nsource deme to the target deme (default=1).");

Modified: development/source/main/cPopulation.cc
===================================================================
--- development/source/main/cPopulation.cc	2008-02-28 16:16:03 UTC (rev 2392)
+++ development/source/main/cPopulation.cc	2008-02-28 18:31:51 UTC (rev 2393)
@@ -1210,11 +1210,10 @@
     SeedDeme(source_deme, target_deme);
   }
 
-  // If we're using deme merit, the source's merit must be transferred to the target.
-  if(m_world->GetConfig().DEMES_HAVE_MERIT.Get()) {
-    target_deme.UpdateDemeMerit(source_deme);
-    source_deme.UpdateDemeMerit();
-  }
+  // The source's merit must be transferred to the target, and then the source has
+  // rotate its merits.
+  target_deme.UpdateDemeMerit(source_deme);
+  source_deme.UpdateDemeMerit();
   
   bool source_deme_resource_reset(true), target_deme_resource_reset(true);
   switch(m_world->GetConfig().DEMES_RESET_RESOURCES.Get()) {