[Avida-SVN] r2634 - in branches/collect: source/cpu source/drivers tests/_exp_500u

[blwalker at myxo.css.msu.edu]

Author: blwalker
Date: 2008-06-10 12:48:24 -0400 (Tue, 10 Jun 2008)
New Revision: 2634

Removed:
   branches/collect/tests/_exp_500u/expected/
Modified:
   branches/collect/source/cpu/cHardwareExperimental.cc
   branches/collect/source/drivers/cDefaultRunDriver.cc
Log:
Porting r2305:2306 from development to collect branch


Modified: branches/collect/source/cpu/cHardwareExperimental.cc
===================================================================
--- branches/collect/source/cpu/cHardwareExperimental.cc	2008-06-10 16:39:44 UTC (rev 2633)
+++ branches/collect/source/cpu/cHardwareExperimental.cc	2008-06-10 16:48:24 UTC (rev 2634)
@@ -143,10 +143,10 @@
     // Replication Instructions
     tInstLibEntry<tMethod>("h-alloc", &cHardwareExperimental::Inst_HeadAlloc, nInstFlag::DEFAULT, "Allocate maximum allowed space"),
     tInstLibEntry<tMethod>("h-divide", &cHardwareExperimental::Inst_HeadDivide, (nInstFlag::DEFAULT | nInstFlag::STALL), "Divide code between read and write heads."),
-    tInstLibEntry<tMethod>("h-copy", &cHardwareExperimental::Inst_HeadCopy, (nInstFlag::DEFAULT | nInstFlag::STALL), "Copy from read-head to write-head; advance both"),
+    tInstLibEntry<tMethod>("h-copy", &cHardwareExperimental::Inst_HeadCopy, nInstFlag::DEFAULT, "Copy from read-head to write-head; advance both"),
     tInstLibEntry<tMethod>("if-label", &cHardwareExperimental::Inst_IfLabel, nInstFlag::DEFAULT, "Execute next if we copied complement of attached label"),
 
-    tInstLibEntry<tMethod>("h-read", &cHardwareExperimental::Inst_HeadRead, nInstFlag::STALL, "Read from the read-head, place into ?BX?, advance read-head"),
+    tInstLibEntry<tMethod>("h-read", &cHardwareExperimental::Inst_HeadRead, 0, "Read from the read-head, place into ?BX?, advance read-head"),
     tInstLibEntry<tMethod>("h-write", &cHardwareExperimental::Inst_HeadWrite, 0, "Write from ?BX? to the write head, advance write-head"),
     
     tInstLibEntry<tMethod>("repro", &cHardwareExperimental::Inst_Repro, nInstFlag::STALL, "Instantly reproduces the organism"),

Modified: branches/collect/source/drivers/cDefaultRunDriver.cc
===================================================================
--- branches/collect/source/drivers/cDefaultRunDriver.cc	2008-06-10 16:39:44 UTC (rev 2633)
+++ branches/collect/source/drivers/cDefaultRunDriver.cc	2008-06-10 16:48:24 UTC (rev 2634)
@@ -123,8 +123,8 @@
       //  << "Energy: " << setw(9) << setprecision(7) << stats.GetAveEnergy() << "  "
 //        << "Merit: " << setw(9) << setprecision(7) << stats.GetAveMerit() << "  "
         << "Orgs: " << setw(6) << population.GetNumOrganisms() << "  "
-//        << "Spec: " << setw(6) << setprecision(4) << stats.GetAveSpeculative() << "  "
-//        << "SWst: " << setw(6) << setprecision(4) << (((double)stats.GetSpeculativeWaste() / (double)UD_size) * 100.0) << "%"
+        << "Spec: " << setw(6) << setprecision(4) << stats.GetAveSpeculative() << "  "
+        << "SWst: " << setw(6) << setprecision(4) << (((double)stats.GetSpeculativeWaste() / (double)UD_size) * 100.0) << "%"
 //        << "Thrd: " << setw(6) << stats.GetNumThreads() << "  "
 //        << "Para: " << stats.GetNumParasites()
         << endl;