Fix examples to use the new interfaces

meseretb · Oct 3, 2013 · 6c0bba4 · 6c0bba4
1 parent 75d3dba
commit 6c0bba4
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/examples/hopfield/HopfieldServer.cc b/examples/hopfield/HopfieldServer.cc
@@ -229,8 +229,6 @@ HopfieldServer::HopfieldServer()
 HopfieldServer::~HopfieldServer()
 {
     unloadModule("libattention.so");
-    //delete importUpdateAgent;
-    //delete hebUpdateAgent;
     delete rng;
 }
 
@@ -239,25 +237,21 @@ void HopfieldServer::init(int width, int height, int numLinks)
     loadModule("libattention.so");
 
     //CogServer& cogserver = static_cast<CogServer&>(server());
-    importUpdateAgent = static_cast<ImportanceUpdatingAgent*>(
-            this->createAgent(ImportanceUpdatingAgent::info().id, true));
+    importUpdateAgent = createAgent<ImportanceUpdatingAgent>(true);
     if (options->updateMethod == HopfieldOptions::CONJUNCTION) {
-        hebUpdateAgent = static_cast<HebbianUpdatingAgent*>(
-                this->createAgent(HebbianUpdatingAgent::info().id, true));
+        hebUpdateAgent = createAgent<HebbianUpdatingAgent>(true);
     } else {
-        storkeyAgent = new StorkeyAgent(*this);
+        storkeyAgent = std::make_shared<StorkeyAgent>(*this);
     }
-    imprintAgent = new ImprintAgent(*this);
+    imprintAgent = std::make_shared<ImprintAgent>(*this);
     startAgent(imprintAgent);
-    diffuseAgent = static_cast<ImportanceDiffusionAgent*>(
-            this->createAgent(ImportanceDiffusionAgent::info().id, true));
+    diffuseAgent = createAgent<ImportanceDiffusionAgent>(true);
     diffuseAgent->setDiffusionThreshold(options->diffusionThreshold);
     diffuseAgent->setMaxSpreadPercentage(options->maxSpreadPercentage);
     diffuseAgent->setSpreadDecider(ImportanceDiffusionAgent::HYPERBOLIC,
             options->deciderFunctionShape);
-//    spreadAgent       = static_cast<ImportanceSpreadingAgent*>(this->createAgent(ImportanceSpreadingAgent::info().id, true));
-    forgetAgent = static_cast<ForgettingAgent*>(
-            this->createAgent(ForgettingAgent::info().id, true));
+//    spreadAgent       = createAgent<ImportanceSpreadingAgent>(true);
+    forgetAgent = createAgent<ForgettingAgent>(true);
 
     if (options->verboseLevel) {
         importUpdateAgent->getLogger()->setPrintToStdoutFlag (true);

diff --git a/examples/hopfield/HopfieldServer.h b/examples/hopfield/HopfieldServer.h
@@ -93,13 +93,13 @@ class HopfieldServer : public CogServer
     //! Amount of stimulus to apply across a pattern
     stim_t patternStimulus;
 
-    ForgettingAgent *forgetAgent;
-    HebbianUpdatingAgent *hebUpdateAgent;
-    StorkeyAgent *storkeyAgent;
-    ImprintAgent *imprintAgent;
-    ImportanceDiffusionAgent *diffuseAgent;
-    ImportanceSpreadingAgent *spreadAgent;
-    ImportanceUpdatingAgent *importUpdateAgent;
+    ForgettingAgentPtr forgetAgent;
+    HebbianUpdatingAgentPtr hebUpdateAgent;
+    StorkeyAgentPtr storkeyAgent;
+    ImprintAgentPtr imprintAgent;
+    ImportanceDiffusionAgentPtr diffuseAgent;
+    ImportanceSpreadingAgentPtr spreadAgent;
+    ImportanceUpdatingAgentPtr importUpdateAgent;
     HopfieldOptions *options;
 
     int width, height, links;

diff --git a/examples/hopfield/ImprintAgent.cc b/examples/hopfield/ImprintAgent.cc
@@ -71,7 +71,9 @@ Logger* ImprintAgent::getLogger()
 }
 
 void ImprintAgent::setPattern(Pattern _epsilon)
-{ epsilon = _epsilon; }
+{
+    epsilon = _epsilon;
+}
 
 void ImprintAgent::run()
 {
@@ -82,7 +84,7 @@ void ImprintAgent::run()
     assert(n == epsilon.size());
     stim_t stimulusAmount = 1;
     if (epsilon.activity() > 0) {
-        stimulusAmount = a.getAttentionBank().getSTI(this) / epsilon.activity(); 
+        stimulusAmount = a.getAttentionBank().getSTI(shared_from_this()) / epsilon.activity(); 
         if (stimulusAmount == 0) stimulusAmount++;
     }
     for (int i = 0; i < n; i++) {

diff --git a/examples/hopfield/ImprintAgent.h b/examples/hopfield/ImprintAgent.h
@@ -83,6 +83,8 @@ class ImprintAgent : public Agent
 
 }; // class
 
+typedef std::shared_ptr<ImprintAgent> ImprintAgentPtr;
+
 } // namespace
 
 #endif // _OPENCOG_IMPRINT_AGENT_H
diff --git a/examples/hopfield/StorkeyAgent.h b/examples/hopfield/StorkeyAgent.h
@@ -105,6 +105,8 @@ class StorkeyAgent : public Agent
 
 }; // class
 
+typedef std::shared_ptr<StorkeyAgent> StorkeyAgentPtr;
+
 } // namespace
 
 #endif // _OPENCOG_STORKEY_AGENT_H