Changeset 1260

Timestamp:

06/22/23 04:00:45 (17 months ago)

Author:

Maciej Komosinski

Message:

Cosmetic

Location:

cpp/frams

Files:

• Makefile-SDK-files (modified) (1 diff)
• _demos/geneprops_test.cpp (modified) (4 diffs)
• genetics/geneprops.cpp (modified) (5 diffs)
• genetics/geneprops.h (modified) (4 diffs)

cpp/frams/Makefile-SDK-files

@@ -41 +41 @@
 NN_LAYOUT_OBJS=frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o
 
-SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/util-string.o common/util-file.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/genooperators.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o common/virtfile/stdinoutfilesystem.o $(PRINTFLOAT_OBJS)
+SDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/param/paramlist.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/log.o common/util-string.o common/util-file.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/genooperators.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o common/virtfile/stdinoutfilesystem.o $(PRINTFLOAT_OBJS)
 
 STDOUT_LOGGER_OBJS=common/virtfile/virtfile.o common/loggers/loggertostdout.o common/console.o 

cpp/frams/_demos/geneprops_test.cpp

@@ -80 +80 @@
         int maxcount = 4;
 
-        enum Function { Legacy, RecreatedLegacy, New05, NewExponential };
-        Function fun = Legacy;
+        enum Function { Legacy, AllChange05, ExperimentalExponential };
+        Function fun = AllChange05;
 
         int argpos = 0;
@@ -91 +91 @@
                         {
                         case 'l': fun = Legacy; break;
-                        case 'r': fun = RecreatedLegacy; break;
-                        case 'n': fun = New05; break;
-                        case 'e': fun = NewExponential; break;
+                        case 'n': fun = AllChange05; break;
+                        case 'e': fun = ExperimentalExponential; break;
                         case 'h': printf("%s args: [modifier [max_count]] (one of " F14_MODIFIERS ")\n"
                                 "\t-l = legacy function\n"
-                                "\t-r = recreated legacy function\n"
-                                "\t-n = new, change=0.5, normalizeBiol4 disabled\n"
-                                "\t-e = new exponential function\n", argv[0]);
+                                "\t-n = modern, change=0.5, normalizeBiol4 disabled\n"
+                                "\t-e = experimental exponential function\n", argv[0]);
                                 return 0;
                         default: fprintf(stderr, "%s: invalid option: %s\n", argv[0], arg); return 2;
@@ -115 +113 @@
 
         GenePropsOps_Exponential exponential_ops;
-        GenePropsOps_Old recreated_ops;
-        GenePropsOps_New05 new05_ops;
+        GenePropsOps_Legacy legacy_ops;
+        GenePropsOps_AllChange05 allchange05_ops;
         GenePropsOps *ops;
 
         switch (fun)
         {
-        case RecreatedLegacy: ops = &recreated_ops; break;
-        case NewExponential:  ops = &exponential_ops; break;
-        case New05:  ops = &new05_ops; break;
+        case Legacy: ops = &legacy_ops; break;
+        case ExperimentalExponential:  ops = &exponential_ops; break;
+        case AllChange05:  ops = &allchange05_ops; break;
         default: ops = NULL;
         }
@@ -138 +136 @@
                                 char m = ((1 << c) & i) ? modifier_u : modifier_l;
                                 tmp[c] = m;
-                                if (fun == Legacy)
-                                        props.executeModifier_Legacy(m);
-                                else
-                                        props.executeModifier(m, ops);
+                                props.executeModifier(m, ops);
                         }
                         if (count > 0)

cpp/frams/genetics/geneprops.cpp

@@ -51 +51 @@
 }
 
-int GeneProps::executeModifier_Legacy(char modif)
-{
-        switch (modif)
-        {
-#ifdef v1f1COMPATIBLE
-        case 'L': length += (3.0 - length) * 0.3;
-                length = std::min(length, Model::getMaxJoint().d.x); break;
-#else
-        case 'L': length += (2.0 - length) * 0.3; //2.0 is currently Model::getMaxJoint().d.x so min() does not limit the range
-                length = std::min(length, Model::getMaxJoint().d.x); break;
-#endif
-        case 'l': length += (0.33 - length) * 0.3;
-                length = std::max(length, Model::getMinJoint().d.x); break;
-
-        case 'W': weight += (2.0 - weight) * 0.3; break;
-        case 'w': weight += (0.5 - weight) * 0.3; break;
-        case 'F': friction += (4 - friction) * 0.2; break;
-        case 'f': friction -= friction * 0.2; break;
-        case 'C': curvedness += (2.0 - curvedness) * 0.25; break;
-        case 'c': curvedness += (-2.0 - curvedness) * 0.25; break;
-        case 'Q': twist += (M_PI_2 - twist) * 0.3; break;
-        case 'q': twist += (-M_PI_2 - twist) * 0.3; break;
-        case 'E': energy += (10.0 - energy) * 0.1; break;
-        case 'e': energy -= energy * 0.1;  break;
-
-        case 'A': assimilation += (1 - assimilation) * 0.8; normalizeBiol4(); break;
-        case 'a': assimilation -= assimilation * 0.4; normalizeBiol4(); break;
-        case 'I': ingestion += (1 - ingestion) * 0.8; normalizeBiol4(); break;
-        case 'i': ingestion -= ingestion * 0.4; normalizeBiol4(); break;
-        case 'S': stamina += (1 - stamina) * 0.8; normalizeBiol4(); break;
-        case 's': stamina -= stamina * 0.4; normalizeBiol4(); break;
-        case 'M': muscle_power += (1 - muscle_power) * 0.8; normalizeBiol4(); break;
-        case 'm': muscle_power -= muscle_power * 0.4; normalizeBiol4(); break;
-
-        case 'D': cred += (1.0 - cred) * 0.25; break;
-        case 'd': cred += (0.0 - cred) * 0.25; break;
-        case 'G': cgreen += (1.0 - cgreen) * 0.25; break;
-        case 'g': cgreen += (0.0 - cgreen) * 0.25; break;
-        case 'B': cblue += (1.0 - cblue) * 0.25; break;
-        case 'b': cblue += (0.0 - cblue) * 0.25; break;
-
-        default: return -1;
-        }
-        return 0;
-}
-
 int GeneProps::executeModifier(char modif, GenePropsOps* ops)
 {
         if (ops == NULL)
-                ops = getStandardOps();
+                ops = getDefaultOps();
 
 #define APPLY(name) ops->name->apply(name, modif)
@@ -152 +106 @@
 
         if (ops == NULL)
-                ops = getStandardOps();
+                ops = getDefaultOps();
         if (ops->use_normalizebiol4) normalizeBiol4();
 
@@ -171 +125 @@
 }
 
-double GenePropsOp_Old::increase(double value) const
+double GenePropsOp_Legacy::increase(double value) const
 {
         return value + (maxvalue - value) * change;
 }
 
-double GenePropsOp_Old::decrease(double value) const
+double GenePropsOp_Legacy::decrease(double value) const
 {
         return value + (minvalue - value) * revchange;
 }
 
-GenePropsOp_Old::GenePropsOp_Old(double minvalue, double maxvalue, double defvalue, double change, double revchange)
+GenePropsOp_Legacy::GenePropsOp_Legacy(double minvalue, double maxvalue, double defvalue, double change, double revchange)
 {
         this->minvalue = minvalue;
@@ -246 +200 @@
 }
 
-GenePropsOps_Old::GenePropsOps_Old()
+GenePropsOps_Legacy::GenePropsOps_Legacy()
 {
         use_normalizebiol4 = true;
 
-        length = new GenePropsOp_Old(0.33, 2.0, GeneProps::standard_values.length, 0.3);
-        weight = new GenePropsOp_Old(0.5, 2.0, GeneProps::standard_values.weight, 0.3);
-        friction = new GenePropsOp_Old(0, 4.0, GeneProps::standard_values.friction, 0.2);
-        curvedness = new GenePropsOp_Old(-2, 2, GeneProps::standard_values.curvedness, 0.25);
-        twist = new GenePropsOp_Old(-M_PI_2, M_PI_2, GeneProps::standard_values.twist, 0.3);
-        energy = new GenePropsOp_Old(0, 10, GeneProps::standard_values.energy, 0.1);
-
-        assimilation = new GenePropsOp_Old(0, 1, GeneProps::standard_values.assimilation, 0.8, 0.4);
-        ingestion = new GenePropsOp_Old(0, 1, GeneProps::standard_values.ingestion, 0.8, 0.4);
-        stamina = new GenePropsOp_Old(0, 1, GeneProps::standard_values.stamina, 0.8, 0.4);
-        muscle_power = new GenePropsOp_Old(0, 1, GeneProps::standard_values.muscle_power, 0.8, 0.4);
-
-        cred = new GenePropsOp_Old(0, 1, GeneProps::standard_values.cred, 0.25);
-        cgreen = new GenePropsOp_Old(0, 1, GeneProps::standard_values.cgreen, 0.25);
-        cblue = new GenePropsOp_Old(0, 1, GeneProps::standard_values.cblue, 0.25);
-}
-
-GenePropsOps_New05::GenePropsOps_New05()
+        length = new GenePropsOp_Legacy(0.33, 2.0, GeneProps::standard_values.length, 0.3);
+        weight = new GenePropsOp_Legacy(0.5, 2.0, GeneProps::standard_values.weight, 0.3);
+        friction = new GenePropsOp_Legacy(0, 4.0, GeneProps::standard_values.friction, 0.2);
+        curvedness = new GenePropsOp_Legacy(-2, 2, GeneProps::standard_values.curvedness, 0.25);
+        twist = new GenePropsOp_Legacy(-M_PI_2, M_PI_2, GeneProps::standard_values.twist, 0.3);
+        energy = new GenePropsOp_Legacy(0, 10, GeneProps::standard_values.energy, 0.1);
+
+        assimilation = new GenePropsOp_Legacy(0, 1, GeneProps::standard_values.assimilation, 0.8, 0.4);
+        ingestion = new GenePropsOp_Legacy(0, 1, GeneProps::standard_values.ingestion, 0.8, 0.4);
+        stamina = new GenePropsOp_Legacy(0, 1, GeneProps::standard_values.stamina, 0.8, 0.4);
+        muscle_power = new GenePropsOp_Legacy(0, 1, GeneProps::standard_values.muscle_power, 0.8, 0.4);
+
+        cred = new GenePropsOp_Legacy(0, 1, GeneProps::standard_values.cred, 0.25);
+        cgreen = new GenePropsOp_Legacy(0, 1, GeneProps::standard_values.cgreen, 0.25);
+        cblue = new GenePropsOp_Legacy(0, 1, GeneProps::standard_values.cblue, 0.25);
+}
+
+GenePropsOps_AllChange05::GenePropsOps_AllChange05()
 {
         use_normalizebiol4 = false;
+
+        constexpr float CHANGE = 0.5;
         auto fields = { length,curvedness,weight,friction,muscle_power,assimilation,stamina,ingestion,twist,energy,cred,cgreen,cblue };
         for (auto f : fields)
         {
-                auto f_gpo = dynamic_cast<GenePropsOp_Old*>(f);
+                auto f_gpo = dynamic_cast<GenePropsOp_Legacy*>(f);
                 if (f_gpo)
-                        f_gpo->change = f_gpo->revchange = 0.5;
-        }
+                        f_gpo->change = f_gpo->revchange = CHANGE;
+        }
+
+        delete curvedness;
+        curvedness = new GenePropsOp_Legacy(-M_PI_2, M_PI_2, GeneProps::standard_values.curvedness, CHANGE);
 }
 
@@ -298 +257 @@
 }
 
-
-GenePropsOps* GeneProps::standard_ops = NULL;
-GenePropsOps* GeneProps::getStandardOps()
-{
-        if (!standard_ops)
-                standard_ops = new GenePropsOps_New05();
-        return standard_ops;
-}
+GenePropsOps* GeneProps::getAllChange05Ops()
+{
+        static GenePropsOps_AllChange05 ops;
+        return &ops;
+}
+
+GenePropsOps* GeneProps::getLegacyOps()
+{
+        static GenePropsOps_Legacy ops;
+        return &ops;
+}
+
+static GenePropsOps* default_ops = NULL;
+
+GenePropsOps* GeneProps::getDefaultOps()
+{
+        if (!default_ops)
+                default_ops = getAllChange05Ops();
+        return default_ops;
+}
+
+void GeneProps::setDefaultOps(GenePropsOps* ops)
+{
+        default_ops = ops;
+}

cpp/frams/genetics/geneprops.h

@@ -28 +28 @@
 };
 
-class GenePropsOp_Old : public GenePropsOp
+class GenePropsOp_Legacy : public GenePropsOp
 {
         double minvalue, maxvalue, defvalue, change, revchange;
 public:
-        GenePropsOp_Old(double minvalue, double maxvalue, double defvalue, double change, double revchange = -1);
+        GenePropsOp_Legacy(double minvalue, double maxvalue, double defvalue, double change, double revchange = -1);
         double increase(double value) const;
         double decrease(double value) const;
-        friend class GenePropsOps_New05;
+        friend class GenePropsOps_AllChange05;
 };
 
 class GenePropsOp_NormalizedAndScaled : public GenePropsOp
 {
-        GenePropsOp_Old normalized;
+        GenePropsOp_Legacy normalized;
 public:
         GenePropsOp_NormalizedAndScaled(double change) :normalized(-1, 1, 0, change) {}
@@ -79 +79 @@
 };
 
-class GenePropsOps_Old : public GenePropsOps
+class GenePropsOps_Legacy : public GenePropsOps
 {
 public:
-        GenePropsOps_Old();
+        GenePropsOps_Legacy();
 };
 
-class GenePropsOps_New05 : public GenePropsOps_Old
+/**
+* Just as legacy (before 2023-06), but the influence of each modifier is uniform and simpler (no normalizeBiol4()).
+* This is what is currently used in Framsticks.
+*/
+class GenePropsOps_AllChange05 : public GenePropsOps_Legacy
 {
 public:
-        GenePropsOps_New05();
+        GenePropsOps_AllChange05();
 };
 
+/**
+* Just an experiment with a different scaling of the influence of individual modifier characters to cover
+* the entire range of parameter values. After investigations we decided that it does not
+* provide any advantages over "AllChange05".
+*/
 class GenePropsOps_Exponential : public GenePropsOps
 {
@@ -132 +141 @@
 
         static GeneProps standard_values;
-        static GenePropsOps* standard_ops;
-        static GenePropsOps* getStandardOps();
+        
+        static GenePropsOps* getDefaultOps();
+        static void setDefaultOps(GenePropsOps* ops);
 
+        static GenePropsOps* getAllChange05Ops();
+        static GenePropsOps* getLegacyOps();
+        
         /**
          * Constructor initializing all properties with default values.
@@ -154 +167 @@
          */
         int executeModifier(char modif, GenePropsOps* ops = NULL);
-        int executeModifier_Legacy(char modif);
 
         /**