Changeset 104 for cpp/gdk/neuroimpl.h

Timestamp:

07/23/13 18:15:30 (11 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.h (modified) (6 diffs)

cpp/gdk/neuroimpl.h

@@ -17 +17 @@
 
 class Creature;
+class NeuroLibrary;
+class NeuroFactory;
 
 class NeuroNetConfig
 {
 public:
-NeuroNetConfig();
+NeuroNetConfig(NeuroFactory *fac);
 
 Param par;
@@ -28 +30 @@
 double touchrange;
 
-static NeuroNetConfig& getGlobalConfig();
+NeuroFactory *factory;
+//static NeuroNetConfig& getGlobalConfig();
 };
 
@@ -40 +43 @@
   public:
 
-NeuroSignals(NeuroImpl *n):owner(n),cr(0) {}
+NeuroSignals(NeuroImpl *n):cr(0),owner(n) {}
 
 #define STATRICKCLASS NeuroSignals
@@ -74 +77 @@
 static double getStateFromNeuro(Neuro *n);
 int getErrorCount() {return errorcount;}
-NeuroNetImpl(Model& model, NeuroNetConfig& conf = NeuroNetConfig::getGlobalConfig()
+NeuroNetConfig &getConfig() {return config;}
+NeuroNetImpl(Model& model, NeuroNetConfig& conf
 #ifdef NEURO_SIGNALS
 , ChannelSpace *ch=0
@@ -198 +202 @@
 /** don't access directly */
 double newstate;
+NeuroNetImpl *owner;
+/** will be used by readParam() method, if not null  */
+ParamEntry *paramentries; // no extra properties if ==0
 
 #ifdef NEURO_SIGNALS
 NeuroSignals sigs;
-#endif
-NeuroNetImpl *owner;
 ExtObject sigs_obj;
+#endif
 
 /** "virtual constructor" - NeuroFactory uses this method to create the proper implementation object.
     subclasses must return new object here. */
 virtual NeuroImpl* makeNew() {return 0;} // 
-/** will be used by readParam() method, if not null  */
-ParamEntry *paramentries; // no extra properties if ==0
 /** read additional properties from "moredata" field of the originating Neuro */
 void readParam();
@@ -247 +251 @@
 void validateNeuroState(double& st) {if (st<=-1e10) st=-1e10; else if (st>1e10) st=1e10;}
 
-NeuroImpl():owner(0),neuro(0),newstate(0),paramentries(0),simorder(1),status(BeforeInit),channels(1),fields_param(0),fields_object(0)
+NeuroImpl():simorder(1),channels(1),fields_param(0),fields_object(0),status(BeforeInit),neuro(0),newstate(0),owner(0),paramentries(0)
 #ifdef NEURO_SIGNALS
 ,sigs(this),sigs_obj(&NeuroSignals::getStaticParam(),&sigs)