[Avida-cvs] [Avida2-svn] r196 - trunk/source/main

[dule at myxo.css.msu.edu]

Author: dule
Date: 2005-06-09 15:52:48 -0400 (Thu, 09 Jun 2005)
New Revision: 196

Modified:
   trunk/source/main/analyze_util.cc
Log:
tweaking the dump_task_grid event

Modified: trunk/source/main/analyze_util.cc
===================================================================
--- trunk/source/main/analyze_util.cc	2005-06-09 18:12:26 UTC (rev 195)
+++ trunk/source/main/analyze_util.cc	2005-06-09 19:52:48 UTC (rev 196)
@@ -777,27 +777,27 @@
 }
 
 void cAnalyzeUtil::TaskGrid(cPopulation * pop, ofstream & fp)
-{
-
+{ 
   for (int i = 0; i < pop->GetWorldX(); i++) {
     for (int j = 0; j < pop->GetWorldY(); j++) {
-      int task_sum = 0; 
-      if (pop->GetCell(i).IsOccupied() == true) { 
-        cOrganism * organism = pop->GetCell(j*pop->GetWorldX()+i).GetOrganism();
+      int task_sum = 0;
+      int cell_num = i*pop->GetWorldX()+j;
+      if (pop->GetCell(cell_num).IsOccupied() == true) {
+        cOrganism * organism = pop->GetCell(cell_num).GetOrganism();
         cCPUTestInfo test_info;
         cTestCPU::TestGenome( test_info, organism->GetGenome() );
         cPhenotype & test_phenotype = test_info.GetTestOrganism()->GetPhenotype();
-        int num_tasks = test_phenotype.GetEnvironment().GetTaskLib().GetSize();
+        int num_tasks = test_phenotype.GetEnvironment().GetTaskLib().GetSize();   
         for (int k = 0; k < num_tasks; k++) {
           if (test_phenotype.GetLastTaskCount()[k]>0) {
-	    task_sum = task_sum + (int)pow(2,k); 
-          } 
-        }
-      }
+            task_sum = task_sum + (int)pow(2,k);
+          }
+        }  
+      }  
       fp << task_sum << " ";
     }
     fp << endl;
-  } 
+  }
 }
 
 /**