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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-12-28 14:23:10 -0500 (Fri, 28 Dec 2007)
New Revision: 2244

Modified:
   branches/uml/source/cpu/cHardwareCPU.cc
   branches/uml/source/cpu/cHardwareCPU.h
   branches/uml/source/main/cOrganism.h
Log:


Modified: branches/uml/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.cc	2007-12-28 19:03:42 UTC (rev 2243)
+++ branches/uml/source/cpu/cHardwareCPU.cc	2007-12-28 19:23:10 UTC (rev 2244)
@@ -372,7 +372,9 @@
 /*
 	tInstLibEntry<tMethod>("addTrans", &cHardwareCPU::Inst_AddTransition, false, 
 					"Add a transition"),		
-*/								
+*/							
+	tInstLibEntry<tMethod>("addTransL", &cHardwareCPU::Inst_AddTransitionFromLabel, false, 
+							 "Add a transition without adding a label."),	  
 	tInstLibEntry<tMethod>("addTransT", &cHardwareCPU::Inst_AddTransitionTotal, false, 
 					"Add a transition without adding a label."),				
 /*	tInstLibEntry<tMethod>("jump", &cHardwareCPU::Inst_JumpIndex, false, 
@@ -4823,6 +4825,15 @@
 }
 */
 
+bool cHardwareCPU::Inst_AddTransitionFromLabel(cAvidaContext& ctx)
+{
+	if(organism->GetCellID()==-1) return false;
+	
+	//organism->modelCheck(ctx);
+	
+	return organism->getStateDiagram()->addTransitionFromLabel();
+	
+}
 
 bool cHardwareCPU::Inst_AddTransitionTotal(cAvidaContext& ctx)
 {

Modified: branches/uml/source/cpu/cHardwareCPU.h
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.h	2007-12-28 19:03:42 UTC (rev 2243)
+++ branches/uml/source/cpu/cHardwareCPU.h	2007-12-28 19:23:10 UTC (rev 2244)
@@ -557,7 +557,7 @@
 //  bool Inst_JumpIndex(cAvidaContext& ctx);
 //  bool Inst_JumpDist(cAvidaContext& ctx);
 //  bool Inst_AddTransitionLabel(cAvidaContext& ctx);
-//  bool Inst_AddTransition(cAvidaContext& ctx);
+  bool Inst_AddTransitionFromLabel(cAvidaContext& ctx);
   bool Inst_AddTransitionTotal(cAvidaContext& ctx);
 //  bool Inst_Last(cAvidaContext& ctx);
 //  bool Inst_First(cAvidaContext& ctx);

Modified: branches/uml/source/main/cOrganism.h
===================================================================
--- branches/uml/source/main/cOrganism.h	2007-12-28 19:03:42 UTC (rev 2243)
+++ branches/uml/source/main/cOrganism.h	2007-12-28 19:23:10 UTC (rev 2244)
@@ -350,6 +350,7 @@
   bool relativeJumpStateDiagram (int); 
  
   bool addTransitionTotal();
+//  bool addTransitionFromLabel();
  
 };