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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-02-21 16:03:10 -0500 (Thu, 21 Feb 2008)
New Revision: 2354

Modified:
   branches/uml/source/main/cMDEAbsenceProperty.cc
   branches/uml/source/main/cMDEProperty.cc
   branches/uml/source/main/cMDEProperty.h
   branches/uml/source/main/cMDEUniversalProperty.cc
   branches/uml/source/main/cUMLModel.cc
Log:


Modified: branches/uml/source/main/cMDEAbsenceProperty.cc
===================================================================
--- branches/uml/source/main/cMDEAbsenceProperty.cc	2008-02-21 16:43:48 UTC (rev 2353)
+++ branches/uml/source/main/cMDEAbsenceProperty.cc	2008-02-21 21:03:10 UTC (rev 2354)
@@ -69,6 +69,8 @@
 void cMDEAbsenceProperty::evaluate()
 {
 	float verify_reward = 0;
+	_count =1;
+
 	
 	// print the property
 	print();

Modified: branches/uml/source/main/cMDEProperty.cc
===================================================================
--- branches/uml/source/main/cMDEProperty.cc	2008-02-21 16:43:48 UTC (rev 2353)
+++ branches/uml/source/main/cMDEProperty.cc	2008-02-21 21:03:10 UTC (rev 2354)
@@ -62,6 +62,7 @@
 	float verify_reward = 0;
 	std::string cmd;
 	std::string work_prop = "properties_that_passed";
+	_count =1;
 
 	
 	// print the witness property

Modified: branches/uml/source/main/cMDEProperty.h
===================================================================
--- branches/uml/source/main/cMDEProperty.h	2008-02-21 16:43:48 UTC (rev 2353)
+++ branches/uml/source/main/cMDEProperty.h	2008-02-21 21:03:10 UTC (rev 2354)
@@ -41,6 +41,8 @@
 	std::string getMDEPropertyName() { return _name; } 
 	void setEvaluationInformation (float eval) { _reward = eval; }
 	float getEvaluationInformation() { return _reward; }
+	void incCount() { _count++; }
+	int getCount() {return _count; }
 		
 protected:
 	std::string _name;
@@ -50,6 +52,7 @@
 	std::string _witness_file_name; // = "tmp-witness.pr";
 	std::string _properties; // = "properties_that_passed";
 	std::string _promela; 
+	int _count; 
 	
 };
 

Modified: branches/uml/source/main/cMDEUniversalProperty.cc
===================================================================
--- branches/uml/source/main/cMDEUniversalProperty.cc	2008-02-21 16:43:48 UTC (rev 2353)
+++ branches/uml/source/main/cMDEUniversalProperty.cc	2008-02-21 21:03:10 UTC (rev 2354)
@@ -70,6 +70,8 @@
 void cMDEUniversalProperty::evaluate()
 {
 	float verify_reward = 0;
+	_count =1;
+
 	
 	// print the property
 	print();

Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2008-02-21 16:43:48 UTC (rev 2353)
+++ branches/uml/source/main/cUMLModel.cc	2008-02-21 21:03:10 UTC (rev 2354)
@@ -467,6 +467,7 @@
 		}
 	}
 	
+	val = (val / e.getCount()); 
 	return val;
 }
 
@@ -496,6 +497,7 @@
 		}
 	}
 	
+	val = (val / e.getCount()); 
 	return val;
 	
 }
@@ -526,6 +528,7 @@
 		}
 	}
 	
+	val = (val / e.getCount()); 
 	return val;
 	
 }
@@ -708,6 +711,8 @@
 			m_response_property_failure++;
 		}
 	}
+	
+	val = (val / e.getCount()); 
 	return val;
 }
 
@@ -736,6 +741,8 @@
 			m_precedence_property_failure++;
 		}
 	}
+	
+	val = (val / e.getCount()); 
 	return val;	
 	
 }