[Avida-SVN] r2908 - development/source/script

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2008-10-31 15:16:17 -0400 (Fri, 31 Oct 2008)
New Revision: 2908

Modified:
   development/source/script/ASAnalyzeLib.cc
   development/source/script/ASAvidaLib.cc
   development/source/script/ASAvidaNativeObjects.h
Log:
AS: Implement LoadResourceHistory

Modified: development/source/script/ASAnalyzeLib.cc
===================================================================
--- development/source/script/ASAnalyzeLib.cc	2008-10-31 18:47:53 UTC (rev 2907)
+++ development/source/script/ASAnalyzeLib.cc	2008-10-31 19:16:17 UTC (rev 2908)
@@ -39,6 +39,7 @@
 #include "cGenotypeBatch.h"
 #include "cHardwareManager.h"
 #include "cInitFile.h"
+#include "cResourceHistory.h"
 #include "cWorld.h"
 
 #include "tDataCommandManager.h"
@@ -154,6 +155,17 @@
   }
   
   
+  cResourceHistory* LoadResourceHistory(const cString& filename)
+  {
+    cDriverStatusConduit& conduit = cDriverManager::Status();
+    conduit.NotifyComment(cString("Loading: ") + filename);
+
+    cResourceHistory* resources = new cResourceHistory;
+    if (!resources->LoadFile(filename)) conduit.SignalError("failed to load resource file", 1);
+    
+    return resources;
+  }
+  
 };
 
 
@@ -171,6 +183,7 @@
   BIND_FUNCTION(cWorld, "LoadBatch", LoadBatch, cGenotypeBatch* (const cString&));
   BIND_FUNCTION(cWorld, "LoadBatchWithInstSet", LoadBatchWithInstSet, cGenotypeBatch* (const cString&, cInstSet*));
 
+  REGISTER_FUNCTION(LoadResourceHistory, cResourceHistory* (const cString&));
 
 #undef BIND_FUNCTION
 #undef REGISTER_FUNCTION

Modified: development/source/script/ASAvidaLib.cc
===================================================================
--- development/source/script/ASAvidaLib.cc	2008-10-31 18:47:53 UTC (rev 2907)
+++ development/source/script/ASAvidaLib.cc	2008-10-31 19:16:17 UTC (rev 2908)
@@ -61,6 +61,8 @@
   REGISTER_S_METHOD(cGenotypeBatch, "IsAligned", IsAligned, bool ());
   REGISTER_S_METHOD(cGenotypeBatch, "IsLineage", IsLineage, bool ());
 
+  tASNativeObject<cResourceHistory>::InitializeMethodRegistrar();
+
   tASNativeObject<cWorld>::InitializeMethodRegistrar();
   
   

Modified: development/source/script/ASAvidaNativeObjects.h
===================================================================
--- development/source/script/ASAvidaNativeObjects.h	2008-10-31 18:47:53 UTC (rev 2907)
+++ development/source/script/ASAvidaNativeObjects.h	2008-10-31 19:16:17 UTC (rev 2908)
@@ -31,11 +31,12 @@
   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("GenotypeBatch", cGenotypeBatch);
-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("ResourceHistory", cResourceHistory);
+AS_DECLARE_NATIVE_OBJECT("World",           cWorld);
 
 #undef AS_DECLARE_NATIVE_OBJECT