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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-02-21 23:09:04 -0500 (Thu, 21 Feb 2008)
New Revision: 2358

Modified:
   branches/uml/source/main/cUMLModel.cc
Log:


Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2008-02-22 00:55:17 UTC (rev 2357)
+++ branches/uml/source/main/cUMLModel.cc	2008-02-22 04:09:04 UTC (rev 2358)
@@ -453,7 +453,7 @@
 	std::set<cMDEProperty*, ltcMDEProperty>::iterator mdepropiter = mdeprops.find(&e);
 	if (mdepropiter != mdeprops.end()) {
 		val = (*mdepropiter)->getEvaluationInformation();
-		//		delete e;
+		e.incCount();
 	} else {
 		e.evaluate();
 		val = e.getEvaluationInformation();
@@ -484,6 +484,7 @@
 	std::set<cMDEProperty*, ltcMDEProperty>::iterator mdepropiter = mdeprops.find(&e);
 	if (mdepropiter != mdeprops.end()) {
 		val = (*mdepropiter)->getEvaluationInformation();
+		e.incCount();
 	} else {
 		e.evaluate();
 		val = e.getEvaluationInformation();
@@ -515,6 +516,7 @@
 	std::set<cMDEProperty*, ltcMDEProperty>::iterator mdepropiter = mdeprops.find(&e);
 	if (mdepropiter != mdeprops.end()) {
 		val = (*mdepropiter)->getEvaluationInformation();
+		e.incCount();
 	} else {
 		e.evaluate();
 		val = e.getEvaluationInformation();
@@ -699,6 +701,7 @@
 	std::set<cMDEProperty*, ltcMDEProperty>::iterator mdepropiter = mdeprops.find(&e);
 	if (mdepropiter != mdeprops.end()) {
 		val = (*mdepropiter)->getEvaluationInformation();
+		e.incCount();
 	} else {
 		e.evaluate();
 		val = e.getEvaluationInformation();
@@ -729,6 +732,7 @@
 	std::set<cMDEProperty*, ltcMDEProperty>::iterator mdepropiter = mdeprops.find(&e);
 	if (mdepropiter != mdeprops.end()) {
 		val = (*mdepropiter)->getEvaluationInformation();
+		e.incCount();
 	} else {
 		e.evaluate();
 		val = e.getEvaluationInformation();