Changeset 72 for cpp/gdk

Timestamp:

12/16/11 21:35:18 (13 years ago)

Author:

Maciej Komosinski

Message:

neural noise parameter in neurons

Location:

cpp/gdk

Files:

• neuroimpl.cpp (modified) (5 diffs)
• neuroimpl.h (modified) (1 diff)

cpp/gdk/neuroimpl.cpp

@@ -5 +5 @@
 #include "neuroimpl.h"
 #include "neurofactory.h"
+#include "rndutil.h"
 #ifndef GDK_WITHOUT_FRAMS
 #include "creature.h"
@@ -22 +23 @@
 static ParamEntry nncfg_paramtab[]=
 {
-{"Creature: Neurons",1,2,"nnsim",},
-{"randinit",1,0,"Random initialization","f 0 10 0.01",FIELD(randominit),"Allowed range for initializing all neuron states with uniform distribution random numbers and zero mean. Set 0 for deterministic initialization."},
+{"Creature: Neurons",1,3,"nnsim",},
+{"randinit",1,0,"Random initialization","f 0 10 0.01",FIELD(randominit),"Allowed range for initializing all neuron states with uniform distribution random numbers and zero mean. Set to 0 for deterministic initialization."},
+{"nnoise",1,0,"Noise","f 0 1 0",FIELD(nnoise),"Gaussian neural noise: a random value is added to each neural output in each simulation step. Set standard deviation here to add random noise, or 0 for deterministic simulation."},
 {"touchrange",1,0,"T receptor range","f 0 100 1",FIELD(touchrange),},
 {0,0,0,},
@@ -32 +34 @@
         :par(nncfg_paramtab,this),
          randominit(0.01),
+         nnoise(0),
          touchrange(1)
 {}
@@ -197 +200 @@
                 chstate=chnewstate;
         neuro->state=newstate;
+        if (NeuroNetConfig::globalconfig.nnoise>0.0)
+                {
+                neuro->state+=RndGen.GaussStd()*NeuroNetConfig::globalconfig.nnoise;
+                if (channels>1)
+                        for(int i=0;i<chstate.size();i++)
+                                chstate(0)+=RndGen.GaussStd()*NeuroNetConfig::globalconfig.nnoise;
+                }
         }
 }
@@ -290 +300 @@
 {"getInputStateChannel",0,0,"Get input signal from channel","p f(d input,d channel)",PROCEDURE(p_getchan),},
 {"getWeightedInputStateChannel",0,0,"Get weighted input signal from channel","p f(d input,d channel)",PROCEDURE(p_getwchan),},
-{"state",0,0,"Neuron state (channel 0)","f",GETSET(state),"When read, returns the current neuron state.\nWhen written, sets the next neuron state (for use in the neuron definition)"},
+{"state",0,0,"Neuron state (channel 0)","f",GETSET(state),"When read, returns the current neuron state.\nWhen written, sets the 'internal' neuron state that will become current in the next step.\nTypically you should use this field, and not currState."},
 {"channelCount",0,0,"Number of output channels","d",GETSET(channels),},
-{"getStateChannel",0,0,"Get output state for channel","p f(d channel)",PROCEDURE(p_getstate),},
-{"setStateChannel",0,0,"Set output state for channel","p(d channel,f value)",PROCEDURE(p_setstate),},
+{"getStateChannel",0,0,"Get state for channel","p f(d channel)",PROCEDURE(p_getstate),},
+{"setStateChannel",0,0,"Set state for channel","p(d channel,f value)",PROCEDURE(p_setstate),},
 {"hold",0,0,"Hold state","d 0 1",GETSET(hold),"\"Holding\" means keeping the neuron state as is, blocking the regular neuron operation. This is useful when your script needs to inject some control signals into the NN. Without \"holding\", live neurons would be constantly overwriting your changes, and the rest of the NN could see inconsistent states, depending on the connections. Setting hold=1 ensures the neuron state will be only set by you, and not by the neuron. The enforced signal value can be set using Neuro.currState before or after setting hold=1. Set hold=0 to resume normal operation.",},
-{"currState",0,0,"Neuron state (channel 0)","f",GETSET(cstate),"The only difference from the \"state\" field is that currState, when written, changes the internal neuron state immediately (which disturbs the regular synchronous NN operation). This feature should only be used while controlling the neuron 'from outside' (like a neuro probe) and not in the neuron definition. See also: Neuro.hold",},
-{"setCurrStateChannel",0,0,"Set neuron for channel","p(d channel,f value)",PROCEDURE(p_setcstate),"Analogous to \"currState\"."},
+{"currState",0,0,"Current neuron state (channel 0)","f",GETSET(cstate),"When read, it behaves just like the 'state' field.\nWhen written, changes the current neuron state immediately, which disturbs the regular synchronous NN operation.\nThis feature should only be used while controlling the neuron 'from outside' (like a neuro probe) and not in the neuron definition. See also: Neuro.hold",},
+{"setCurrStateChannel",0,0,"Set current neuron state for channel","p(d channel,f value)",PROCEDURE(p_setcstate),"Analogous to \"currState\"."},
 {"position_x",0,0,"Position x","f",GETONLY(position_x),},
 {"position_y",0,0,"Position y","f",GETONLY(position_y),},

cpp/gdk/neuroimpl.h

@@ -28 +28 @@
 Param par;
 double randominit;
+double nnoise;
 double touchrange;