Changeset 31 for cpp

Timestamp:

10/21/09 23:45:09 (15 years ago)

Author:

Maciej Komosinski

Message:

mutated connection weights are unlimited (previously the range was -10..10) and another approach to allowed ranges of mutated values (was: absorb, now: reflect)

Location:

cpp/geno_fx

Files:

• geno_fx.cpp (modified) (2 diffs)
• geno_fx.h (modified) (1 diff)

cpp/geno_fx/geno_fx.cpp

@@ -55 +55 @@
 double Geno_fx::mutateNeuProperty(double current,Neuro *n,int i)
 {
-   if (i==-1) return mutateCreep('f',current,-10,10);
+   if (i==-1) return mutateCreepNoLimit('f',current,-10,10);
    ParamInterface *pi;
    if (i>=100) {i-=100; pi=&n->getClass()->getProperties();}
       else pi=&n->extraProperties();
-   double newval;
+   double newval=current;
    /*bool ok=*/getMutatedProperty(*pi,i,current,newval);
    return newval;
@@ -103 +103 @@
 }
 
-double Geno_fx::mutateCreep(char type,double current,double mn,double mx)
+double Geno_fx::mutateCreepNoLimit(char type,double current,double mn,double mx)
 {
    double result=RndGen.Gauss(current,(mx-mn)/2/5); // /halfinterval, 5 times narrower
    if (type=='d') {result=int(result+0.5); if (result==current) result+=randomN(2)*2-1;}
-    else result=floor(result*1000)/1000.0;
+    else result=floor(result*1000+0.5)/1000.0; //round
+   return result;
+}
+
+double Geno_fx::mutateCreep(char type,double current,double mn,double mx)
+{
+   double result=mutateCreepNoLimit(type,current,mn,mx);
+   //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;

cpp/geno_fx/geno_fx.h

@@ -185 +185 @@
    static bool mutateProperty(ParamInterface &p,int propindex); ///<like mutatePropertyNaive(), but uses special probability distributions for some neuron properties.
    static bool getMutatedProperty(ParamInterface &p,int i,double oldval,double &newval); ///<like mutateProperty(), but just returns \e newval, does not get nor set it using \e p.
-   static double mutateCreep(char type,double current,double mn,double mx); ///<returns \e current value creep-mutated with Gaussian distribution within [ \e mn , \e mx ] interval. Forced precision: 3 digits after comma. \e type must be either 'd' (integer) or 'f' (float/double).
+   static double mutateCreepNoLimit(char type,double current,double mn,double mx); ///<returns \e current value creep-mutated with Gaussian distribution within [ \e mn , \e mx ] interval. Forced precision: 3 digits after comma. \e type must be either 'd' (integer) or 'f' (float/double).
+   static double mutateCreep(char type,double current,double mn,double mx); ///<just as mutateCreepNoLimit(), but forces mutated value into the [mn,mx] range using the 'reflect' approach.
    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.