Changeset 935 for cpp/frams/genetics/fH

Timestamp:

05/29/20 15:20:29 (5 years ago)

Author:

Maciej Komosinski

Message:

Utility functions that provide a set of all neuron classes fulfilling given criteria now also filter neuron classes by the desired Model shape type (BALL_AND_STICK or SOLIDS)

File:

• cpp/frams/genetics/fH/fH_oper.cpp (modified) (4 diffs)

cpp/frams/genetics/fH/fH_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-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -255 +255 @@
                 fH_Handle *handle = NULL;
                 method = FH_OPCOUNT + roulette(addoperations, FH_ADD_OPCOUNT);
-                if (getActiveNeuroClassCount() == 0) method = FH_OPCOUNT + FH_ADD_STICK;
+                if (getActiveNeuroClassCount(Model::SHAPE_BALL_AND_STICK) == 0) method = FH_OPCOUNT + FH_ADD_STICK;
                 switch (method - FH_OPCOUNT)
                 {
@@ -466 +466 @@
         if (userandomclass)
         {
-                nc = getRandomNeuroClass();
+                nc = getRandomNeuroClass(Model::SHAPE_BALL_AND_STICK);
                 // checking of neuron class availability should be checked before
         }
@@ -503 +503 @@
 uint32_t Geno_fH::style(const char *g, int pos)
 {
-   char ch=g[pos];
-   uint32_t style=GENSTYLE_CS(0,GENSTYLE_NONE); //default, should be changed below
-
-   int pp=pos; //detect comment line
-   while (pp>1 && g[pp-1]!='\n') pp--;
-   if (g[pp]=='#') return GENSTYLE_RGBS(0,220,0,GENSTYLE_NONE); //comment line
-
-   if (pos==0 || g[pos-1]=='\n' || ch==':' || ch==',') style=GENSTYLE_CS(0,GENSTYLE_BOLD); else
-     if (ch=='\"') style=GENSTYLE_RGBS(150,0,0,GENSTYLE_BOLD); else
-     {
-      int cudz=0,neuclass=1; //ile cudz. do poczatku linii; czy w nazwie neuroklasy?
-      while (pos>0)
-      {
-         pos--;
-         if (g[pos]=='\"') cudz++;
-         if (cudz==0 && (g[pos]==':' || g[pos]==',')) neuclass=0;
-         if (g[pos]=='\n') break;
-      }
-      if (cudz%2)
-      {
-         if (neuclass) style=GENSTYLE_RGBS(150,0,150,GENSTYLE_BOLD); else //neuroclass
-           if (isalpha(ch)) style=GENSTYLE_RGBS(255,140,0,GENSTYLE_BOLD); else //property
-             style=GENSTYLE_RGBS(200,0,0,GENSTYLE_NONE);
-      } else
-        if (isalpha(ch)) style=GENSTYLE_RGBS(0,0,200,GENSTYLE_BOLD);
-     }
-   return style;
-}
+        char ch = g[pos];
+        uint32_t style = GENSTYLE_CS(0, GENSTYLE_NONE); //default, should be changed below
+
+        int pp = pos; //detect comment line
+        while (pp > 1 && g[pp - 1] != '\n') pp--;
+        if (g[pp] == '#') return GENSTYLE_RGBS(0, 220, 0, GENSTYLE_NONE); //comment line
+
+        if (pos == 0 || g[pos - 1] == '\n' || ch == ':' || ch == ',') style = GENSTYLE_CS(0, GENSTYLE_BOLD); else
+                if (ch == '\"') style = GENSTYLE_RGBS(150, 0, 0, GENSTYLE_BOLD); else
+                {
+                        int cudz = 0, neuclass = 1; //ile cudz. do poczatku linii; czy w nazwie neuroklasy?
+                        while (pos > 0)
+                        {
+                                pos--;
+                                if (g[pos] == '\"') cudz++;
+                                if (cudz == 0 && (g[pos] == ':' || g[pos] == ',')) neuclass = 0;
+                                if (g[pos] == '\n') break;
+                        }
+                        if (cudz % 2)
+                        {
+                                if (neuclass) style = GENSTYLE_RGBS(150, 0, 150, GENSTYLE_BOLD); else //neuroclass
+                                        if (isalpha(ch)) style = GENSTYLE_RGBS(255, 140, 0, GENSTYLE_BOLD); else //property
+                                                style = GENSTYLE_RGBS(200, 0, 0, GENSTYLE_NONE);
+                        }
+                        else
+                                if (isalpha(ch)) style = GENSTYLE_RGBS(0, 0, 200, GENSTYLE_BOLD);
+                }
+        return style;
+}