[Avida-SVN] r1184 - branches/uml/source/main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-01-12 09:29:27 -0500 (Fri, 12 Jan 2007)
New Revision: 1184

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


Modified: branches/uml/source/main/cOrganism.cc
===================================================================
--- branches/uml/source/main/cOrganism.cc	2007-01-12 03:19:20 UTC (rev 1183)
+++ branches/uml/source/main/cOrganism.cc	2007-01-12 14:29:27 UTC (rev 1184)
@@ -1220,6 +1220,11 @@
 	return (double) num_edges(uml_state_diagram);
 }
 
+double cOrganism::NumUniqueTransLabels() 
+{
+	return transGuardActionInfo.size();
+}
+
 std::string cOrganism::getXMI()
 {
 //	std::string temp = xmi_begin + xmi + xmi_end;

Modified: branches/uml/source/main/cOrganism.h
===================================================================
--- branches/uml/source/main/cOrganism.h	2007-01-12 03:19:20 UTC (rev 1183)
+++ branches/uml/source/main/cOrganism.h	2007-01-12 14:29:27 UTC (rev 1184)
@@ -249,6 +249,7 @@
   bool AddTrans(int trans, int orig, int dest);
   double NumStates();
   double NumTrans();
+  double NumUniqueTransLabels(); 
   void AssignTransMeaning(int trans);
   Graph& GetGraph();
   State& getStateInPosition (int num);

Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-01-12 03:19:20 UTC (rev 1183)
+++ branches/uml/source/main/cTaskLib.cc	2007-01-12 14:29:27 UTC (rev 1184)
@@ -1983,7 +1983,7 @@
 	double bonus = 0.0;
 
 	//if (ctx->organism->findTrans(1, 4, 4)) { 
-	if (ctx->organism->NumTrans() > 4) {
+	if (ctx->organism->NumUniqueTransLabels() > 4) {
 
 		bonus = 1.0;
 	}