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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-02-13 14:29:17 -0500 (Wed, 13 Feb 2008)
New Revision: 2324

Modified:
   branches/uml/source/main/cUMLModel.cc
Log:
fixed bug in attributes. 



Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2008-02-13 13:59:36 UTC (rev 2323)
+++ branches/uml/source/main/cUMLModel.cc	2008-02-13 19:29:17 UTC (rev 2324)
@@ -114,9 +114,9 @@
 		} else if (line == "==ATTRIBUTES==") {
 			line.erase();
 			infile >> att_name;
-			att_vals.clear();
 			while (att_name != "==END==") { 
 				infile >> att_type >> temp1 >> att_val;
+				att_vals.clear();
 			//	std::cout << "attribute " << att_name << " " << att_type << std::endl;
 				while (att_val != "]") { // && att_val != "==END=CLASS==") { 
 					att_vals.push_back(att_val);
@@ -566,6 +566,19 @@
 				temp3 = temp1 + "!=" + temp2;
 				//std::cout << temp3 << std::endl;
 				addExpression(temp3, c.getAssociatedClasses());
+				
+				temp3 = temp1 + ">" + temp2;
+				addExpression(temp3, c.getAssociatedClasses());
+
+				temp3 = temp1 + "<" + temp2;
+				addExpression(temp3, c.getAssociatedClasses());
+				
+				temp3 = temp1 + ">=" + temp2;
+				addExpression(temp3, c.getAssociatedClasses());
+				
+				temp3 = temp1 + "<=" + temp2;
+				addExpression(temp3, c.getAssociatedClasses());
+				
 			}
 		}