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

[hjg at myxo.css.msu.edu]

Author: hjg
Date: 2007-01-23 11:01:13 -0500 (Tue, 23 Jan 2007)
New Revision: 1198

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


Modified: branches/uml/source/main/cOrganism.cc
===================================================================
--- branches/uml/source/main/cOrganism.cc	2007-01-23 16:00:09 UTC (rev 1197)
+++ branches/uml/source/main/cOrganism.cc	2007-01-23 16:01:13 UTC (rev 1198)
@@ -100,7 +100,12 @@
   
   if (m_world->GetConfig().NET_ENABLED.Get()) m_net = new cNetSupport();
   m_id = m_world->GetStats().GetTotCreatures();
-  
+ 
+  // create in-memory representation of model
+  AddTrans(0,0,1);
+  AddTrans(1,1,2);
+  AddTrans(2,2,3);
+  AddTrans(3,3,1);
 	
 }
 
@@ -855,6 +860,9 @@
 void cOrganism::deleteTrans(int pos) 
 {
 
+
+
+/*
 	Graph::edge_iterator e, eend, q;
 	int count = 0;
 	int num_trans_w_lab = 0;
@@ -922,8 +930,8 @@
 	if ((s_start_lab != s_end_lab) && (out_degree(*st_end, uml_state_diagram) == 0) && (in_degree(*st_end, uml_state_diagram) == 0)) {
 		remove_vertex(*st_end, uml_state_diagram);
 	}	
+*/	
 	
-	
 	return;
 }
 

Modified: branches/uml/source/main/cTaskLib.cc
===================================================================
--- branches/uml/source/main/cTaskLib.cc	2007-01-23 16:00:09 UTC (rev 1197)
+++ branches/uml/source/main/cTaskLib.cc	2007-01-23 16:01:13 UTC (rev 1198)
@@ -2274,8 +2274,9 @@
 	m_world->GetStats().PanAttempt();
 	//-e -n -a -w19  -m100000 -c1
 //	if(system("/usr/bin/gcc pan.c -e -o pan &> /dev/null")!=0) return 0.0;
-//	if(system("./pan -a &> ./pan.out")!=0) return 0.0;
-	if(system("/usr/bin/gcc pan.c -o pan &> /dev/null")!=0) return 0.0;
+//	if(system("./pan -a &> ./pan.out")!=0) return 0.0;  
+// -DMEMLIM=256
+	if(system("/usr/bin/gcc -DMEMLIM=512 pan.c -o pan &> /dev/null")!=0) return 0.0;
 	if(system("./pan -a &> ./pan.out")!=0) return 0.0;
 	if(system("cat pan.out | perl -e 'while(<STDIN>) { if(/errors:\\s(\\d+)/) {exit($1);}}'")!=0) return 0.0;
 	//cmd = "cp tmp.xmi " + organism->GetGenotype()->GetID() + ".xml";