Changeset 932 for cpp/frams/neuro/neuroimpl.cpp

Timestamp:

05/28/20 18:00:45 (5 years ago)

Author:

Maciej Komosinski

Message:

Neuron classes now have a property (a bit field) that says whether each neuron class supports model shape BALL_AND_STICK, SOLIDS, or both

File:

• cpp/frams/neuro/neuroimpl.cpp (modified) (9 diffs)

cpp/frams/neuro/neuroimpl.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -46 +46 @@
         , ChannelSpace *ch
 #endif
-        )
+)
         :mod(model), config(conf),
         isbuilt(1), errorcount(0)
@@ -69 +69 @@
         for (i = 0; n = mod.getNeuro(i); i++)
         {
-                ni = conf.factory->createNeuroImpl(n);
+                ni = conf.factory->createNeuroImpl(n, mod.getShapeType());
                 n->userdata[mytags_id] = ni;
                 if (!ni)
@@ -85 +85 @@
         for (i = 0; n = mod.getNeuro(i); i++)
         {
-                n->state += (rndDouble(1) - 0.5)*config.randominit;
+                n->state += (rndDouble(1) - 0.5) * config.randominit;
                 ni = (NeuroImpl*)n->userdata[mytags_id];
                 if (!ni) continue;
@@ -98 +98 @@
                 ni->status = NeuroImpl::InitOk;
                 int order = ni->getSimOrder();
-                if (order < 0) order = 0; else if (order>2) order = 2;
+                if (order < 0) order = 0; else if (order > 2) order = 2;
                 if (order < minorder) minorder = order;
                 if (order > maxorder) maxorder = order;
@@ -189 +189 @@
 double NeuroImpl::getNewState(int channel)
 {
-        if (neuro->flags&Neuro::HoldState) return getState(channel);
+        if (neuro->flags & Neuro::HoldState) return getState(channel);
         if (channel >= channels) channel = channels - 1;
         if (channel <= 0) { return newstate; }
@@ -204 +204 @@
 void NeuroImpl::commit()
 {
-        if (!(neuro->flags&Neuro::HoldState))
+        if (!(neuro->flags & Neuro::HoldState))
         {
                 if (channels > 1)
@@ -211 +211 @@
                 if (owner->getConfig().nnoise > 0.0)
                 {
-                        neuro->state += RndGen.GaussStd()*owner->getConfig().nnoise;
+                        neuro->state += RndGen.GaussStd() * owner->getConfig().nnoise;
                         if (channels > 1)
                                 for (int i = 0; i < chstate.size(); i++)
-                                        chstate(0) += RndGen.GaussStd()*owner->getConfig().nnoise;
+                                        chstate(0) += RndGen.GaussStd() * owner->getConfig().nnoise;
                 }
         }
@@ -270 +270 @@
         double w;
         while (inp = neuro->getInput(startwith++, w))
-                sum += inp->state*w;
+                sum += inp->state * w;
         return sum;
 }