Changeset 513 for cpp/frams/genetics/fF


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/fF
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/genetics/fF/oper_fF.cpp

    r286 r513  
    2626}
    2727
    28 int GenoOper_fF::checkValidity(const char* gene)
     28int GenoOper_fF::checkValidity(const char* gene, const char *genoname)
    2929{
    3030        fF_growth_params par;
     
    3232}
    3333
    34 int GenoOper_fF::validate(char *&gene)
     34int GenoOper_fF::validate(char *&gene, const char *genoname)
    3535{
    3636        fF_growth_params par; //is initialized with default values
  • cpp/frams/genetics/fF/oper_fF.h

    r286 r513  
    1313public:
    1414        GenoOper_fF();
    15         int checkValidity(const char *);
    16         int validate(char *&);
     15        int checkValidity(const char *, const char *genoname);
     16        int validate(char *&, const char *genoname);
    1717        int mutate(char *&g, float& chg, int &method);
    1818        int crossOver(char *&g1, char *&g2, float& chg1, float& chg2);
    1919        uint32_t style(const char *g, int pos);
    20         const char* getSimplest() { return "6, 1.05, 1.05, 1.05, 0, 0, 0"; }
     20        const char* getSimplest() { return "6, "/*"1, 1, 1, "*/"1.05, 1.05, 1.05, 0, 0, 0"; }
    2121
    2222        double xover_proportion;
Note: See TracChangeset for help on using the changeset viewer.