[Avida-SVN] r1229 - in extras: . source/testsuites

[avidaedward at myxo.css.msu.edu]

Author: avidaedward
Date: 2007-01-28 01:17:49 -0500 (Sun, 28 Jan 2007)
New Revision: 1229

Modified:
   extras/
   extras/source/testsuites/nAnalyze.cpp
Log:
 r1247 at clearly:  kaben | 2007-01-21 23:01:11 -0500
 Altered tests "cAnalyze_Brainstorm_CumulativeStemminess" and "EpochalVsContinuous" to use cAvidaConfig::LoadWithArgs() to initialize Avida.



Property changes on: extras
___________________________________________________________________
Name: svk:merge
   - 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1245
   + 079b078a-dbed-46b9-b3da-37668d4295ca:/avida/local/extras:1247

Modified: extras/source/testsuites/nAnalyze.cpp
===================================================================
--- extras/source/testsuites/nAnalyze.cpp	2007-01-28 06:17:32 UTC (rev 1228)
+++ extras/source/testsuites/nAnalyze.cpp	2007-01-28 06:17:49 UTC (rev 1229)
@@ -651,17 +651,12 @@
       /*
       Initialize
       */
-      char * argv[] = {
-        "cAnalyze_Brainstorm_CumulativeStemminess",
-        "-s",
-        "100",
-      };
-      int argc = sizeof(argv)/sizeof(char *);
+      cString arg_string("cAnalyze_Brainstorm_CumulativeStemminess,-s,100");
+      cStringList arg_list(arg_string, ',');
 
       cDriverManager::Initialize();
-      cWorld *world = new cWorld(
-        cAvidaConfig::LoadWithCmdLineArgs(argc, argv)
-      );
+      cWorld *world = new cWorld(cAvidaConfig::LoadWithArgs(arg_list));
+
       cAvidaDriver* driver = new cDefaultAnalyzeDriver(
         world,
         (world->GetConfig().ANALYZE_MODE.Get() == 2)
@@ -669,8 +664,6 @@
 
       cAnalyze& a = world->GetAnalyze();
 
-      ERROR("kgn at FIXME: hard-coded path to data files - must make configurable -");
-
       a.Send(cString("SET d ") + data_dir);
       a.Send("SET_BATCH 0");
 
@@ -918,23 +911,18 @@
       cString config_dir = settings.Setting("DevelBase") + "/support/config";
 
       ERROR("kgn at FIXME: I should verify the path to data dir -");
-      cString data_dir = settings.Setting("ExtrasBase") + "/source/testsuites/nAnalyze/Brainstorm/CumulativeStemminess/data";
+      cString data_dir = settings.Setting("ExtrasBase") + "/source/testsuites/nAnalyze/Brainstorm/EpochalVsContinuous/data";
 
 
       /*
       Initialize
       */
-      char * argv[] = {
-        "cAnalyze_Brainstorm_EpochalVsContinuous",
-        "-s",
-        "100",
-      };
-      int argc = sizeof(argv)/sizeof(char *);
+      cString arg_string("cAnalyze_Brainstorm_EpochalVsContinuous,-s,100");
+      cStringList arg_list(arg_string, ',');
 
       cDriverManager::Initialize();
-      cWorld *world = new cWorld(
-        cAvidaConfig::LoadWithCmdLineArgs(argc, argv)
-      );
+      cWorld *world = new cWorld(cAvidaConfig::LoadWithArgs(arg_list));
+
       cAvidaDriver* driver = new cDefaultAnalyzeDriver(
         world,
         (world->GetConfig().ANALYZE_MODE.Get() == 2)
@@ -942,8 +930,6 @@
 
       cAnalyze& a = world->GetAnalyze();
 
-      ERROR("kgn at FIXME: hard-coded path to data files - must make configurable -");
-
       a.Send(cString("SET d ") + data_dir);
       a.Send("SET_BATCH 0");