Changeset 726 for cpp/frams/neuro

Timestamp:

01/19/18 19:37:43 (7 years ago)

Author:

Maciej Komosinski

Message:

• Changed Model::singleStepBuild() to Model::addFromString() to create model elements; the latter requires explicit indication of element type (P/J/N/C)
• Removed old compatibility source (#ifdef MODEL_V1_COMPATIBLE) from f1->f0 converter and neuron definitions

Location:

cpp/frams/neuro/impl

Files:

• neuroimpl-simple.cpp (modified) (1 diff)
• neuroimpl-simple.h (modified) (1 diff)

cpp/frams/neuro/impl/neuroimpl-simple.cpp

@@ -12 +12 @@
 int NI_StdNeuron::lateinit()
 {
-#ifdef MODEL_V1_COMPATIBLE
-if (inertia<0) inertia=neuro->inertia;
-if (force<0) force=neuro->force;
-if (sigmo>1e9) sigmo=neuro->sigmo;
-#endif
 istate=newstate+neuro->state; // neuro->state -> random initialization
 calcOutput();

cpp/frams/neuro/impl/neuroimpl-simple.h

@@ -19 +19 @@
   public:
 double inertia,force,sigmo;
-NI_StdNeuron():velocity(0)
-#ifdef MODEL_V1_COMPATIBLE
-        ,inertia(-1),force(-1),sigmo(1e10)// illegal values, will be adjusted in lateinit()
-#else
-        ,inertia(0),force(0),sigmo(0)
-#endif
+NI_StdNeuron():velocity(0),inertia(0),force(0),sigmo(0)
         {paramentries=NI_StdNeuron_tab;}
 NeuroImpl* makeNew(){return new NI_StdNeuron();} // for NeuroFactory