Changeset 1260 for cpp/frams/genetics/geneprops.h

Timestamp:

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

Author:

Maciej Komosinski

Message:

Cosmetic

File:

• cpp/frams/genetics/geneprops.h (modified) (4 diffs)

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);
 
         /**