Changeset 81 for cpp/gdk/neuroimpl.cpp

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

File:

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

cpp/gdk/neuroimpl.cpp

@@ -6 +6 @@
 #include "neurofactory.h"
 #include "rndutil.h"
+#include "nonstd_math.h"
 #ifndef GDK_WITHOUT_FRAMS
 #include "creature.h"
@@ -38 +39 @@
 {}
 
-NeuroNetConfig NeuroNetConfig::globalconfig;
+NeuroNetConfig& NeuroNetConfig::getGlobalConfig()
+{
+static NeuroNetConfig globalconfig;
+return globalconfig;
+}
 
 /////////////////////////////////////////////////////////////////
@@ -200 +205 @@
                 chstate=chnewstate;
         neuro->state=newstate;
-        if (NeuroNetConfig::globalconfig.nnoise>0.0)
+        if (NeuroNetConfig::getGlobalConfig().nnoise>0.0)
                 {
-                neuro->state+=RndGen.GaussStd()*NeuroNetConfig::globalconfig.nnoise;
+                neuro->state+=RndGen.GaussStd()*NeuroNetConfig::getGlobalConfig().nnoise;
                 if (channels>1)
                         for(int i=0;i<chstate.size();i++)
-                                chstate(0)+=RndGen.GaussStd()*NeuroNetConfig::globalconfig.nnoise;
+                                chstate(0)+=RndGen.GaussStd()*NeuroNetConfig::getGlobalConfig().nnoise;
                 }
         }
@@ -274 +279 @@
 int zero=0;
 par.load2(neuro->getClassParams(),zero);
+}
+
+Param& NeuroImpl::getStaticParam()
+{
+static Param p(neuroimpl_tab,0,"Neuro");
+return p;
 }
 
@@ -340 +351 @@
 ParamEntry neurosignals_paramtab[]=
  {
-{"NeuroSignals",1,8,"NeuroSignals","Signals attached to the neuron.\nSee also: Signal, WorldSignals, CreatureSignals.\nscripts/light.neuro and scripts/seelight.neuro are simple custom neuron examples demonstrating how to send/receive signals between creatures.",},
+{"NeuroSignals",1,8,"NeuroSignals","Signals attached to a neuron.\nSee also: Signal, WorldSignals, CreatureSignals.\nscripts/light.neuro and scripts/seelight.neuro are simple custom neuron examples demonstrating how to send/receive signals between creatures.",},
 
 #define FIELDSTRUCT NeuroSignals
-{"add",0,PARAM_NOSTATIC,"Add","p(s channel)",PROCEDURE(p_add),"Create a new signal"},
-{"receive",0,PARAM_NOSTATIC,"Receive","p f(s channel)",PROCEDURE(p_receive),"Receive the aggregated signal power in a given channel."},
-{"receiveSet",0,PARAM_NOSTATIC,"Receive","p oVector(s channel,f max distance)",PROCEDURE(p_receiveSet),"Get all signals in the specified range. Returns a readonly vector object containing Signal objects (individual signals can be accessed as result[0] throught result[result.size-1])."},
-{"receiveFilter",0,PARAM_NOSTATIC,"receive","p f(s channel,f max distance,f flavor,f filter)",PROCEDURE(p_receiveFilter),"Receive the aggregated signal power in a given channel.\n\nAdditional filtering options:\n- Max distance only receives the neighbor signals (based on their physical location)\n- Flavor filtering: only signals having the flavor close to the specified one will be received. The filter value is the maximum allowed difference."},
-{"receiveSingle",0,PARAM_NOSTATIC,"Receive","p oSignal(s channel,f range)",PROCEDURE(p_receiveSingle),"Find the signal source having the highest signal power (including the distance)"},
+SIGNPAR_ADD(""),
+SIGNPAR_RECEIVE(""),
+SIGNPAR_RECEIVESET(""),
+SIGNPAR_RECEIVEFILTER(""),
+SIGNPAR_RECEIVESINGLE(""),
 #undef FIELDSTRUCT
 
 #define FIELDSTRUCT SignalSet
-{"get",0,PARAM_NOSTATIC,"Get","p oSignal(d index)",PROCEDURE(p_get),},
-{"size",0,1+PARAM_NOSTATIC,"Size","d",GETONLY(size),},
-{"clear",0,1+PARAM_NOSTATIC,"Clear","p()",PROCEDURE(p_clear),},
+SIGNSETPAR_GET,
+SIGNSETPAR_SIZE,
+SIGNSETPAR_CLEAR,
 #undef FIELDSTRUCT
 {0,0,0,},
  }; 
-Param neurosignals_param(neurosignals_paramtab,0);
-#endif
-
-Param st_neuroimplparam(neuroimpl_tab,0,"Neuro");
+
+Param& NeuroSignals::getStaticParam()
+{
+static Param p(neurosignals_paramtab,0);
+return p;
+}
+#endif
 
 #ifdef NEURO_SIGNALS
@@ -474 +488 @@
 Part *pa;
 if (pa=neuro->getPart())
-        ret->setObject(ExtObject(&mechpart_param,((MechPart *)pa->userdata[CreatMechObject::modeltags_id])));
+        ret->setObject(ExtObject(&MechPart::getStaticParam(),((MechPart *)pa->userdata[CreatMechObject::modeltags_id])));
 else
         ret->setEmpty();
@@ -485 +499 @@
 Joint *jo;
 if (jo=neuro->getJoint())
-        ret->setObject(ExtObject(&mechjoint_param,((MechJoint*)jo->userdata[CreatMechObject::modeltags_id])));
+        ret->setObject(ExtObject(&MechJoint::getStaticParam(),((MechJoint*)jo->userdata[CreatMechObject::modeltags_id])));
 else
         ret->setEmpty();
@@ -534 +548 @@
 void NeuroImpl::get_neurodef(ExtValue *ret)
 {
-ret->setObject(ExtObject(&st_neuroparam,neuro));
+ret->setObject(ExtObject(&Neuro::getStaticParam(),neuro));
 }