Changeset 899

Timestamp:

11/30/19 02:13:25 (5 years ago)

Author:

Maciej Komosinski

Message:

Code formatting

Location:

cpp

Files:

• common/nonstd_math.h (modified) (1 diff)
• frams/genetics/f4/f4_oper.cpp (modified) (3 diffs)
• frams/genetics/f9/f9_oper.cpp (modified) (1 diff)
• frams/genetics/fF/fF_oper.cpp (modified) (1 diff)
• frams/genetics/fT/fTest_oper.cpp (modified) (1 diff)
• frams/genetics/fn/fn_oper.cpp (modified) (1 diff)
• frams/genetics/genooperators.cpp (modified) (17 diffs)
• frams/genetics/genooperators.h (modified) (1 diff)
• frams/model/modelparts.cpp (modified) (27 diffs)
• frams/model/modelparts.h (modified) (24 diffs)

cpp/common/nonstd_math.h

@@ -68 +68 @@
 
 #endif
-

cpp/frams/genetics/f4/f4_oper.cpp

@@ -448 +448 @@
                 int relid = neuid - id;
                 nn->l1 = relid;
-                //nn->l1 = (int)(4.0f * (rnd01 - 0.5f));
+                //nn->l1 = (int)(4.0f * (rndDouble(1) - 0.5f));
         }
         // weight
         nn->f1 = GenoOperators::mutateNeuProperty(nn->f1, NULL, -1);
-        //nn->f1 = 10.0f * (rnd01 - 0.5f);
+        //nn->f1 = 10.0f * (rndDouble(1) - 0.5f);
 }
 
@@ -485 +485 @@
                         nn->l1 = neuid - id;
                 }
-                //nn->l1 += (int)(2.0f * (rnd01 - 0.5f));
+                //nn->l1 += (int)(2.0f * (rndDouble(1) - 0.5f));
                 break;
         case 2: // change weight
                 nn->f1 = GenoOperators::mutateNeuProperty(nn->f1, NULL, -1);
-                //nn->f1 += 1.0f * (rnd01 - 0.5f);
+                //nn->f1 += 1.0f * (rndDouble(1) - 0.5f);
                 break;
         }
@@ -630 +630 @@
 
 // decide number of nodes to mutate
-n = (int)( 0.5f + rnd01 * maxToMut );
+n = (int)( 0.5f + rndDouble(1) * maxToMut );
 if (n<1) n=1;
 if (n>totNodes) n=totNodes;

cpp/frams/genetics/f9/f9_oper.cpp

@@ -5 +5 @@
 #include "f9_oper.h"
 #include "f9_conv.h"
-#include <common/nonstd.h> //rndUint, rnd01
+#include <common/nonstd.h> //rndUint, rndDouble
 
 

cpp/frams/genetics/fF/fF_oper.cpp

@@ -5 +5 @@
 #include "fF_oper.h"
 #include "fF_genotype.h"
-#include <common/nonstd.h> //rndUint, rnd01
+#include <common/nonstd.h> //rndUint, rndDouble
 
 

cpp/frams/genetics/fT/fTest_oper.cpp

@@ -4 +4 @@
 
 #include "fTest_oper.h"
-#include <common/nonstd.h> //randomN, rnd01
+#include <common/nonstd.h> //randomN, rndDouble
 
 /**

cpp/frams/genetics/fn/fn_oper.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-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "fn_oper.h"
 #include "fn_conv.h"
-#include <common/nonstd.h> //rndUint, rnd01
+#include <common/nonstd.h> //rndUint, rndDouble
 
 

cpp/frams/genetics/genooperators.cpp

@@ -76 +76 @@
 }
 
-int GenoOperators::selectRandomProperty(Neuro* n)
+int GenoOperators::selectRandomProperty(Neuro *n)
 {
         int neuext = n->extraProperties().getPropCount(),
@@ -129 +129 @@
                         if (strcmp(n, "fo") == 0 && strcmp(na, "Force") == 0) newval = CustomRnd(distrib_force); else
                         {
-                double mn, mx, df;
-                getMinMaxDef(&p, i, mn, mx, df);
-                newval = mutateCreep(p.type(i)[0], oldval, mn, mx, true);
+                                double mn, mx, df;
+                                getMinMaxDef(&p, i, mn, mx, df);
+                                newval = mutateCreep(p.type(i)[0], oldval, mn, mx, true);
                         }
         return true;
@@ -195 +195 @@
                 double v1 = p1[i];
                 double v2 = p2[i];
-                p1[i] = v1*proportion + v2*(1 - proportion);
-                p2[i] = v2*proportion + v1*(1 - proportion);
+                p1[i] = v1 * proportion + v2 * (1 - proportion);
+                p2[i] = v2 * proportion + v1 * (1 - proportion);
         }
 }
@@ -208 +208 @@
                 double v1 = p1.getDouble(i1);
                 double v2 = p2.getDouble(i2);
-                p1.setDouble(i1, v1*proportion + v2*(1 - proportion));
-                p2.setDouble(i2, v2*proportion + v1*(1 - proportion));
+                p1.setDouble(i1, v1 * proportion + v2 * (1 - proportion));
+                p2.setDouble(i2, v2 * proportion + v1 * (1 - proportion));
         }
         else
                 if (type1 == 'd' && type2 == 'd')
                 {
-                int v1 = p1.getInt(i1);
-                int v2 = p2.getInt(i2);
-                setIntFromDoubleWithProbabilisticDithering(p1, i1, v1*proportion + v2*(1 - proportion));
-                setIntFromDoubleWithProbabilisticDithering(p2, i2, v2*proportion + v1*(1 - proportion));
+                        int v1 = p1.getInt(i1);
+                        int v2 = p2.getInt(i2);
+                        setIntFromDoubleWithProbabilisticDithering(p1, i1, v1 * proportion + v2 * (1 - proportion));
+                        setIntFromDoubleWithProbabilisticDithering(p2, i2, v2 * proportion + v1 * (1 - proportion));
                 }
                 else
@@ -232 +232 @@
 }
 
-NeuroClass* GenoOperators::getRandomNeuroClass()
-{
-        vector<NeuroClass*> active;
+NeuroClass *GenoOperators::getRandomNeuroClass()
+{
+        vector<NeuroClass *> active;
         for (int i = 0; i < Neuro::getClassCount(); i++)
                 if (Neuro::getClass(i)->genactive)
@@ -241 +241 @@
 }
 
-NeuroClass* GenoOperators::getRandomNeuroClassWithOutput()
-{
-        vector<NeuroClass*> active;
+NeuroClass *GenoOperators::getRandomNeuroClassWithOutput()
+{
+        vector<NeuroClass *> active;
         for (int i = 0; i < Neuro::getClassCount(); i++)
                 if (Neuro::getClass(i)->genactive && Neuro::getClass(i)->getPreferredOutput() != 0)
@@ -250 +250 @@
 }
 
-NeuroClass* GenoOperators::getRandomNeuroClassWithInput()
-{
-        vector<NeuroClass*> active;
+NeuroClass *GenoOperators::getRandomNeuroClassWithInput()
+{
+        vector<NeuroClass *> active;
         for (int i = 0; i < Neuro::getClassCount(); i++)
                 if (Neuro::getClass(i)->genactive && Neuro::getClass(i)->getPreferredInputs() != 0)
@@ -259 +259 @@
 }
 
-NeuroClass* GenoOperators::getRandomNeuroClassWithOutputAndNoInputs()
-{
-        vector<NeuroClass*> active;
+NeuroClass *GenoOperators::getRandomNeuroClassWithOutputAndNoInputs()
+{
+        vector<NeuroClass *> active;
         for (int i = 0; i < Neuro::getClassCount(); i++)
                 if (Neuro::getClass(i)->genactive && Neuro::getClass(i)->getPreferredOutput() != 0 && Neuro::getClass(i)->getPreferredInputs() == 0)
@@ -268 +268 @@
 }
 
-int GenoOperators::getRandomNeuroClassWithOutput(const vector<NeuroClass*>& NClist)
+int GenoOperators::getRandomNeuroClassWithOutput(const vector<NeuroClass *> &NClist)
 {
         vector<int> allowed;
@@ -277 +277 @@
 }
 
-int GenoOperators::getRandomNeuroClassWithInput(const vector<NeuroClass*>& NClist)
+int GenoOperators::getRandomNeuroClassWithInput(const vector<NeuroClass *> &NClist)
 {
         vector<int> allowed;
@@ -301 +301 @@
 }
 
-NeuroClass* GenoOperators::parseNeuroClass(char*& s)
+NeuroClass *GenoOperators::parseNeuroClass(char *&s)
 {
         int maxlen = (int)strlen(s);
         int NClen = 0;
         NeuroClass *NC = NULL;
-        for (int i = 0; i<Neuro::getClassCount(); i++)
+        for (int i = 0; i < Neuro::getClassCount(); i++)
         {
                 const char *ncname = Neuro::getClass(i)->name.c_str();
                 int ncnamelen = (int)strlen(ncname);
-                if (maxlen >= ncnamelen && ncnamelen>NClen && (strncmp(s, ncname, ncnamelen) == 0))
+                if (maxlen >= ncnamelen && ncnamelen > NClen && (strncmp(s, ncname, ncnamelen) == 0))
                 {
                         NC = Neuro::getClass(i);
@@ -320 +320 @@
 }
 
-Neuro* GenoOperators::findNeuro(const Model *m, const NeuroClass *nc)
+Neuro *GenoOperators::findNeuro(const Model *m, const NeuroClass *nc)
 {
         if (!m) return NULL;
@@ -328 +328 @@
 }
 
-int GenoOperators::neuroClassProp(char*& s, NeuroClass *nc, bool also_v1_N_props)
+int GenoOperators::neuroClassProp(char *&s, NeuroClass *nc, bool also_v1_N_props)
 {
         int len = (int)strlen(s);
@@ -335 +335 @@
         {
                 Param p = nc->getProperties();
-                for (int i = 0; i<p.getPropCount(); i++)
+                for (int i = 0; i < p.getPropCount(); i++)
                 {
                         const char *n = p.id(i);
                         int l = (int)strlen(n);
-                        if (len >= l && l>Len && (strncmp(s, n, l) == 0)) { I = 100 + i; Len = l; }
+                        if (len >= l && l > Len && (strncmp(s, n, l) == 0)) { I = 100 + i; Len = l; }
                         if (also_v1_N_props) //recognize old properties symbols /=!
                         {
@@ -352 +352 @@
         Neuro n;
         Param p = n.extraProperties();
-        for (int i = 0; i<p.getPropCount(); i++)
+        for (int i = 0; i < p.getPropCount(); i++)
         {
                 const char *n = p.id(i);
                 int l = (int)strlen(n);
-                if (len >= l && l>Len && (strncmp(s, n, l) == 0)) { I = i; Len = l; }
+                if (len >= l && l > Len && (strncmp(s, n, l) == 0)) { I = i; Len = l; }
         }
         s += Len;
@@ -389 +389 @@
 }
 
-char* GenoOperators::strchrn0(const char *str, char ch)
-{
-        return ch == 0 ? NULL : strchr((char*)str, ch);
+char *GenoOperators::strchrn0(const char *str, char ch)
+{
+        return ch == 0 ? NULL : strchr((char *)str, ch);
 }
 
@@ -398 +398 @@
         return isupper(firstchar) || firstchar == '|' || firstchar == '@' || firstchar == '*';
 }
-

cpp/frams/genetics/genooperators.h

@@ -198 +198 @@
         static NeuroClass* getRandomNeuroClassWithInput(); ///<returns random neuroclass with input or NULL when no active classes.
         static NeuroClass* getRandomNeuroClassWithOutputAndNoInputs(); ///<returns random sensor or NULL when no active classes.
-        static NeuroClass* getRandomSensorProb(float prob); ///<returns random sensor (only-output neuron class) with presented probability or NULL. \e prob probability of picking neuron class.
         static int getRandomNeuroClassWithOutput(const vector<NeuroClass*>& NClist); ///<returns index of random NeuroClass from the NClist or -1 (no neurons on the list that provide output) \e NClist list of available neuron classes
         static int getRandomNeuroClassWithInput(const vector<NeuroClass*>& NClist); ///<returns index of random NeuroClass from the NClist or -1 (no neurons on the list that want input(s)) \e NClist list of available neuron classes

cpp/frams/model/modelparts.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -74 +74 @@
 }
 
-void PartBase::setInfo(const SString& name, const SString& value)
+void PartBase::setInfo(const SString &name, const SString &value)
 {
         strSetField(info, name, value);
 }
 
-void PartBase::setInfo(const SString& name, int value)
+void PartBase::setInfo(const SString &name, int value)
 {
         setInfo(name, SString::valueOf(value));
 }
 
-void PartBase::setInfo(const SString& name, double value)
+void PartBase::setInfo(const SString &name, double value)
 {
         setInfo(name, SString::valueOf(value));
 }
 
-SString PartBase::getInfo(const SString& name)
+SString PartBase::getInfo(const SString &name)
 {
         return strGetField(info, name);
@@ -134 +134 @@
 }
 
-void NeuroClass::setGenActive(const char* genactive_classes[])
-{
-        for (const char** n = genactive_classes; *n; n++)
-        {
-                NeuroClass* cls = Neuro::getClass(*n);
+void NeuroClass::setGenActive(const char *genactive_classes[])
+{
+        for (const char **n = genactive_classes; *n; n++)
+        {
+                NeuroClass *cls = Neuro::getClass(*n);
                 if (cls) cls->genactive = 1;
         }
@@ -223 +223 @@
 }
 
-SString** Neuro::inputInfo(int i)
+SString **Neuro::inputInfo(int i)
 {
         if (i >= getInputCount()) return 0;
@@ -229 +229 @@
 }
 
-void Neuro::setInputInfo(int i, const SString& name, const SString &value)
+void Neuro::setInputInfo(int i, const SString &name, const SString &value)
 {
         SString **s = inputInfo(i);
@@ -237 +237 @@
 }
 
-void Neuro::setInputInfo(int i, const SString& name, int value)
+void Neuro::setInputInfo(int i, const SString &name, int value)
 {
         setInputInfo(i, name, SString::valueOf(value));
 }
 
-void Neuro::setInputInfo(int i, const SString& name, double value)
+void Neuro::setInputInfo(int i, const SString &name, double value)
 {
         setInputInfo(i, name, SString::valueOf(value));
@@ -255 +255 @@
 }
 
-SString Neuro::getInputInfo(int i, const SString& name)
+SString Neuro::getInputInfo(int i, const SString &name)
 {
         SString **s = inputInfo(i);
@@ -263 +263 @@
 }
 
-void Neuro::operator=(const Neuro& src)
+void Neuro::operator=(const Neuro &src)
 {
         refno = src.refno;
@@ -294 +294 @@
 }
 
-NeuroClass* Neuro::getClass(int classindex)
+NeuroClass *Neuro::getClass(int classindex)
 {
         return NeuroLibrary::staticlibrary.getClass(classindex);
 }
 
-NeuroClass* Neuro::getClass(const SString& classname)
+NeuroClass *Neuro::getClass(const SString &classname)
 {
         return NeuroLibrary::staticlibrary.findClass(classname);
 }
 
-int Neuro::getClassIndex(const NeuroClass*nc)
-{
-        return NeuroLibrary::staticlibrary.classes.find((void*)nc);
-}
-
-NeuroClass* Neuro::getClass()
+int Neuro::getClassIndex(const NeuroClass *nc)
+{
+        return NeuroLibrary::staticlibrary.classes.find((void *)nc);
+}
+
+NeuroClass *Neuro::getClass()
 {
         checkClass();
@@ -315 +315 @@
 }
 
-void Neuro::setClass(NeuroClass* cl)
+void Neuro::setClass(NeuroClass *cl)
 {
         myclass = cl;
@@ -328 +328 @@
 }
 
-void Neuro::setDetails(const SString& details)
+void Neuro::setDetails(const SString &details)
 {
         int colon = details.indexOf(':');
@@ -362 +362 @@
 }
 
-void Neuro::setClassName(const SString& clazz)
+void Neuro::setClassName(const SString &clazz)
 {
         myclassname = clazz;
@@ -368 +368 @@
 }
 
-int Neuro::addInput(Neuro* child, double weight, const SString *info)
+int Neuro::addInput(Neuro *child, double weight, const SString *info)
 {
         inputs += NInput(child, weight, (info && (info->len())) ? new SString(*info) : 0);
@@ -376 +376 @@
 }
 
-int Neuro::findInput(Neuro* child) const
+int Neuro::findInput(Neuro *child) const
 {
         for (int i = 0; i < inputs.size(); i++)
@@ -383 +383 @@
 }
 
-Neuro* Neuro::getInput(int i, double &weight) const
+Neuro *Neuro::getInput(int i, double &weight) const
 {
         if (i >= getInputCount()) return 0;
@@ -401 +401 @@
 }
 
-void Neuro::setInput(int i, Neuro* n)
+void Neuro::setInput(int i, Neuro *n)
 {
         NInput &inp = inputs(i);
@@ -407 +407 @@
 }
 
-void Neuro::setInput(int i, Neuro* n, double w)
+void Neuro::setInput(int i, Neuro *n, double w)
 {
         NInput &inp = inputs(i);
@@ -424 +424 @@
 }
 
-int Neuro::removeInput(Neuro* child)
+int Neuro::removeInput(Neuro *child)
 {
         int i = findInput(child);
@@ -463 +463 @@
 }
 
-int Neuro::findInputs(SList& result, const char* classname, const Part* part, const Joint* joint) const
+int Neuro::findInputs(SList &result, const char *classname, const Part *part, const Joint *joint) const
 {
         Neuro *nu;
@@ -476 +476 @@
                 if (classname)
                         if (nu->getClassName() != cn) continue;
-                result += (void*)nu;
+                result += (void *)nu;
         }
         return result.size() - n0;
 }
 
-int Neuro::findOutputs(SList& result, const char* classname, const Part* part, const Joint* joint) const
+int Neuro::findOutputs(SList &result, const char *classname, const Part *part, const Joint *joint) const
 { // not very efficient...
         Neuro *nu, *inp;
@@ -498 +498 @@
                         if (inp == this)
                         {
-                        result += (void*)nu;
-                        break;
+                                result += (void *)nu;
+                                break;
                         }
         }
@@ -576 +576 @@
 }
 
-void Part::operator=(const Part& src)
+void Part::operator=(const Part &src)
 {
         p = src.p; o = src.o;
@@ -612 +612 @@
         Pt3D x = p2 - p1;
         Pt3D dir(x.y, x.z, x.x);
-        p = p1 + x*0.5;
+        p = p1 + x * 0.5;
         rot.getAngles(x, dir);
 }
 
-Param& Part::getStaticParam()
+Param &Part::getStaticParam()
 {
         static Param p(f0_part_paramtab, 0, "Part");
@@ -637 +637 @@
 }
 
-void Joint::operator=(const Joint& src)
+void Joint::operator=(const Joint &src)
 {
         rot = src.rot;
@@ -652 +652 @@
 }
 
-void Joint::attachToParts(Part* p1, Part* p2)
+void Joint::attachToParts(Part *p1, Part *p2)
 {
         part1 = p1;
@@ -695 +695 @@
 }
 
-Param& Joint::getStaticParam()
+Param &Joint::getStaticParam()
 {
         static Param p(f0_joint_paramtab, 0, "Joint");
@@ -760 +760 @@
 };
 
-Param& Neuro::getStaticParam()
+Param &Neuro::getStaticParam()
 {
         static Param p(f0_neuro_paramtab, 0, "NeuroDef");

cpp/frams/model/modelparts.h

@@ -24 +24 @@
 class MultiRange;
 
-typedef UserTags<Model, void*, 5> ModelUserTags;
+typedef UserTags<Model, void *, 5> ModelUserTags;
 
 /** Common base for model elements. */
@@ -31 +31 @@
 public:
         SString vis_style;
-        PartBase(const SString& s) :vis_style(s), mapped(0) {}
+        PartBase(const SString &s) :vis_style(s), mapped(0) {}
         ~PartBase();
-        static SString getDefaultStyle(){ return SString("none"); }
+        static SString getDefaultStyle() { return SString("none"); }
         MultiRange *mapped;
         enum PartBaseFlags { Selected = 1 };
@@ -48 +48 @@
 
         void clearMapping();
-        MultiRange* getMapping() { return mapped; }
+        MultiRange *getMapping() { return mapped; }
         void setMapping(const IRange &mr);
         void addMapping(const IRange &mr);
@@ -54 +54 @@
         void addMapping(const MultiRange &mr);
 
-        void setInfo(const SString& name, const SString& value);
-        void setInfo(const SString& name, int value);
-        void setInfo(const SString& name, double value);
-        SString getInfo(const SString& name);
+        void setInfo(const SString &name, const SString &value);
+        void setInfo(const SString &name, int value);
+        void setInfo(const SString &name, double value);
+        SString getInfo(const SString &name);
 };
 
@@ -94 +94 @@
 
         Part(enum Shape s = SHAPE_BALL_AND_STICK);
-        Part(const Part& src) :PartBase(getDefaultStyle()) { operator=(src); }
-        void operator=(const Part& src);
+        Part(const Part &src) :PartBase(getDefaultStyle()) { operator=(src); }
+        void operator=(const Part &src);
 
         void setPositionAndRotationFromAxis(const Pt3D &p1, const Pt3D &p2);
@@ -101 +101 @@
         void setRot(const Pt3D &r);///< set part.rot (rotation angles) and calculate part.o
 
-        static Param& getStaticParam();
+        static Param &getStaticParam();
 };
 
@@ -128 +128 @@
 
         Joint();
-        Joint(const Joint& src) :PartBase(getDefaultStyle()) { operator=(src); }
-        void operator=(const Joint& src);
+        Joint(const Joint &src) :PartBase(getDefaultStyle()) { operator=(src); }
+        void operator=(const Joint &src);
 
         /** connect two parts with this joint.
@@ -135 +135 @@
                 @see isDelta()
                 */
-        void attachToParts(Part* p1, Part* p2);
+        void attachToParts(Part *p1, Part *p2);
         /// @see attachToParts(Part*,Part*)
         void attachToParts(int p1, int p2);
@@ -168 +168 @@
         Pt3D vcolor;
 
-        static Param& getStaticParam();
+        static Param &getStaticParam();
 };
 
 #define JOINT_DELTA_MARKER 99999.0
 
-////////////////// NN /////////////////
+
+
+////////////////// Neural Network /////////////////
 
 class NeuroClass;
 
-typedef UserTags<NeuroClass, void*, 5> NeuroClassUserTags;
+typedef UserTags<NeuroClass, void *, 5> NeuroClassUserTags;
 
 /** Information about neuron class.
@@ -184 +186 @@
 {
         bool ownedvectordata;
-        void operator=(const NeuroClass& nosuchthich){}
+        void operator=(const NeuroClass &nosuchthich) {}
 public:
         SString name, longname, description;
@@ -207 +209 @@
         /** class name for use in Neuro::setClassName(), Neuro::setDetails() (former 'moredata' field),
                 eg. "N","-",G" */
-        const SString& getName() { return name; }
+        const SString &getName() { return name; }
         /** human friendly name, eg. "Neuron","Link","Gyroscope"  */
-        const SString& getLongName() { return longname; }
+        const SString &getLongName() { return longname; }
         /** long description */
-        const SString& getDescription() { return description; }
-        ParamEntry* getParamTab() { return props; }
+        const SString &getDescription() { return description; }
+        ParamEntry *getParamTab() { return props; }
 
         /** NeuroClass specific properties, recognized by all neurons of this class */
@@ -240 +242 @@
                 }
                 */
-        int* getSymbolGlyph()
+        int *getSymbolGlyph()
         {
                 return vectordata;
@@ -246 +248 @@
         void setSymbolGlyph(int *data, bool owned = 1)
         {
-                if (vectordata&&ownedvectordata) delete[]vectordata;
+                if (vectordata && ownedvectordata) delete[]vectordata;
                 vectordata = data; ownedvectordata = owned;
         }
@@ -282 +284 @@
 
         static void resetActive(); ///< set default values of active and genactive for all classes
-        static void setGenActive(const char* classes[]); ///< set genactive for specified classes
-};
-
-class Neuro;
-
-/** Single processing unit in Framsticks NN.  */
+        static void setGenActive(const char *classes[]); ///< set genactive for specified classes
+};
+
+
+
+
+
+
+/** Single processing unit in Framsticks neural network.  */
 class Neuro : public PartBase
 {
@@ -305 +310 @@
         /** set myclass and make knownclass=true */
         void checkClass();
-        SString** inputInfo(int i);
+        SString **inputInfo(int i);
         void defassign();
 
@@ -313 +318 @@
         Param extraProperties();
 
-        void setInputInfo(int i, const SString& name, const SString &value);
-        void setInputInfo(int i, const SString& name, int value);
-        void setInputInfo(int i, const SString& name, double value);
+        void setInputInfo(int i, const SString &name, const SString &value);
+        void setInputInfo(int i, const SString &name, int value);
+        void setInputInfo(int i, const SString &name, double value);
         SString getInputInfo(int i);
-        SString getInputInfo(int i, const SString& name);
-
-        NeuroClass* getClass();
-        void setClass(NeuroClass*);
+        SString getInputInfo(int i, const SString &name);
+
+        NeuroClass *getClass();
+        void setClass(NeuroClass *);
 
         SString getClassParams() { return myclassparams; }
-        void setClassParams(const SString& cp) { myclassparams = cp; }
+        void setClassParams(const SString &cp) { myclassparams = cp; }
 
         SString getClassName();
-        void setClassName(const SString& clazz);
+        void setClassName(const SString &clazz);
 
         /** return neuro unit details encoded as <CLASS> ":" <PROPERTIES>
@@ -351 +356 @@
                 @see getDetails()
                 */
-        void setDetails(const SString&);
+        void setDetails(const SString &);
 
 #define STATRICKCLASS Neuro
@@ -377 +382 @@
         Neuro();
         Neuro(double _state, double _inertia, double _force, double _sigmo);
-        Neuro(const Neuro& src) :PartBase(getDefaultStyle()) { operator=(src); }
+        Neuro(const Neuro &src) :PartBase(getDefaultStyle()) { operator=(src); }
 
         ~Neuro();
 
-        void operator=(const Neuro& src);
+        void operator=(const Neuro &src);
 
         /** Attach this Neuro to the specified Part or detach it from the body if p==NULL.
@@ -387 +392 @@
                 @see getPart()
                 */
-        void attachToPart(Part* p) { part = p; joint = 0; }
+        void attachToPart(Part *p) { part = p; joint = 0; }
 
         /** Attach this Neuro to the specified Joint or detach it from the body if p==NULL.
@@ -393 +398 @@
                 @see getJoint()
                 */
-        void attachToJoint(Joint* j) { joint = j; part = 0; }
+        void attachToJoint(Joint *j) { joint = j; part = 0; }
 
         void attachToPart(int i);
@@ -422 +427 @@
 
         /** @return the Neuro connected as i-th input */
-        Neuro* getInput(int i) const { return (i >= inputs.size()) ? 0 : inputs(i).n; }
+        Neuro *getInput(int i) const { return (i >= inputs.size()) ? 0 : inputs(i).n; }
         /** @return the Neuro connected as i-th input.
                 @param weight
                 */
-        Neuro* getInput(int i, double &weight) const;
+        Neuro *getInput(int i, double &weight) const;
         /** @return connectin weight for i-th input */
         double getInputWeight(int i) const;
@@ -432 +437 @@
         void setInputWeight(int i, double weight);
         /** connect i-th input with another neuron */
-        void setInput(int i, Neuro*n);
+        void setInput(int i, Neuro *n);
         /** connect i-th input with another neuron */
-        void setInput(int i, Neuro*n, double weight);
+        void setInput(int i, Neuro *n, double weight);
         /** add new input. @return its reference number */
-        int addInput(Neuro* child, double weight = 1.0, const SString* info = 0);
+        int addInput(Neuro *child, double weight = 1.0, const SString *info = 0);
         /** @return reference number [0..InputCount-1] of the input
            or -1 if 'child' is not connected with this Neuro.*/
-        int findInput(Neuro* child) const;
+        int findInput(Neuro *child) const;
         void removeInput(paInt refno);
         /**    @return reference number of the child connection, like findInput() */
-        int removeInput(Neuro* child);
-
-        int findInputs(SList& result, const char* classname = 0, const Part* part = 0, const Joint* joint = 0) const;
-        int findOutputs(SList& result, const char* classname = 0, const Part* part = 0, const Joint* joint = 0) const;
+        int removeInput(Neuro *child);
+
+        int findInputs(SList &result, const char *classname = 0, const Part *part = 0, const Joint *joint = 0) const;
+        int findOutputs(SList &result, const char *classname = 0, const Part *part = 0, const Joint *joint = 0) const;
 
         /* class database retrieval */
@@ -453 +458 @@
                 */
         static SString getClassName(int classindex);
-        static NeuroClass* getClass(int classindex);
-        static NeuroClass* getClass(const SString& classname);
-        static int getClassIndex(const NeuroClass*nc);
+        static NeuroClass *getClass(int classindex);
+        static NeuroClass *getClass(const SString &classname);
+        static int getClassIndex(const NeuroClass *nc);
 
         // not really private, but you should not access those directly
@@ -468 +473 @@
         Orient o;       ///< rotation matrix calculated from "rot"
         static ParamEntry emptyParamTab[];
-        static Param& getStaticParam();
+        static Param &getStaticParam();
 };