Changeset 714 for cpp/frams/neuro

Timestamp:

11/05/17 21:45:20 (7 years ago)

Author:

Maciej Komosinski

Message:

• Setting default NeuroClass? active/genactive in preconfigured genetics
• genactive becomes bool (was int)
• Code formatting

Location:

cpp/frams/neuro

Files:

• geneticneuroparam.cpp (modified) (2 diffs)
• geneticneuroparam.h (modified) (2 diffs)

cpp/frams/neuro/geneticneuroparam.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -6 +6 @@
 #include <frams/neuro/neurolibrary.h>
 
-GeneticNeuroParam::GeneticNeuroParam(const char* groupname,const char* myname,
-                                   const char* prefix,const char* typ)
-        :NeuroLibParam(groupname,myname,prefix),types(typ)
+GeneticNeuroParam::GeneticNeuroParam(const char* groupname, const char* myname,
+        const char* prefix, const char* typ)
+        :NeuroLibParam(groupname, myname, prefix), types(typ)
 {}
 
 paInt GeneticNeuroParam::getInt(int i)
-{return Neuro::getClass(i)->genactive;}
+{
+        return Neuro::getClass(i)->genactive ? 1 : 0;
+}
 
-int GeneticNeuroParam::setInt(int i,paInt v)
-{Neuro::getClass(i)->genactive=v;return PSET_CHANGED;}
+int GeneticNeuroParam::setInt(int i, paInt v)
+{
+        Neuro::getClass(i)->genactive = (v != 0); return PSET_CHANGED;
+}
 

cpp/frams/neuro/geneticneuroparam.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -8 +8 @@
 #include "neurolibparam.h"
 
-class GeneticNeuroParam: public NeuroLibParam
+class GeneticNeuroParam : public NeuroLibParam
 {
-  protected:
-const char* types;
-  public:
-GeneticNeuroParam(const char* groupname,const char* myname, const char* prefix,const char* typ=0);
+protected:
+        const char* types;
+public:
+        GeneticNeuroParam(const char* groupname, const char* myname, const char* prefix, const char* typ = 0);
 
-paInt getInt(int i);
-int setInt(int i,paInt v);
-const char *type(int i) {return types?types:NeuroLibParam::type(i);}
+        paInt getInt(int i);
+        int setInt(int i, paInt v);
+        const char *type(int i) { return types ? types : NeuroLibParam::type(i); }
 };