Changeset 81 for cpp/gdk/neuroimpl.h

Timestamp:

02/08/13 03:29:17 (12 years ago)

Author:

Maciej Komosinski

Message:

improved parsing of properties (e.g. in f0 genotypes)

File:

• cpp/gdk/neuroimpl.h (modified) (6 diffs)

cpp/gdk/neuroimpl.h

@@ -15 +15 @@
 class NeuroImpl;
 extern ParamEntry neuroimpl_tab[];
-#ifdef NEURO_SIGNALS
-extern Param neurosignals_param;
-#endif
 
 class Creature;
@@ -31 +28 @@
 double touchrange;
 
-static NeuroNetConfig globalconfig;
+static NeuroNetConfig& getGlobalConfig();
 };
 
@@ -54 +51 @@
 PARAMPROCDEF(p_receiveSingle);
 #undef STATRICKCLASS
+
+static Param& getStaticParam();
 };
 #endif
@@ -75 +74 @@
 static double getStateFromNeuro(Neuro *n);
 int getErrorCount() {return errorcount;}
-NeuroNetImpl(Model& model, NeuroNetConfig& conf = NeuroNetConfig::globalconfig
+NeuroNetImpl(Model& model, NeuroNetConfig& conf = NeuroNetConfig::getGlobalConfig()
 #ifdef NEURO_SIGNALS
 , ChannelSpace *ch=0
@@ -250 +249 @@
 NeuroImpl():owner(0),neuro(0),newstate(0),paramentries(0),simorder(1),status(BeforeInit),channels(1),fields_param(0),fields_object(0)
 #ifdef NEURO_SIGNALS
-,sigs(this),sigs_obj(&neurosignals_param,&sigs)
+,sigs(this),sigs_obj(&NeuroSignals::getStaticParam(),&sigs)
 #endif
  {}
@@ -298 +297 @@
 PARAMGETDEF(classObject);
 #undef STATRICKCLASS
+
+  static Param& getStaticParam();
 };