Changeset 513 for cpp/frams/genetics/f9

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/f9

Files:

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

cpp/frams/genetics/f9/oper_f9.cpp

@@ -26 +26 @@
 }
 
-int GenoOper_f9::checkValidity(const char* gene)
+int GenoOper_f9::checkValidity(const char* gene, const char *genoname)
 {
         if (!gene[0]) return 1; //empty is not valid
@@ -36 +36 @@
 
 ///Remove all invalid letters from the genotype
-int GenoOper_f9::validate(char *&gene)
+int GenoOper_f9::validate(char *&gene, const char *genoname)
 {
         SString validated; //new genotype (everything except turtle_commands_f9 is skipped)

cpp/frams/genetics/f9/oper_f9.h

@@ -13 +13 @@
 public:
         GenoOper_f9();
-        int checkValidity(const char *);
-        int validate(char *&);
-        int mutate(char *&g,float& chg,int &method);
-        int crossOver(char *&g1,char *&g2,float& chg1,float& chg2);
+        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 "R";}
+        const char* getSimplest() { return "R"; }
 
         double mut_prob; //mutation probability