[Avida-SVN] r2885 - branches/movement/source/main

[grabow38 at myxo.css.msu.edu]

Author: grabow38
Date: 2008-10-27 11:38:47 -0400 (Mon, 27 Oct 2008)
New Revision: 2885

Modified:
   branches/movement/source/main/cAvidaConfig.h
   branches/movement/source/main/cPopulation.cc
Log:
Added case to DEMES_ORGANISM_FACING config option for organisms to face North on injection.

Modified: branches/movement/source/main/cAvidaConfig.h
===================================================================
--- branches/movement/source/main/cAvidaConfig.h	2008-10-27 14:55:56 UTC (rev 2884)
+++ branches/movement/source/main/cAvidaConfig.h	2008-10-27 15:38:47 UTC (rev 2885)
@@ -308,7 +308,7 @@
   CONFIG_ADD_VAR(DEMES_PROB_ORG_TRANSFER, double, 0.0, "Probablity of an organism being transferred from the\nsource deme to the target deme (default=0.0).");
   CONFIG_ADD_VAR(DEMES_ORGANISM_SELECTION, int, 0, "How organisms are selected for transfer from\nsource to target during deme replication.\n0=random with replacement (default).\n1=sequential.");
   CONFIG_ADD_VAR(DEMES_ORGANISM_PLACEMENT, int, 0, "How organisms are placed during deme replication.\n0=cell-array middle (default).\n1=deme center.\n2=random placement.\n3=sequential.");
-  CONFIG_ADD_VAR(DEMES_ORGANISM_FACING, int, 0, "How organisms are facing during deme replication.\n0=unchanged (default).\n1=northwest.\n2=random.");
+  CONFIG_ADD_VAR(DEMES_ORGANISM_FACING, int, 0, "How organisms are facing during deme replication.\n0=unchanged (default).\n1=northwest.\n2=random, \n3=north.");
   CONFIG_ADD_VAR(DEMES_MAX_AGE, int, 500, "The maximum age of a deme (in updates) to be\nused for age-based replication (default=500).");
   CONFIG_ADD_VAR(DEMES_MAX_BIRTHS, int, 100, "The maximum number of births that can occur\nwithin a deme; used with birth-count\nreplication (default=100).");
   CONFIG_ADD_VAR(DEMES_MIM_EVENTS_KILLED_RATIO, double, 0.7, "Minimum ratio of events killed required for event period to be a success.");

Modified: branches/movement/source/main/cPopulation.cc
===================================================================
--- branches/movement/source/main/cPopulation.cc	2008-10-27 14:55:56 UTC (rev 2884)
+++ branches/movement/source/main/cPopulation.cc	2008-10-27 15:38:47 UTC (rev 2885)
@@ -2303,6 +2303,12 @@
       }
       break;
     }
+	case 3: { // Spin to face N @ LMG
+	cell.Rotate(cell_array[GridNeighbor(cell.GetID()-deme.GetCellID(0),
+                                          deme.GetWidth(),
+                                          deme.GetHeight(), 0, -1)+deme.GetCellID(0)]);
+      break; 
+    }
     default: {
       assert(false);
     }