Changeset 513 for cpp/frams/genetics/f9


Ignore:
Timestamp:
05/23/16 13:52:53 (8 years ago)
Author:
Maciej Komosinski
Message:

checkValidity() and validate() are now aware of genotype name

Location:
cpp/frams/genetics/f9
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/genetics/f9/oper_f9.cpp

    r348 r513  
    2626}
    2727
    28 int GenoOper_f9::checkValidity(const char* gene)
     28int GenoOper_f9::checkValidity(const char* gene, const char *genoname)
    2929{
    3030        if (!gene[0]) return 1; //empty is not valid
     
    3636
    3737///Remove all invalid letters from the genotype
    38 int GenoOper_f9::validate(char *&gene)
     38int GenoOper_f9::validate(char *&gene, const char *genoname)
    3939{
    4040        SString validated; //new genotype (everything except turtle_commands_f9 is skipped)
  • cpp/frams/genetics/f9/oper_f9.h

    r286 r513  
    1313public:
    1414        GenoOper_f9();
    15         int checkValidity(const char *);
    16         int validate(char *&);
    17         int mutate(char *&g,float& chg,int &method);
    18         int crossOver(char *&g1,char *&g2,float& chg1,float& chg2);
     15        int checkValidity(const char *, const char *genoname);
     16        int validate(char *&, const char *genoname);
     17        int mutate(char *&g, float& chg, int &method);
     18        int crossOver(char *&g1, char *&g2, float& chg1, float& chg2);
    1919        uint32_t style(const char *g, int pos);
    20         const char* getSimplest() {return "R";}
     20        const char* getSimplest() { return "R"; }
    2121
    2222        double mut_prob; //mutation probability
Note: See TracChangeset for help on using the changeset viewer.