[Avida-SVN] r2864 - in development/source: analyze script

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2008-10-21 16:29:43 -0400 (Tue, 21 Oct 2008)
New Revision: 2864

Modified:
   development/source/analyze/cAnalyze.cc
   development/source/analyze/cAnalyze.h
   development/source/analyze/cGenotypeBatch.h
   development/source/script/ASAvidaLib.cc
   development/source/script/ASAvidaNativeObjects.h
Log:
AS: add cGenotypeBatch
cAnalyze: remove long unimplemented command

Modified: development/source/analyze/cAnalyze.cc
===================================================================
--- development/source/analyze/cAnalyze.cc	2008-10-21 20:08:50 UTC (rev 2863)
+++ development/source/analyze/cAnalyze.cc	2008-10-21 20:29:43 UTC (rev 2864)
@@ -413,12 +413,6 @@
   batch[cur_batch].SetAligned(false);
 }
 
-void cAnalyze::LoadDominant(cString cur_string)
-{
-  (void) cur_string;
-  cerr << "Warning: \"LOAD_DOMINANT\" not implemented yet!"<<endl;
-}
-
 // Clears the current time oriented list of resources and loads in a new one
 // from a file specified by the user, or resource.dat by default.
 void cAnalyze::LoadResources(cString cur_string)
@@ -9207,7 +9201,6 @@
   AddLibraryDef("LOAD_DETAIL_DUMP", &cAnalyze::LoadDetailDump);
   AddLibraryDef("LOAD_MULTI_DETAIL", &cAnalyze::LoadMultiDetail);
   AddLibraryDef("LOAD_SEQUENCE", &cAnalyze::LoadSequence);
-  AddLibraryDef("LOAD_DOMINANT", &cAnalyze::LoadDominant);
   AddLibraryDef("LOAD_RESOURCES", &cAnalyze::LoadResources);
   AddLibraryDef("LOAD", &cAnalyze::LoadFile);
   

Modified: development/source/analyze/cAnalyze.h
===================================================================
--- development/source/analyze/cAnalyze.h	2008-10-21 20:08:50 UTC (rev 2863)
+++ development/source/analyze/cAnalyze.h	2008-10-21 20:29:43 UTC (rev 2864)
@@ -218,7 +218,6 @@
   void LoadDetailDump(cString cur_string);
   void LoadMultiDetail(cString cur_string);
   void LoadSequence(cString cur_string);
-  void LoadDominant(cString cur_string);
   // Clears the current time oriented list of resources and loads in a new one
   // from a file specified by the user, or resource.dat by default.
   void LoadResources(cString cur_string);

Modified: development/source/analyze/cGenotypeBatch.h
===================================================================
--- development/source/analyze/cGenotypeBatch.h	2008-10-21 20:08:50 UTC (rev 2863)
+++ development/source/analyze/cGenotypeBatch.h	2008-10-21 20:29:43 UTC (rev 2864)
@@ -51,7 +51,8 @@
   ~cGenotypeBatch() { ; }
 
   tListPlus<cAnalyzeGenotype> & List() { return genotype_list; }
-  cString & Name() { return name; }
+  cString& Name() { return name; }
+  const cString& GetName() { return name; }
   bool IsLineage() { return is_lineage; }
   bool IsAligned() { return is_aligned; }
 

Modified: development/source/script/ASAvidaLib.cc
===================================================================
--- development/source/script/ASAvidaLib.cc	2008-10-21 20:08:50 UTC (rev 2863)
+++ development/source/script/ASAvidaLib.cc	2008-10-21 20:29:43 UTC (rev 2864)
@@ -31,6 +31,7 @@
 
 #include "cAvidaConfig.h"
 #include "cDefaultRunDriver.h"
+#include "cGenotypeBatch.h"
 #include "cWorld.h"
 
 #include <cstring>
@@ -55,6 +56,11 @@
   REGISTER_S_METHOD(cDefaultRunDriver, "Run", Run, void ());
 
   
+  tASNativeObject<cGenotypeBatch>::InitializeMethodRegistrar();
+  REGISTER_S_METHOD(cGenotypeBatch, "Name", GetName, const cString& ());
+  REGISTER_S_METHOD(cGenotypeBatch, "IsAligned", IsAligned, bool ());
+  REGISTER_S_METHOD(cGenotypeBatch, "IsLineage", IsLineage, bool ());
+
   tASNativeObject<cWorld>::InitializeMethodRegistrar();
   
   

Modified: development/source/script/ASAvidaNativeObjects.h
===================================================================
--- development/source/script/ASAvidaNativeObjects.h	2008-10-21 20:08:50 UTC (rev 2863)
+++ development/source/script/ASAvidaNativeObjects.h	2008-10-21 20:29:43 UTC (rev 2864)
@@ -31,10 +31,11 @@
   class CLASS; \
   namespace AvidaScript { template<> inline sASTypeInfo TypeOf<CLASS*>() { return sASTypeInfo(AS_TYPE_OBJECT_REF, NAME); } }
 
-AS_DECLARE_NATIVE_OBJECT("Config",    cAvidaConfig);
-AS_DECLARE_NATIVE_OBJECT("Driver",    cDefaultRunDriver);
-AS_DECLARE_NATIVE_OBJECT("Genotype",  cAnalyzeGenotype);
-AS_DECLARE_NATIVE_OBJECT("World",     cWorld);
+AS_DECLARE_NATIVE_OBJECT("Config",        cAvidaConfig);
+AS_DECLARE_NATIVE_OBJECT("Driver",        cDefaultRunDriver);
+AS_DECLARE_NATIVE_OBJECT("Genotype",      cAnalyzeGenotype);
+AS_DECLARE_NATIVE_OBJECT("GenotypeBatch", cGenotypeBatch);
+AS_DECLARE_NATIVE_OBJECT("World",         cWorld);
 
 #undef AS_DECLARE_NATIVE_OBJECT