Changeset 513 for cpp/frams/genetics/f4

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

Files:

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

cpp/frams/genetics/f4/oper_f4.cpp

@@ -86 +86 @@
 
 
-int Geno_f4::validate(char *& geno)
+int Geno_f4::validate(char *& geno, const char *genoname)
 {
         // convert geno to tree, then try to validate 20 times
@@ -100 +100 @@
 
 
-int Geno_f4::checkValidity(const char * geno)
+int Geno_f4::checkValidity(const char * geno, const char *genoname)
 {
         f4_node root;

cpp/frams/genetics/f4/oper_f4.h

@@ -33 +33 @@
 public:
         Geno_f4();
-        int validate(char *&);
-        int checkValidity(const 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);