Changeset 772 for cpp/frams/genetics/f4

Timestamp:

04/05/18 20:03:20 (7 years ago)

Author:

Maciej Komosinski

Message:

Unified #define modifiers in f1 and f4, fixes issue number 16 [refs #62]

File:

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

cpp/frams/genetics/f4/oper_f4.cpp

@@ -17 +17 @@
 
 
-//see also modifiers in f1
-#define F4_MODIFIERS_VISUAL "DdGgBbHh"
-#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
-const char *Geno_f4::all_modifiers = F4_MODIFIERS;
+const char *Geno_f4::all_modifiers = F14_MODIFIERS ","; //comma in f4 is handled the same way (simple node, F4_ADD_SIMP) as modifiers
 
 // codes that can be changed (apart from being added/deleted)
@@ -40 +36 @@
         { "f4_mut_del", 0, 0, "Delete node", "f 0 100 20", FIELD(prob[F4_DEL]), "mutation: probability of deleting a node", },
         { "f4_mut_mod", 0, 0, "Modify node", "f 0 100 30", FIELD(prob[F4_MOD]), "mutation: probability of changing a node", },
-        { "f4_mut_exmod", 1, 0, "Excluded modifiers", "s 0 30", FIELD(excluded_modifiers), "Modifiers that will not be added nor deleted during mutation\n(all: " F4_MODIFIERS ")", },
+        { "f4_mut_exmod", 1, 0, "Excluded modifiers", "s 0 30", FIELD(excluded_modifiers), "Modifiers that will not be added nor deleted during mutation\n(all: " F14_MODIFIERS ")", },
         { 0, },
 };
@@ -68 +64 @@
 void Geno_f4::setDefaults()
 {
-        excluded_modifiers = F4_MODIFIERS_RARE F4_MODIFIERS_VISUAL;
+        excluded_modifiers = F14_MODIFIERS_RARE F14_MODIFIERS_VISUAL;
 }
 
@@ -722 +718 @@
         char ch = g[pos];
         // style categories
-#define STYL4CAT_MODIFIC F4_MODIFIERS ","
+#define STYL4CAT_MODIFIC F14_MODIFIERS ","
 #define STYL4CAT_NEUMOD "[]|@*GTS:+-/!="
 #define STYL4CAT_DIGIT "0123456789."