Changeset 767 for cpp/frams/genetics/f4/oper_f4.cpp

Timestamp:

03/29/18 22:52:36 (6 years ago)

Author:

Maciej Komosinski

Message:

More strict parsing of the repetition counter; bug fixes; improved docs [refs #62]

File:

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

cpp/frams/genetics/f4/oper_f4.cpp

@@ -20 +20 @@
 #define F4_MODIFIERS_VISUAL "" //not supported in f4
 #define F4_MODIFIERS_RARE "EeWwAaSs" //expdef would need to handle these properly/specifically to ensure reasonable behavior, and hardly any expdef does. Modifying initial energy of a creature as a result of its genes (Ee) is in general not a good idea. Weight (Ww) works only in water, and in water sinking/going up should usually be caused by real "intentional" activity of a creature, not by its inherited weight. For assimilation (Aa), there is a dedicated parameter in CreaturesGroup. Stamina (Ss) is no longer needed as destructive collisions are not supported, and even if they were, some expdef would need to impose reasonable restrictions on the value of this parameter (e.g. similar to normalizeBiol4()) so there is some cost associated with it, and the specific consequences of destructions should be defined as needed.
-#define F4_MODIFIERS "LlRrCcQqFfMmIi" F4_MODIFIERS_RARE F4_MODIFIERS_VISUAL
+#define F4_MODIFIERS ",LlRrCcQqFfMmIi" F4_MODIFIERS_RARE F4_MODIFIERS_VISUAL
 const char *Geno_f4::all_modifiers = F4_MODIFIERS;
+
+// codes that can be changed (apart from being added/deleted)
+#define MUT_CHAN_CODES "<[#"
+#define REP_MAXCOUNT 19
 
 #define FIELDSTRUCT Geno_f4
@@ -134 +138 @@
         // ! the genotype is g->child (not g) !
 
-        // codes that can be changed (apart being added/deleted)
-#define MUT_CHAN_CODES "<[#"
-#define ADD_SIMPLE_CODES ",XlLcCrRaAiIsSmMfFwWeEN@|"
-#define REP_MAXCOUNT 19
-
         // do the mutation
         // pick a random node
@@ -176 +175 @@
                                 else
                                 {
-                                        f4_node *n4 = new f4_node(rndclass->getName().c_str(), n2, n2->pos); //TODO move this above
+                                        f4_node *n4 = new f4_node(rndclass->getName().c_str(), n2, n2->pos);
                                         if (rndclass->getPreferredInputs() != 0)
                                         {
@@ -280 +279 @@
                         // choose a simple node from ADD_SIMPLE_CODES
                         n1->parent->removeChild(n1);
-                        f4_node *n2 = new f4_node(ADD_SIMPLE_CODES[randomN(strlen(ADD_SIMPLE_CODES))], n1->parent, n1->parent->pos);
+                        //f4_node *n2 = new f4_node(ADD_SIMPLE_CODES[randomN(strlen(ADD_SIMPLE_CODES))], n1->parent, n1->parent->pos);
+                        int modifierid = GenoOperators::getRandomChar(all_modifiers, excluded_modifiers.c_str());
+                        f4_node *n2 = new f4_node(all_modifiers[modifierid], n1->parent, n1->parent->pos);
                         n2->addChild(n1);
                         n1->parent = n2;
@@ -717 +718 @@
 }
 
-
-
 uint32_t Geno_f4::style(const char *g, int pos)
 {
@@ -727 +726 @@
 #define STYL4CAT_DIGIT "0123456789."
 #define STYL4CAT_REST "XN<># "
-        if (!strchr(STYL4CAT_MODIFIC STYL4CAT_NEUMOD STYL4CAT_DIGIT STYL4CAT_REST, ch))
+
+        if (!isalpha(ch) && !isdigit(ch) &&  !strchr("<>-+[]:,.@|#*/=!\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);
@@ -737 +738 @@
         if (strchr(STYL4CAT_MODIFIC, ch))   style = GENSTYLE_RGBS(100, 100, 100, GENSTYLE_NONE);
         if (strchr(STYL4CAT_NEUMOD, ch))    style = GENSTYLE_RGBS(0, 150, 0, GENSTYLE_NONE);
+        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);
+                                }
+                        }
+                }
+        }
         return style;
 }