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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2006-12-20 18:09:39 -0500 (Wed, 20 Dec 2006)
New Revision: 1151

Modified:
   branches/uml/source/main/cOrganism.cc
Log:
Bugfix related to XMI generation. 



Modified: branches/uml/source/main/cOrganism.cc
===================================================================
--- branches/uml/source/main/cOrganism.cc	2006-12-20 03:00:46 UTC (rev 1150)
+++ branches/uml/source/main/cOrganism.cc	2006-12-20 23:09:39 UTC (rev 1151)
@@ -750,16 +750,21 @@
 	// loop through all states
 	// print initial information for the init state.
 	//cout << "Num states: " << NumStates() << endl;
+
+	tie(i, iend) = vertices(uml_state_diagram);
+	
 	if (NumStates() > 0) {
 		//cout << "Initial \"\" " << uml_state_diagram[0].state_label << endl;
-	/*	hil += "Initial \"\" s"; 
+	//	hil += "Initial \"\" s"; 
 		temp = StringifyAnInt(uml_state_diagram[0].state_label);
-		hil += temp;
-		hil += " ; \n"; */
-		xmi += "<UML:Pseudostate xmi.id=\"s0\" kind=\"initial\" outgoing=\"\" name=\"\" isSpecification=\"false\"/>\n";
+	//	hil += temp;
+	//	hil += " ; \n"; */
+		xmi += "<UML:Pseudostate xmi.id=\"s" + temp + "\" kind=\"initial\" outgoing=\"\" name=\"\" isSpecification=\"false\"/>\n";
+		++i;
 	}
 	
-	for (tie(i, iend) = vertices(uml_state_diagram); i != iend; ++i) {
+	
+	for (; i != iend; ++i) {
 //		cout << "State " << uml_state_diagram[*i].state_label << " { " << endl;
 /*		hil += "State s";
 		temp = StringifyAnInt(uml_state_diagram[*i].state_label);
@@ -831,7 +836,7 @@
 	*/
 
 
-	//cout << "XMI : " << xmi << endl;
+	cout << "XMI : " << xmi << endl;
 }