[Avida-SVN] r3510 - in branches/parasites: source/cpu source/main support/config/misc/Parasites

[zaman at myxo.css.msu.edu]

Author: zaman
Date: 2009-10-28 00:22:06 -0400 (Wed, 28 Oct 2009)
New Revision: 3510

Modified:
   branches/parasites/source/cpu/cHardwareTransSMT.cc
   branches/parasites/source/main/cPopulation.cc
   branches/parasites/support/config/misc/Parasites/
Log:
Getting rid of stale code

Modified: branches/parasites/source/cpu/cHardwareTransSMT.cc
===================================================================
--- branches/parasites/source/cpu/cHardwareTransSMT.cc	2009-10-28 04:21:36 UTC (rev 3509)
+++ branches/parasites/source/cpu/cHardwareTransSMT.cc	2009-10-28 04:22:06 UTC (rev 3510)
@@ -650,7 +650,6 @@
   // Inject fails if the memory space is already in use or thread exists
   if (MemorySpaceExists(in_label) || FindThreadLabel(in_label) != -1) 
   {
-    cout <<"memory space exists - " << in_label.AsString() << endl;
     return false;
   }
   

Modified: branches/parasites/source/main/cPopulation.cc
===================================================================
--- branches/parasites/source/main/cPopulation.cc	2009-10-28 04:21:36 UTC (rev 3509)
+++ branches/parasites/source/main/cPopulation.cc	2009-10-28 04:22:06 UTC (rev 3510)
@@ -556,24 +556,13 @@
     int total_count;
     int task_count = last_task_count;
     
-    cout << last_task_count << endl;
-    cout << task_counts[1] << endl;
-    cout << endl << endl << endl;
-    
     if (task_count < task_counts[0])
     {  
       task_count = task_counts[0];
     }
     
-    if (task_counts[1] > 0 && task_counts[1] <= 10)
-    {
-      task_count -= task_counts[1];
-    }
-    
     total_count = task_count;
-    
-    //cout << endl << total_count << endl;
-    
+        
     if (total_count > 0)
     {
       if (m_world->GetConfig().INJECT_PROB_SIGMOID.Get())


Property changes on: branches/parasites/support/config/misc/Parasites
___________________________________________________________________
Name: svn:ignore
   + avida.cfg
default-smt.org
dominant-org.org
environment.cfg
events.cfg
instset-smt.cfg
parasite-smt.org