[Avida-cvs] [avida-svn] r606 - in development/source: . analyze drivers third-party

[brysonda@myxo.css.msu.edu]

Author: brysonda
Date: 2006-04-12 20:27:41 -0400 (Wed, 12 Apr 2006)
New Revision: 606

Removed:
   development/source/qt-viewer/
   development/source/third-party/Loki/
   development/source/third-party/yaktest/
Modified:
   development/source/analyze/cAnalyze.cc
   development/source/analyze/cAnalyzeJobWorker.cc
   development/source/drivers/cDefaultAnalyzeDriver.cc
Log:
Ensure that AnalyzeMode flag is properly set and kept in Default and Worker contexts.

Remove old qt-viewer and yaktest.

Modified: development/source/analyze/cAnalyze.cc
===================================================================
--- development/source/analyze/cAnalyze.cc	2006-04-12 20:03:12 UTC (rev 605)
+++ development/source/analyze/cAnalyze.cc	2006-04-13 00:27:41 UTC (rev 606)
@@ -111,6 +111,9 @@
 
 void cAnalyze::RunFile(cString filename)
 {
+  bool saved_analyze = m_world->GetDefaultContext().GetAnalyzeMode();
+  m_world->GetDefaultContext().SetAnalyzeMode();
+
   cInitFile analyze_file(filename);
   analyze_file.Load();
   analyze_file.Compress();
@@ -118,6 +121,8 @@
   
   LoadCommandList(analyze_file, command_list);
   ProcessCommands(command_list);
+  
+  if (!saved_analyze) m_world->GetDefaultContext().ClearAnalyzeMode();
 }
 
 //////////////// Loading methods...
@@ -7827,6 +7832,9 @@
 
 void cAnalyze::RunInteractive()
 {
+  bool saved_analyze = m_world->GetDefaultContext().GetAnalyzeMode();
+  m_world->GetDefaultContext().SetAnalyzeMode();
+  
   cout << "Entering interactive mode..." << endl;
   
   char text_input[2048];
@@ -7869,4 +7877,6 @@
     // Otherwise, give an error.
     else cerr << "Error: Unknown command '" << command << "'." << endl;
   }
+  
+  if (!saved_analyze) m_world->GetDefaultContext().ClearAnalyzeMode();
 }

Modified: development/source/analyze/cAnalyzeJobWorker.cc
===================================================================
--- development/source/analyze/cAnalyzeJobWorker.cc	2006-04-12 20:03:12 UTC (rev 605)
+++ development/source/analyze/cAnalyzeJobWorker.cc	2006-04-13 00:27:41 UTC (rev 606)
@@ -15,6 +15,8 @@
 void cAnalyzeJobWorker::Run()
 {
   cAvidaContext ctx(NULL);
+  ctx.SetAnalyzeMode();
+  
   cAnalyzeJob* job = NULL;
   
   while (1) {

Modified: development/source/drivers/cDefaultAnalyzeDriver.cc
===================================================================
--- development/source/drivers/cDefaultAnalyzeDriver.cc	2006-04-12 20:03:12 UTC (rev 605)
+++ development/source/drivers/cDefaultAnalyzeDriver.cc	2006-04-13 00:27:41 UTC (rev 606)
@@ -35,12 +35,10 @@
 
 void cDefaultAnalyzeDriver::Run()
 {
-  m_world->GetDefaultContext().SetAnalyzeMode();
   cout << "In analyze mode!!" << endl;
   cAnalyze& analyze = m_world->GetAnalyze();
   analyze.RunFile(m_world->GetConfig().ANALYZE_FILE.Get());
   if (m_interactive == true) analyze.RunInteractive();
-  m_world->GetDefaultContext().ClearAnalyzeMode();
 }
 
 void cDefaultAnalyzeDriver::RaiseException(const cString& in_string)