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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-03-04 07:53:54 -0500 (Tue, 04 Mar 2008)
New Revision: 2419

Modified:
   branches/uml/source/main/cMDECompoundExpression.h
   branches/uml/source/main/cMDEPropertyGenerator.cc
   branches/uml/source/main/cMDESimpleOperationExpression.h
Log:


Modified: branches/uml/source/main/cMDECompoundExpression.h
===================================================================
--- branches/uml/source/main/cMDECompoundExpression.h	2008-03-04 03:47:53 UTC (rev 2418)
+++ branches/uml/source/main/cMDECompoundExpression.h	2008-03-04 12:53:54 UTC (rev 2419)
@@ -65,7 +65,7 @@
 	void interestingExpressionEval() { 
 		// Currently, the interesting reward is evaluated based on: 
 		// - whether it includes one of the significant variables/operations
-		float temp;
+		float temp =0;
 		
 		// Check to see if the expressions use suspend or restart operations
 		temp += _exp_1->usesOperation("suspend") + _exp_1->usesOperation("restart");

Modified: branches/uml/source/main/cMDEPropertyGenerator.cc
===================================================================
--- branches/uml/source/main/cMDEPropertyGenerator.cc	2008-03-04 03:47:53 UTC (rev 2418)
+++ branches/uml/source/main/cMDEPropertyGenerator.cc	2008-03-04 12:53:54 UTC (rev 2419)
@@ -54,7 +54,7 @@
 {
 	// a pointer to the existence property
 	float val = 0;	
-	float interesting = (i/5) + 1; // 1 point for an existence property.
+	float interesting = i + 1; // 1 point for an existence property.
 	
 	cMDEExistenceProperty e(s);
 	
@@ -90,7 +90,7 @@
 {
 	// a pointer to the absence property
 	float val = 0;
-	float interesting = (i/5) + 3; // 3 points for an absence property.
+	float interesting = i + 3; // 3 points for an absence property.
 
 	cMDEAbsenceProperty e(s);
 	
@@ -124,7 +124,7 @@
 {
 	// a pointer to the universal property
 	float val = 0;	
-	float interesting = (i/5) + 3; // 3 points for a universal property.
+	float interesting = i + 3; // 3 points for a universal property.
 
 	cMDEUniversalProperty e(s);
 	
@@ -162,7 +162,7 @@
 {
 	// a pointer to the universal property
 	float val = 0;	
-	float interesting = (i/5) + 2; // 2 points for a response property.
+	float interesting = i + 2; // 2 points for a response property.
 
 	cMDEResponseProperty e(s1, s2);
 	
@@ -198,7 +198,7 @@
 {
 	// a pointer to the universal property
 	float val = 0;	
-	float interesting = (i/5) + 2; // 2 points for a precedence property.
+	float interesting = i + 2; // 2 points for a precedence property.
 
 	cMDEPrecedenceProperty e(s1, s2);
 	

Modified: branches/uml/source/main/cMDESimpleOperationExpression.h
===================================================================
--- branches/uml/source/main/cMDESimpleOperationExpression.h	2008-03-04 03:47:53 UTC (rev 2418)
+++ branches/uml/source/main/cMDESimpleOperationExpression.h	2008-03-04 12:53:54 UTC (rev 2419)
@@ -38,7 +38,7 @@
 	void interestingExpressionEval() { 
 		// Currently, the interesting reward is evaluated based on: 
 		// - whether it includes one of the significant variables/operations
-		float temp;
+		float temp =0;
 		// Check to see if the expressions use suspend or restart operations
 		temp += usesOperation("suspend") + usesOperation("restart");
 		_interesting = temp;