[Avida-SVN] r2286 - in branches/uml/source: cpu main

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-01-29 09:41:47 -0500 (Tue, 29 Jan 2008)
New Revision: 2286

Modified:
   branches/uml/source/cpu/cHardwareCPU.cc
   branches/uml/source/main/cMDEResponseProperty.cc
   branches/uml/source/main/cStats.cc
Log:
Fixed the response property bug and the stats reporting for properties bug. 




Modified: branches/uml/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.cc	2008-01-28 12:54:10 UTC (rev 2285)
+++ branches/uml/source/cpu/cHardwareCPU.cc	2008-01-29 14:41:47 UTC (rev 2286)
@@ -5164,7 +5164,7 @@
 	std::string p = organism->getUMLModel()->getP();
 	std::string q = organism->getUMLModel()->getQ();
 	
-	if ((p != "<null>") && (q != "<null>")) {
+	if (p != q) {
 		val = m_world->GetPopulation().getUMLModel()->addPrecedenceProperty(p, q);
 	}
 	
@@ -5180,7 +5180,7 @@
 	std::string p = organism->getUMLModel()->getP();
 	std::string q = organism->getUMLModel()->getQ();
 	
-	if ((p != "<null>") && (q != "<null>")) {
+	if (p != q) {
 		val = m_world->GetPopulation().getUMLModel()->addResponseProperty(p, q);
 	}
 	

Modified: branches/uml/source/main/cMDEResponseProperty.cc
===================================================================
--- branches/uml/source/main/cMDEResponseProperty.cc	2008-01-28 12:54:10 UTC (rev 2285)
+++ branches/uml/source/main/cMDEResponseProperty.cc	2008-01-29 14:41:47 UTC (rev 2286)
@@ -22,7 +22,7 @@
 	outfile << "never {  /*  !([](p -> <>s))  */ " << std::endl;
 	outfile << "T0_init:" << std::endl;
 	outfile << "if" << std::endl;
-	outfile << "(! ((s)) && (p)) -> goto accept_S4" << std::endl;
+	outfile << ":: (! ((s)) && (p)) -> goto accept_S4" << std::endl;
 	outfile << ":: (1) -> goto T0_init" << std::endl;
 	outfile << "fi;" << std::endl;
 	outfile << "accept_S4:" << std::endl;

Modified: branches/uml/source/main/cStats.cc
===================================================================
--- branches/uml/source/main/cStats.cc	2008-01-28 12:54:10 UTC (rev 2285)
+++ branches/uml/source/main/cStats.cc	2008-01-29 14:41:47 UTC (rev 2286)
@@ -208,6 +208,26 @@
   }
   // End sense tracking initialization
   
+  // initialize UML property values
+  m_propertySuccess =0;
+  m_propertyFailure =0;
+  m_propertyTotal = 0;
+  m_absPropertySuccess =0; 
+  m_absPropertyFailure =0;
+  m_absPropertyTotal =0;
+  m_uniPropertySuccess =0; 
+  m_uniPropertyFailure =0;
+  m_uniPropertyTotal =0;
+  m_existPropertySuccess =0; 
+  m_existPropertyFailure =0; 
+  m_existPropertyTotal =0; 
+  m_precPropertySuccess =0; 
+  m_precPropertyFailure =0; 
+  m_precPropertyTotal =0; 
+  m_respPropertySuccess =0; 
+  m_respPropertyFailure =0; 
+  m_respPropertyTotal =0; 
+  
   genotype_map.Resize( m_world->GetConfig().WORLD_X.Get() * m_world->GetConfig().WORLD_Y.Get() );
   SetupPrintDatabase();
 }