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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2008-01-27 09:47:33 -0500 (Sun, 27 Jan 2008)
New Revision: 2281

Modified:
   branches/uml/source/cpu/cHardwareCPU.cc
   branches/uml/source/main/cMDEPrecedenceProperty.cc
   branches/uml/source/main/cMDEResponseProperty.cc
Log:


Modified: branches/uml/source/cpu/cHardwareCPU.cc
===================================================================
--- branches/uml/source/cpu/cHardwareCPU.cc	2008-01-26 23:01:54 UTC (rev 2280)
+++ branches/uml/source/cpu/cHardwareCPU.cc	2008-01-27 14:47:33 UTC (rev 2281)
@@ -5164,7 +5164,7 @@
 	std::string p = organism->getUMLModel()->getP();
 	std::string q = organism->getUMLModel()->getQ();
 	
-	if (p != "<null>" && q != "<null>") {
+	if ((p != "<null>") && (q != "<null>")) {
 		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 != "<null>") && (q != "<null>")) {
 		val = m_world->GetPopulation().getUMLModel()->addResponseProperty(p, q);
 	}
 	

Modified: branches/uml/source/main/cMDEPrecedenceProperty.cc
===================================================================
--- branches/uml/source/main/cMDEPrecedenceProperty.cc	2008-01-26 23:01:54 UTC (rev 2280)
+++ branches/uml/source/main/cMDEPrecedenceProperty.cc	2008-01-27 14:47:33 UTC (rev 2281)
@@ -15,6 +15,9 @@
 	outfile.open ("property");
 	assert(outfile.is_open());
 	
+	outfile << "/* Precedence property " << _expr_p  << " " << _expr_q << "*/" << std::endl;
+	outfile << "#define s (" << _expr_q << ")" << std::endl;
+	outfile << "#define p (" << _expr_p << ")" << std::endl;
 	outfile << "never {    /*  !(([](!p)) || ((!p) U  s))  */" << std::endl;
 	outfile << "T0_init:" << std::endl;
 	outfile << "if" << std::endl;

Modified: branches/uml/source/main/cMDEResponseProperty.cc
===================================================================
--- branches/uml/source/main/cMDEResponseProperty.cc	2008-01-26 23:01:54 UTC (rev 2280)
+++ branches/uml/source/main/cMDEResponseProperty.cc	2008-01-27 14:47:33 UTC (rev 2281)
@@ -17,7 +17,7 @@
 	assert(outfile.is_open());
 	
 	outfile << "/* Response property " << _expr_p  << " " << _expr_q << "*/" << std::endl;
-	outfile << "#define q (" << _expr_q << ")" << std::endl;
+	outfile << "#define s (" << _expr_q << ")" << std::endl;
 	outfile << "#define p (" << _expr_p << ")" << std::endl;
 	outfile << "never {  /*  !([](p -> <>s))  */ " << std::endl;
 	outfile << "T0_init:" << std::endl;
@@ -41,6 +41,7 @@
 	outfile.open (file_name.c_str());
 	assert(outfile.is_open());
 	
+	outfile << "/* Response property " << _expr_p  << " " << _expr_q << "*/" << std::endl;
 	outfile << "#define s (" << _expr_q << ")" << std::endl;
 	outfile << "#define p (" << _expr_p << ")" << std::endl;
 	outfile << "never {    /* !(!(<>(p && <>s))) */" << std::endl;