Changeset 146

Timestamp:

02/26/14 20:27:49 (11 years ago)

Author:

sz

Message:

oops, forgot to include oper_fx.cpp in the previous Genetics update

File:

• cpp/frams/genetics/oper_fx.cpp (modified) (1 diff)

cpp/frams/genetics/oper_fx.cpp

@@ -136 +136 @@
 }
 
-double GenoOperators::mutateCreep(char type,double current,double mn,double mx)
-{
-   double result=mutateCreepNoLimit(type,current,mn,mx); //TODO consider that when boundary is touched (reflect/absorb below), the default precision (3 digits) may change. Is it good or bad?
-   //reflect:
-   if (result>mx) result=mx-(result-mx); else
-    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<mn) result=mn;
-   return result;
-}
+double GenoOperators::mutateCreep(char type, double current, double mn, double mx)
+{
+        double result = mutateCreepNoLimit(type, current, mn, mx); //TODO consider that when boundary is touched (reflect/absorb below), the default precision (3 digits) may change. Is it good or bad?
+        //reflect:
+        if (result > mx) result = mx - (result - mx); else
+                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 < mn) result = mn;
+        return result;
+}
+
+void GenoOperators::setIntFromDoubleWithProbabilisticDithering(ParamInterface &p, int index, double value) //TODO
+{
+        p.setInt(index, value); //TODO value=2.5 will result in 2 but we want it to be 2 or 3 with equal probability. value=2.1 would be mostly 2, rarely 3. Careful with negative values (test it!)
+}
+
+void GenoOperators::linearMix(ParamInterface &p1, int i1, ParamInterface &p2, int i2, double proportion)
+{
+        if (p1.type(i1)[0] == 'f' && p2.type(i2)[0] == 'f')
+        {
+                double v1 = p1.getDouble(i1);
+                double v2 = p2.getDouble(i2);
+                p1.setDouble(i1, v1*proportion + v2*(1 - proportion));
+                p2.setDouble(i2, v2*proportion + v1*(1 - proportion));
+        }
+        if (p1.type(i1)[0] == 'd' && p2.type(i2)[0] == '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));
+        }
+}
+
 
 NeuroClass* GenoOperators::getRandomNeuroClass()