Changeset 773 for cpp/frams

Timestamp:

04/05/18 23:14:35 (7 years ago)

Author:

Maciej Komosinski

Message:

Improved styling implementation, fixes issue number 18 [refs #62]

File:

• cpp/frams/genetics/f4/oper_f4.cpp (modified) (7 diffs)

cpp/frams/genetics/f4/oper_f4.cpp

@@ -186 +186 @@
                                                         if (g->ordNode(i) == n3)
                                                         {
-                                                                neuronid = neulist.size()-1;
+                                                                neuronid = neulist.size() - 1;
                                                         }
                                                 }
@@ -236 +236 @@
                                         if (gcur == par)
                                         {
-                                                neuronid = neulist.size()-1;
+                                                neuronid = neulist.size() - 1;
                                         }
                                 }
@@ -395 +395 @@
                                 if (gcur == n1)
                                 {
-                                        neuronid = neulist.size()-1;
+                                        neuronid = neulist.size() - 1;
                                 }
                         }
@@ -434 +434 @@
         {
                 // '*', 'G', 'T', or 'S', 1/4 chance each
-                nc =  GenoOperators::getRandomNeuroClassWithOutputAndNoInputs();
+                nc = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs();
         }
         if (nc != NULL)
@@ -451 +451 @@
         }
         // weight
-        nn->f1 = GenoOperators::mutateNeuProperty(nn->f1,NULL,-1);
+        nn->f1 = GenoOperators::mutateNeuProperty(nn->f1, NULL, -1);
         //nn->f1 = 10.0f * (rnd01 - 0.5f);
 }
@@ -485 +485 @@
                         nn->l1 = neuid - id;
                 }
-                        //nn->l1 += (int)(2.0f * (rnd01 - 0.5f));
+                //nn->l1 += (int)(2.0f * (rnd01 - 0.5f));
                 break;
         case 2: // change weight
-                nn->f1 = GenoOperators::mutateNeuProperty(nn->f1,NULL,-1);
+                nn->f1 = GenoOperators::mutateNeuProperty(nn->f1, NULL, -1);
                 //nn->f1 += 1.0f * (rnd01 - 0.5f);
                 break;
@@ -717 +717 @@
 {
         char ch = g[pos];
+
         // style categories
 #define STYL4CAT_MODIFIC F14_MODIFIERS ","
-#define STYL4CAT_NEUMOD "[]|@*GTS:+-/!="
+#define STYL4CAT_NEUMOD "[]:+-/!="
+#define STYL4CAT_NEUSPECIAL "|@*"
 #define STYL4CAT_DIGIT "0123456789."
 #define STYL4CAT_REST "XN<># "
 
-        if (!isalpha(ch) && !isdigit(ch) &&  !strchr("<>-+[]:,.@|#*/=!\t",ch)) {
+        if (!isalpha(ch) && !strchr(STYL4CAT_MODIFIC STYL4CAT_NEUMOD STYL4CAT_NEUSPECIAL STYL4CAT_DIGIT STYL4CAT_REST "\t", ch))
+        {
                 return GENSTYLE_CS(0, GENSTYLE_INVALID);
         }
         uint32_t style = GENSTYLE_CS(0, GENSTYLE_STRIKEOUT); //default, should be changed below
-        if (strchr("X ", ch))              style = GENSTYLE_CS(0, GENSTYLE_NONE);
-        else if (strchr("N", ch))               style = GENSTYLE_RGBS(0, 200, 0, GENSTYLE_NONE);
-        else if (strchr("<", ch))               style = GENSTYLE_RGBS(0, 0, 200, GENSTYLE_BOLD);
-        else if (strchr(">", ch))               style = GENSTYLE_RGBS(0, 0, 100, GENSTYLE_NONE);
+        if (strchr("X ", ch))                    style = GENSTYLE_CS(0, GENSTYLE_NONE);
+        else if (strchr("N", ch))                style = GENSTYLE_RGBS(0, 200, 0, GENSTYLE_NONE);
+        else if (strchr("<", ch))                style = GENSTYLE_RGBS(0, 0, 200, GENSTYLE_BOLD);
+        else if (strchr(">", ch))                style = GENSTYLE_RGBS(0, 0, 100, GENSTYLE_NONE);
         else if (strchr(STYL4CAT_DIGIT, ch))     style = GENSTYLE_RGBS(100, 100, 100, GENSTYLE_NONE);
         else if (strchr(STYL4CAT_MODIFIC, ch))   style = GENSTYLE_RGBS(100, 100, 100, GENSTYLE_NONE);
         else if (strchr(STYL4CAT_NEUMOD, ch))    style = GENSTYLE_RGBS(0, 150, 0, GENSTYLE_NONE);
-        else if (isalpha(ch)) {
-                int p = pos;
-                while (p > 0) {
-                        p--;
-                        if (!isalpha(g[p])) {
-                                if (isupper(g[p+1]) && (g[p] == ':' || g[p] == '[')) { // name of neuron class
-                                        style = GENSTYLE_RGBS(150,0,150,GENSTYLE_ITALIC);
-                                }
-                                else { // property
-                                        style = GENSTYLE_RGBS(255,140,0,GENSTYLE_BOLD);
-                                }
+        if (isalpha(ch) || strchr(STYL4CAT_NEUSPECIAL, ch))
+        {
+                while (pos > 0)
+                {
+                        pos--;
+                        if (!(isalpha(g[pos]) || strchr(STYL4CAT_NEUSPECIAL, ch)))
+                        {
+                                if (isupper(g[pos + 1]) && (g[pos] == ':' || g[pos] == '[')) // name of neuron class
+                                        style = GENSTYLE_RGBS(150, 0, 150, GENSTYLE_ITALIC);
+                                else // property
+                                        style = GENSTYLE_RGBS(100, 100, 100, GENSTYLE_NONE);
                         }
                 }