Changeset 104 for cpp/gdk/neuroimpl.cpp

Timestamp:

07/23/13 18:15:30 (12 years ago)

Author:

sz

Message:

introducing object de/serialization - see serialtest.cpp
the core GDK classes can be now used in multiple threads (ifdef MULTITHREADED)

File:

• cpp/gdk/neuroimpl.cpp (modified) (4 diffs)

cpp/gdk/neuroimpl.cpp

@@ -32 +32 @@
 #undef FIELDSTRUCT
 
-NeuroNetConfig::NeuroNetConfig()
+NeuroNetConfig::NeuroNetConfig(NeuroFactory *fac)
         :par(nncfg_paramtab,this),
          randominit(0.01),
          nnoise(0),
-         touchrange(1)
+         touchrange(1),
+         factory(fac)
 {}
-
-NeuroNetConfig& NeuroNetConfig::getGlobalConfig()
-{
-static NeuroNetConfig globalconfig;
-return globalconfig;
-}
 
 /////////////////////////////////////////////////////////////////
@@ -74 +69 @@
 for (i=0;n=mod.getNeuro(i);i++)
         {
-        ni=NeuroFactory::createNeuroImpl(n);
+        ni=conf.factory->createNeuroImpl(n);
         n->userdata[mytags_id]=ni;
         if (!ni) { errorcount++;
@@ -205 +200 @@
                 chstate=chnewstate;
         neuro->state=newstate;
-        if (NeuroNetConfig::getGlobalConfig().nnoise>0.0)
+        if (owner->getConfig().nnoise>0.0)
                 {
-                neuro->state+=RndGen.GaussStd()*NeuroNetConfig::getGlobalConfig().nnoise;
+                neuro->state+=RndGen.GaussStd()*owner->getConfig().nnoise;
                 if (channels>1)
                         for(int i=0;i<chstate.size();i++)
-                                chstate(0)+=RndGen.GaussStd()*NeuroNetConfig::getGlobalConfig().nnoise;
+                                chstate(0)+=RndGen.GaussStd()*owner->getConfig().nnoise;
                 }
         }
@@ -272 +267 @@
 void NeuroImpl::readParam()
 {
-static Param par;
+Param par;
 if (!paramentries) return;
 par.setParamTab(paramentries);