Changeset 121 for cpp/frams/genetics/oper_fx.cpp

Timestamp:

02/08/14 06:00:41 (11 years ago)

Author:

sz

Message:

updated file headers and makefiles

File:

• cpp/frams/genetics/oper_fx.cpp (modified) (16 diffs)

cpp/frams/genetics/oper_fx.cpp

@@ -1 @@
-// This file is a part of the Framsticks GenoFX library.
-// Copyright (C) 2002-2011  Maciej Komosinski.  See LICENSE.txt for details.
+// This file is a part of the Framsticks GDK.
+// Copyright (C) 2002-2014  Maciej Komosinski and Szymon Ulatowski.  See LICENSE.txt for details.
 // Refer to http://www.framsticks.com/ for further information.
 
 #include <ctype.h>  //isupper()
-#include "geno_fx.h"
+#include "oper_fx.h"
 #include <common/framsg.h>
 #include <common/nonstd_math.h>
@@ -33 +33 @@
 
 
-int Geno_fx::roulette(const double *probtab,const int count)
+int GenoOperators::roulette(const double *probtab,const int count)
 {
    double sum=0;
@@ -43 +43 @@
 }
 
-bool Geno_fx::getMinMaxDef(ParamInterface *p,int i,double &mn,double &mx,double &def)
+bool GenoOperators::getMinMaxDef(ParamInterface *p,int i,double &mn,double &mx,double &def)
 {
    mn=mx=def=0;
@@ -68 +68 @@
 }
 
-int Geno_fx::selectRandomProperty(Neuro* n)
+int GenoOperators::selectRandomProperty(Neuro* n)
 {
    int neuext=n->extraProperties().getPropCount(),
@@ -78 +78 @@
 }
 
-double Geno_fx::mutateNeuProperty(double current,Neuro *n,int i)
+double GenoOperators::mutateNeuProperty(double current,Neuro *n,int i)
 {
    if (i==-1) return mutateCreepNoLimit('f',current,-10,10); //i==-1: mutating weight of neural connection
@@ -89 +89 @@
 }
 
-bool Geno_fx::mutatePropertyNaive(ParamInterface &p,int i)
+bool GenoOperators::mutatePropertyNaive(ParamInterface &p,int i)
 {
    double mn,mx,df;
@@ -102 +102 @@
 }
 
-bool Geno_fx::mutateProperty(ParamInterface &p,int i)
+bool GenoOperators::mutateProperty(ParamInterface &p,int i)
 {
    double newval;
@@ -112 +112 @@
 }
 
-bool Geno_fx::getMutatedProperty(ParamInterface &p,int i,double oldval,double &newval)
+bool GenoOperators::getMutatedProperty(ParamInterface &p,int i,double oldval,double &newval)
 {
    newval=0;
@@ -128 +128 @@
 }
 
-double Geno_fx::mutateCreepNoLimit(char type,double current,double mn,double mx)
+double GenoOperators::mutateCreepNoLimit(char type,double current,double mn,double mx)
 {
    double result=RndGen.Gauss(current,(mx-mn)/2/5); // /halfinterval, 5 times narrower
@@ -136 +136 @@
 }
 
-double Geno_fx::mutateCreep(char type,double current,double mn,double mx)
+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?
@@ -148 +148 @@
 }
 
-NeuroClass* Geno_fx::getRandomNeuroClass()
+NeuroClass* GenoOperators::getRandomNeuroClass()
 {
         SListTempl<NeuroClass*> active;
@@ -156 +156 @@
 }
 
-NeuroClass* Geno_fx::parseNeuroClass(char*& s)
+NeuroClass* GenoOperators::parseNeuroClass(char*& s)
 {
    int len=strlen(s);
@@ -171 +171 @@
 }
 
-Neuro* Geno_fx::findNeuro(const Model *m,const NeuroClass *nc)
+Neuro* GenoOperators::findNeuro(const Model *m,const NeuroClass *nc)
 {
   if (!m) return NULL;
@@ -179 +179 @@
 }
 
-int Geno_fx::neuroClassProp(char*& s,NeuroClass *nc,bool also_v1_N_props)
+int GenoOperators::neuroClassProp(char*& s,NeuroClass *nc,bool also_v1_N_props)
 {
    int len=strlen(s);
@@ -213 +213 @@
 }
 
-bool Geno_fx::isWS(const char c)
+bool GenoOperators::isWS(const char c)
 {return c==' ' || c=='\n' || c=='\t' || c=='\r';}
 
-void Geno_fx::skipWS(char *&s)
-{ if (!s) FramMessage("Geno_fx","skipWS","NULL reference!",1); else
+void GenoOperators::skipWS(char *&s)
+{ if (!s) FramMessage("GenoOperators","skipWS","NULL reference!",1); else
      while (isWS(*s)) s++;
 }
 
-bool Geno_fx::areAlike(char *g1,char *g2)
+bool GenoOperators::areAlike(char *g1,char *g2)
 {
         while (*g1 || *g2)
@@ -235 +235 @@
 }
 
-char* Geno_fx::strchrn0(const char *str,char ch)
+char* GenoOperators::strchrn0(const char *str,char ch)
 { return ch==0?NULL:strchr((char*)str,ch); }
 
-bool Geno_fx::isNeuroClassName(const char firstchar)
+bool GenoOperators::isNeuroClassName(const char firstchar)
 {
    return isupper(firstchar) || firstchar=='|' || firstchar=='@' || firstchar=='*';