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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2006-12-27 13:06:39 -0500 (Wed, 27 Dec 2006)
New Revision: 1154

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


Modified: branches/uml/source/main/cOrganism.cc
===================================================================
--- branches/uml/source/main/cOrganism.cc	2006-12-25 18:23:07 UTC (rev 1153)
+++ branches/uml/source/main/cOrganism.cc	2006-12-27 18:06:39 UTC (rev 1154)
@@ -894,7 +894,7 @@
 	//oei e1, e2;
 	int trans_label;
 	int dest_state;
-	std::string temp;
+	std::string temp, temp1, temp2;
 	int tempint;
 	
 	InitTransForXMI();
@@ -947,7 +947,9 @@
 		// info determined from the trans itself....
 		trans_label = uml_state_diagram[*e].edge_label;
 		temp = "t" + StringifyAnInt(uml_state_diagram[*e].edge_label);
-		
+		temp1 = "s" + StringifyAnInt(uml_state_diagram[*e].start_state);
+		temp2 = "s" + StringifyAnInt(uml_state_diagram[*e].end_state);
+		temp = temp + temp1 + temp2;
 		// if I manage to set edge_info, I could then use that to print...
 		// currently the start state and end state are already encoded. :)
 		
@@ -957,10 +959,10 @@
 //		temp += "s" + StringifyAnInt(target(e, uml_state_diagram));
 
 		xmi+= "<UML:Transition xmi.id=\"" + temp + "\"";
-		temp = "s" + StringifyAnInt(uml_state_diagram[*e].start_state);
-		xmi+= " source=\"" + temp + "\"";
-		temp = "s" + StringifyAnInt(uml_state_diagram[*e].end_state);
-		xmi += " target=\"" + temp + "\" name=\"\" isSpecification=\"false\">\n";
+		//temp = "s" + StringifyAnInt(uml_state_diagram[*e].start_state);
+		xmi+= " source=\"" + temp1 + "\"";
+		//temp = "s" + StringifyAnInt(uml_state_diagram[*e].end_state);
+		xmi += " target=\"" + temp2 + "\" name=\"\" isSpecification=\"false\">\n";
 		
 		
 		temp = transGuardActionInfo[trans_label];
@@ -1020,9 +1022,9 @@
 //	cout << "END PRINT XMI" << endl;
 //	std::string temp = hil;
 
-	cout << "PRINT XMI" << endl;
-	cout << temp << endl;
-	cout << "END PRINT XMI" <<endl;
+//	cout << "PRINT XMI" << endl;
+//	cout << temp << endl;
+//	cout << "END PRINT XMI" <<endl;
 	return (xmi_begin + xmi + xmi_end);
 }