Changeset 1231 for cpp/frams/genetics/f4/f4_general.h

Timestamp:

05/02/23 01:36:15 (13 months ago)

Author:

Maciej Komosinski

Message:

• Thanks to r1230, it is possible to detect (and repair=remove) junk trailing genes that are left after successful parsing (after last '>')
• The validate() function may attempt to repair a genotype where earlier it would give up
• Stricter parsing of the '#' gene

File:

• cpp/frams/genetics/f4/f4_general.h (modified) (4 diffs)

cpp/frams/genetics/f4/f4_general.h

@@ -242 +242 @@
          * Constructor taking genotype in a form of a tree.
          * @param genome genotype tree
-         * @param nrepair 0 if nothing to repair
-         */
-        f4_Cells(f4_Node *genome, int nrepair);
-
-        /**
-         * Constructor taking genotype in a form of a string.
-         * @param genome genotype string
-         * @param nrepair 0 if nothing to repair
-         */
-        f4_Cells(SString &genome, int nrepair);
+         * @param nrepair false if nothing to repair
+         */
+        f4_Cells(f4_Node *genome, bool nrepair);
 
         /**
@@ -336 +329 @@
 private:
         // for error reporting / genotype fixing
-        int repair;
+        bool repair;
         int errorcode;
         int errorpos;
@@ -343 +336 @@
         f4_Node *repair_insert;
         void toF1GenoRec(int curc, SString &out);
-        f4_Cell *tmpcel;                // needed by toF1Geno
-        f4_Node *f4rootnode;          // used by constructor
+        f4_Cell *tmpcel;  // needed by toF1Geno
 };
 
@@ -477 +469 @@
  * semantic aspect is neuron class name extraction, where the GenoOperators
  * class is used to parse the potential neuron class name.
- * @param genot the string holding all the genotype
- * @param pos0 the current position of processing in string
+ * This is an internal function; for regular cases, use f4_process().
+ * @param genot the string with the entire genotype
+ * @param pos_inout the current position of processing in string (advanced by the function)
  * @param parent current parent of the analysed branch of the genotype
  * @return 0 if processing was successful, otherwise returns the position of an error in the genotype
  */
 int f4_processRecur(const char *genot, int &pos_inout, f4_Node *parent);
+
+/**
+ * A wrapper for f4_processRecur(). Creates a tree of f4_Node objects corresponding to
+ * the provided genotype.
+ * @param genot the string with the entire genotype
+ * @param root root of the tree corresponding to the genotype
+ * @return 0 if processing was successful, otherwise returns the position of an error in the genotype
+ */
+int f4_process(const char *genot, f4_Node *root);
 
 /**