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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-04-30 12:43:19 -0400 (Wed, 30 Apr 2008)
New Revision: 2562

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


Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2008-04-30 14:17:54 UTC (rev 2561)
+++ branches/uml/source/main/cTaskLib.cc	2008-04-30 16:43:19 UTC (rev 2562)
@@ -3173,7 +3173,7 @@
 		return bonus;
 	}*/
 	if (organism->getUMLModel()->getWitnessMode()) {
-		if (organism->getUMLModel()->getBonusInfo("spinw1") <= 1)	
+		if (organism->getUMLModel()->getBonusInfo("spinw1") <  1)	
 		{ 
 			organism->getUMLModel()->setBonusInfo("spinn1", bonus);	
 			return bonus;
@@ -3239,7 +3239,7 @@
 	double bonus = 0.0;
 	
 	if (organism->getUMLModel()->getWitnessMode()) {
-		if (organism->getUMLModel()->getBonusInfo("spinw2") <= 1)	
+		if (organism->getUMLModel()->getBonusInfo("spinw2") < 1)	
 		{ 
 			organism->getUMLModel()->setBonusInfo("spinn2", bonus);	
 			return bonus;
@@ -3380,7 +3380,7 @@
 	
 	// call hydra when a // all scenario hits its max?
 	// all are non-zero?
-	if (organism->getUMLModel()->readyForHydra()) {
+//	if (organism->getUMLModel()->readyForHydra()) {
 		// print the file to output...
 //		file_name =  "file1" + m_world->GetStats().GetUpdate();
 //		file_name += "." + organism->GetID();
@@ -3391,7 +3391,7 @@
 //	if(system(strstrm.str().c_str())!=0) return 0.0;
 		organism->getUMLModel()->printUMLModelToFile(strstrm.str());
 		bonus = 1.0;
-	} 
+//	} 
 	
 	return bonus;
 }

Modified: branches/uml/source/main/cUMLModel.cc
===================================================================
--- branches/uml/source/main/cUMLModel.cc	2008-04-30 14:17:54 UTC (rev 2561)
+++ branches/uml/source/main/cUMLModel.cc	2008-04-30 16:43:19 UTC (rev 2562)
@@ -426,7 +426,7 @@
 	xmi = "";	
 	xmi = xi.xmi_begin; 
 	
-	std::cout << xi.classes_info.size() << " " << state_diagrams.size() << std::endl;
+//	std::cout << xi.classes_info.size() << " " << state_diagrams.size() << std::endl;
 	assert (xi.classes_info.size() == state_diagrams.size());
 	
 	for (unsigned int i=0; i<xi.classes_info.size(); i++) { 

Modified: branches/uml/source/main/cUMLStateDiagram.cc
===================================================================
--- branches/uml/source/main/cUMLStateDiagram.cc	2008-04-30 14:17:54 UTC (rev 2561)
+++ branches/uml/source/main/cUMLStateDiagram.cc	2008-04-30 16:43:19 UTC (rev 2562)
@@ -146,6 +146,7 @@
 			ts = tt + "[" + tg + "]" + "/" + ta;
 //			std::cout << "transition named: " << ts << std::endl;
 			
+			std::string blah = path.front();
 			
 			if (ts == path.front()) { 
 
@@ -382,6 +383,7 @@
 
 bool cUMLStateDiagram::relativeJumpTransitionLabel(int jump_amount)
 {
+	int size = transition_labels.size();
 	return relativeMoveIndex(transition_labels, trans_label_index, jump_amount);
 }
 
@@ -705,6 +707,8 @@
 	return;
 }
 
+
+// hjg: error in here. Last element not adding correctly?
 void cUMLStateDiagram::endLooping() { 
 	looping = false; 
 	
@@ -724,6 +728,7 @@
 		
 		// set up the label
 		absoluteJumpTransitionLabel(loop_trans_labels.front()); 
+		int loop_int = loop_trans_labels.front();
 		addTransitionFromLabel();
 //		std::cout << "deque front " << loop_trans_labels.front() << " " << orig << " " << dest << std::endl;
 		loop_trans_labels.pop_front();