Changeset 674

Timestamp:

08/19/17 02:45:00 (7 years ago)

Author:

Maciej Komosinski

Message:

f4 modifiers implemented similarly to f1 modifiers, and a base for support for excluding selected modifiers in f4 mutations

Location:

cpp/frams/genetics/f4

Files:

• oper_f4.cpp (modified) (3 diffs)
• oper_f4.h (modified) (2 diffs)

cpp/frams/genetics/f4/oper_f4.cpp

@@ -16 +16 @@
 
 
+//see also modifiers in f1
+#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 there sinking/going up should usually be caused by real 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()) and the specific consequences of destructions should be defined as needed.
+#define F4_MODIFIERS "LlRrCcQqFfMmIi" F4_MODIFIERS_RARE F4_MODIFIERS_VISUAL //TODO no Rr in f4?
+const char *Geno_f4::all_modifiers = F4_MODIFIERS;
+
 #define FIELDSTRUCT Geno_f4
 
 static ParamEntry GENO4param_tab[] =
 {
-        { "Genetics: f4", 1, F4_COUNT + F4_ADD_COUNT, },
+        { "Genetics: f4", 1, F4_COUNT + F4_ADD_COUNT + 1, },
         { "f4_mut_add", 0, 0, "Add node", "f 0 100 50", FIELD(prob[F4_ADD]), "mutation: probability of adding a node", },
         { "f4_mut_add_div", 0, 0, "- add division", "f 0 100 20", FIELD(probadd[F4_ADD_DIV]), "add node mutation: probability of adding a division", },
@@ -29 +35 @@
         { "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 ")", },
         { 0, },
 };
@@ -52 +59 @@
         mutation_method_names[index++] = "modified a node";
         if (index != F4_COUNT + F4_ADD_COUNT - 1) logMessage("Geno_f4", "Constructor", 3, "Mutation names init error");
+}
+
+void Geno_f4::setDefaults()
+{
+        excluded_modifiers = F4_MODIFIERS_RARE F4_MODIFIERS_VISUAL;
 }
 

cpp/frams/genetics/f4/oper_f4.h

@@ -33 +33 @@
 public:
         Geno_f4();
+        void setDefaults();
+
         int checkValidity(const char *, const char *genoname);
         int validate(char *&, const char *genoname);
@@ -42 +44 @@
         // mutation probabilities
         double prob[F4_COUNT], probadd[F4_ADD_COUNT];
+
+        SString excluded_modifiers; //not to be used in mutations
+        static const char *all_modifiers;
 
 protected: