[Avida-SVN] r1934 - in branches/uml/source: cpu main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-08-14 16:07:28 -0400 (Tue, 14 Aug 2007)
New Revision: 1934

Modified:
   branches/uml/source/cpu/cHardwareCPU.cc
   branches/uml/source/cpu/cHardwareCPU.h
   branches/uml/source/main/cUMLModel.cc
Log:
Added instruction support for third state diagram. 



Modified: branches/uml/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.cc	2007-08-14 01:59:01 UTC (rev 1933)
+++ branches/uml/source/cpu/cHardwareCPU.cc	2007-08-14 20:07:28 UTC (rev 1934)
@@ -388,6 +388,8 @@
 					"Change to state diagram 0"),				
 	tInstLibEntry<tMethod>("sd-1", &cHardwareCPU::Inst_StateDiag1, false, 
 					"Change to state diagram 1"),				
+	tInstLibEntry<tMethod>("sd-2", &cHardwareCPU::Inst_StateDiag2, false, 
+							 "Change to state diagram 2"),
 	tInstLibEntry<tMethod>("s-orig-0", &cHardwareCPU::Inst_OrigState0, false, 
 					"Change the origin to state 0"),
 	tInstLibEntry<tMethod>("s-orig-1", &cHardwareCPU::Inst_OrigState1, false, 
@@ -4824,6 +4826,9 @@
 
 bool cHardwareCPU::Inst_StateDiag1(cAvidaContext& ctx)
 { return (organism->absoluteJumpStateDiagram(1)); }
+
+bool cHardwareCPU::Inst_StateDiag2(cAvidaContext& ctx)
+{ return (organism->absoluteJumpStateDiagram(2)); }
   
 bool cHardwareCPU::Inst_OrigState0(cAvidaContext& ctx)
 { return (organism->getStateDiagram()->absoluteJumpOriginState(0)); }

Modified: branches/uml/source/cpu/cHardwareCPU.h
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.h	2007-08-14 01:59:01 UTC (rev 1933)
+++ branches/uml/source/cpu/cHardwareCPU.h	2007-08-14 20:07:28 UTC (rev 1934)
@@ -561,6 +561,7 @@
   
   bool Inst_StateDiag0(cAvidaContext& ctx);
   bool Inst_StateDiag1(cAvidaContext& ctx);
+  bool Inst_StateDiag2(cAvidaContext& ctx);
   
   bool Inst_OrigState0(cAvidaContext& ctx);
   bool Inst_OrigState1(cAvidaContext& ctx);

Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2007-08-14 01:59:01 UTC (rev 1933)
+++ branches/uml/source/main/cUMLModel.cc	2007-08-14 20:07:28 UTC (rev 1934)
@@ -299,7 +299,7 @@
 ////			std::cout << "scenario incomplete " << std::endl;
 //
 //		}
-		scenario_completion[i] = temp_bonus / complete_bonus;
+	scenario_completion[i] = temp_bonus / complete_bonus;
 	}
 		
 	return total_bonus;