Changeset 670 for cpp/frams/genetics

Timestamp:

08/12/17 01:55:25 (7 years ago)

Author:

Maciej Komosinski

Message:

Improved variable names and docs

Location:

cpp/frams/genetics

Files:

• oper_fx.cpp (modified) (5 diffs)
• oper_fx.h (modified) (1 diff)

cpp/frams/genetics/oper_fx.cpp

@@ -121 +121 @@
                         if (strcmp(n, "fo") == 0 && strcmp(na, "Force") == 0) newval = CustomRnd(distrib_force); else
                         {
-                                double mn, mx, df;
-                                getMinMaxDef(&p, i, mn, mx, df);
-                                newval = mutateCreep(p.type(i)[0], oldval, mn, mx);
+                double mn, mx, df;
+                getMinMaxDef(&p, i, mn, mx, df);
+                newval = mutateCreep(p.type(i)[0], oldval, mn, mx);
                         }
         return true;
@@ -141 +141 @@
         //reflect:
         if (result > mx) result = mx - (result - mx); else
-                if (result<mn) result = mn + (mn - result);
+                if (result < mn) result = mn + (mn - result);
         //absorb (just in case 'result' exceeded the allowed range so much):
-        if (result>mx) result = mx; else
+        if (result > mx) result = mx; else
                 if (result < mn) result = mn;
         return result;
@@ -167 +167 @@
                 if (type1 == 'd' && type2 == 'd')
                 {
-                        int v1 = p1.getInt(i1);
-                        int v2 = p2.getInt(i2);
-                        setIntFromDoubleWithProbabilisticDithering(p1, i1, v1*proportion + v2*(1 - proportion));
-                        setIntFromDoubleWithProbabilisticDithering(p2, i2, v2*proportion + v1*(1 - proportion));
+                int v1 = p1.getInt(i1);
+                int v2 = p2.getInt(i2);
+                setIntFromDoubleWithProbabilisticDithering(p1, i1, v1*proportion + v2*(1 - proportion));
+                setIntFromDoubleWithProbabilisticDithering(p2, i2, v2*proportion + v1*(1 - proportion));
                 }
                 else
@@ -187 +187 @@
 NeuroClass* GenoOperators::parseNeuroClass(char*& s)
 {
-        int len = (int)strlen(s);
-        int Len = 0;
-        NeuroClass *I = NULL;
+        int maxlen = (int)strlen(s);
+        int NClen = 0;
+        NeuroClass *NC = NULL;
         for (int i = 0; i<Neuro::getClassCount(); i++)
         {
-                const char *n = Neuro::getClass(i)->name.c_str();
-                int l = (int)strlen(n);
-                if (len >= l && l>Len && (strncmp(s, n, l) == 0)) { I = Neuro::getClass(i); Len = l; }
-        }
-        s += Len;
-        return I;
+                const char *ncname = Neuro::getClass(i)->name.c_str();
+                int ncnamelen = (int)strlen(ncname);
+                if (maxlen >= ncnamelen && ncnamelen>NClen && (strncmp(s, ncname, ncnamelen) == 0))
+                {
+                        NC = Neuro::getClass(i);
+                        NClen = ncnamelen;
+                }
+        }
+        s += NClen;
+        return NC;
 }
 
@@ -252 +256 @@
                 logMessage("GenoOperators", "skipWS", LOG_WARN, "NULL reference!");
         else
-        while (isWS(*s)) s++;
+                while (isWS(*s)) s++;
 }
 

cpp/frams/genetics/oper_fx.h

@@ -192 +192 @@
    static void linearMix(ParamInterface &p1, int i1, ParamInterface &p2, int i2, double proportion); ///<mixes i1'th and i2'th properties of p1 and p2; proportion should be within [0,1]; 0.5 causes both properties to become their average. For integer properties applies random "dithering" when necessary.
    static NeuroClass* getRandomNeuroClass(); ///<returns random neuroclass or NULL when no active classes.
-   static NeuroClass* parseNeuroClass(char *&s); ///<returns neuroclass or NULL if the string does not begin with a valid name. Advance \e s pointer.
+   static NeuroClass* parseNeuroClass(char *&s); ///<returns longest matching neuroclass or NULL if the string does not begin with a valid neuroclass name. Advances \e s pointer.
    static Neuro* findNeuro(const Model *m,const NeuroClass *nc); ///<returns pointer to first Neuro of class \e nc, or NULL if there is no such Neuro.
    static int neuroClassProp(char *&s,NeuroClass *nc,bool also_v1_N_props=false); ///<returns 0-based property number for \e neuroclass, 100-based extraproperty number for Neuro, or -1 if the string does not begin with a valid property name. Advance \e s pointer if success.