Changeset 513 for cpp/frams/genetics/fF

Timestamp:

05/23/16 13:52:53 (9 years ago)

Author:

Maciej Komosinski

Message:

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

Location:

cpp/frams/genetics/fF

Files:

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

cpp/frams/genetics/fF/oper_fF.cpp

@@ -26 +26 @@
 }
 
-int GenoOper_fF::checkValidity(const char* gene)
+int GenoOper_fF::checkValidity(const char* gene, const char *genoname)
 {
         fF_growth_params par;
@@ -32 +32 @@
 }
 
-int GenoOper_fF::validate(char *&gene)
+int GenoOper_fF::validate(char *&gene, const char *genoname)
 {
         fF_growth_params par; //is initialized with default values

cpp/frams/genetics/fF/oper_fF.h

@@ -13 +13 @@
 public:
         GenoOper_fF();
-        int checkValidity(const char *);
-        int validate(char *&);
+        int checkValidity(const char *, const char *genoname);
+        int validate(char *&, const char *genoname);
         int mutate(char *&g, float& chg, int &method);
         int crossOver(char *&g1, char *&g2, float& chg1, float& chg2);
         uint32_t style(const char *g, int pos);
-        const char* getSimplest() { return "6, 1.05, 1.05, 1.05, 0, 0, 0"; }
+        const char* getSimplest() { return "6, "/*"1, 1, 1, "*/"1.05, 1.05, 1.05, 0, 0, 0"; }
 
         double xover_proportion;