[Avida-cvs] [avida-svn] r1026 - in trunk: source/classification source/main support/config

[jclune at myxo.css.msu.edu]

Author: jclune
Date: 2006-10-05 14:58:10 -0400 (Thu, 05 Oct 2006)
New Revision: 1026

Modified:
   trunk/source/classification/cGenotype.cc
   trunk/source/main/cAvidaConfig.h
   trunk/support/config/avida.cfg
Log:
changed default backto 60x60...after conversation with charles

Modified: trunk/source/classification/cGenotype.cc
===================================================================
--- trunk/source/classification/cGenotype.cc	2006-10-04 18:08:28 UTC (rev 1025)
+++ trunk/source/classification/cGenotype.cc	2006-10-05 18:58:10 UTC (rev 1026)
@@ -214,7 +214,11 @@
   if (GetID() == test_genotype->GetAncestorID(0) ||  // Parent of test
       GetID() == test_genotype->GetAncestorID(1) ||  // Parent of test
       test_genotype->GetID() == GetAncestorID(0) ||  // Child of test
-      test_genotype->GetID() == GetAncestorID(1)     // Child of test
+      test_genotype->GetID() == GetAncestorID(1) ||    // Child of test
+      GetAncestorID(0) == test_genotype->GetAncestorID(0) || // Sibling of test
+      GetAncestorID(0) == test_genotype->GetAncestorID(1) || // Sibling of test
+      GetAncestorID(1) == test_genotype->GetAncestorID(0) || // Sibling of test
+      GetAncestorID(1) == test_genotype->GetAncestorID(1)    // Sibling of test
       ) {
     return 1;
   }
@@ -226,14 +230,7 @@
       test_genotype->GetID() == GetAncestorID(3) ||  // Grandchild of test
       test_genotype->GetID() == GetAncestorID(4) ||  // Grandchild of test
       test_genotype->GetID() == GetAncestorID(5) ||  // Grandchild of test
-      GetAncestorID(0) == test_genotype->GetAncestorID(0) || // Sibling of test
-      GetAncestorID(0) == test_genotype->GetAncestorID(1) || // Sibling of test
-      GetAncestorID(1) == test_genotype->GetAncestorID(0) || // Sibling of test
-      GetAncestorID(1) == test_genotype->GetAncestorID(1)    // Sibling of test
-      ) {
-    return 2;
-  }
-  if (GetAncestorID(0) == test_genotype->GetAncestorID(2) || // Uncle of test
+      GetAncestorID(0) == test_genotype->GetAncestorID(2) || // Uncle of test
       GetAncestorID(0) == test_genotype->GetAncestorID(3) || // Uncle of test
       GetAncestorID(0) == test_genotype->GetAncestorID(4) || // Uncle of test
       GetAncestorID(0) == test_genotype->GetAncestorID(5) || // Uncle of test
@@ -250,9 +247,10 @@
       test_genotype->GetAncestorID(1) == GetAncestorID(4) || // Nephew of test
       test_genotype->GetAncestorID(1) == GetAncestorID(5)    // Nephew of test
       ) {
-    return 3;
+    return 2;
   }
-
+  /*@JMC If you really want this to be accurate it should include great-grandchildren
+    and great-grandparents
   if (GetAncestorID(2) == test_genotype->GetAncestorID(2) || // First Cousins
       GetAncestorID(2) == test_genotype->GetAncestorID(3) ||
       GetAncestorID(2) == test_genotype->GetAncestorID(4) ||
@@ -270,8 +268,8 @@
       GetAncestorID(5) == test_genotype->GetAncestorID(4) ||
       GetAncestorID(5) == test_genotype->GetAncestorID(5)
       ) {
-    return 4;
+    return 3;
   }
-  
-  return 5;
+  */  
+  return 3;
 }

Modified: trunk/source/main/cAvidaConfig.h
===================================================================
--- trunk/source/main/cAvidaConfig.h	2006-10-04 18:08:28 UTC (rev 1025)
+++ trunk/source/main/cAvidaConfig.h	2006-10-05 18:58:10 UTC (rev 1026)
@@ -157,8 +157,8 @@
   CONFIG_ADD_VAR(VERBOSITY, int, 1, "Control output verbosity");
   
   CONFIG_ADD_GROUP(ARCH_GROUP, "Architecture Variables");
-  CONFIG_ADD_VAR(WORLD_X, int, 100, "Width of the Avida world");
-  CONFIG_ADD_VAR(WORLD_Y, int, 100, "Height of the Avida world");
+  CONFIG_ADD_VAR(WORLD_X, int, 60, "Width of the Avida world");
+  CONFIG_ADD_VAR(WORLD_Y, int, 60, "Height of the Avida world");
   CONFIG_ADD_VAR(WORLD_GEOMETRY, int, 2, "1 = Bounded Grid\n2 = Torus");
   CONFIG_ADD_VAR(NUM_DEMES, int, 0, "Number of independed groups in the population; 0=off");
   CONFIG_ADD_VAR(RANDOM_SEED, int, 0, "Random number seed (0 for based on time)");
@@ -240,7 +240,7 @@
   CONFIG_ADD_VAR(DEFAULT_BONUS, double, 1.0, "The bonus an organism gets before any tasks");
   CONFIG_ADD_VAR(MERIT_GIVEN, double, 0.0, "Amount of merit donated with 'donoate' command.");
   CONFIG_ADD_VAR(MERIT_RECEIVED, double, 0.0, "Amount of merit received with 'donate' command");
-  CONFIG_ADD_VAR(MAX_DONATE_KIN_DIST, int, -1, "Limit on distance of relation for donate; -1=no max");
+  CONFIG_ADD_VAR(MAX_DONATE_KIN_DIST, int, -1, "Limit on distance of relation donated to (in terms of hamilton's r. 1=50% shared genes, 2=25% shared genes, etc.; -1=no max");
   CONFIG_ADD_VAR(MAX_DONATE_EDIT_DIST, int, -1, "Limit on edit distance for donate; -1=no max");
   CONFIG_ADD_VAR(MAX_DONATES, int, 1000000, "Limit on number of donates organisms are allowed.");
   

Modified: trunk/support/config/avida.cfg
===================================================================
--- trunk/support/config/avida.cfg	2006-10-04 18:08:28 UTC (rev 1025)
+++ trunk/support/config/avida.cfg	2006-10-05 18:58:10 UTC (rev 1026)
@@ -17,8 +17,8 @@
 
 ### ARCH_GROUP ###
 # Architecture Variables
-WORLD_X 100       # Width of the Avida world
-WORLD_Y 100       # Height of the Avida world
+WORLD_X 60       # Width of the Avida world
+WORLD_Y 60       # Height of the Avida world
 WORLD_GEOMETRY 2  # 1 = Bounded Grid
                   # 2 = Torus
 NUM_DEMES 0       # Number of independed groups in the population; 0=off