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

Timestamp:

04/28/23 23:44:31 (2 years ago)

Author:

Maciej Komosinski

Message:

Fixed a bug where an f4_Node tree that resulted from an f4 genotype that was not properly/completely parsed due to some error would still be used to try growing an organism

File:

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

cpp/frams/genetics/f4/f4_general.h

@@ -51 +51 @@
  * @return 1 if end of string was reached, or position of found character in sequence
  */
-int scanrec(const char* s, unsigned int slen, char stopchar);
+int scanRecur(const char* s, int slen, char stopchar);
 
 
@@ -475 +475 @@
 /**
  * The main function for converting a string of f4 encoding to a tree structure. Prepares
- * f4_Node root of tree and runs f4_processrec function for it.
+ * f4_Node root of tree and runs f4_processRecur function for it.
  * @param geno the string representing an f4 genotype
  * @return a pointer to the f4_Node object representing the f4 tree root
  */
-f4_Node* f4_processtree(const char *geno);
+//f4_Node* f4_processTree(const char *geno);
 
 /**
@@ -485 +485 @@
  * a tree of f4_Node objects. This method extracts each potentially functional element
  * of a genotype string to a separate f4_Nodes. When the branching character '<' occurs,
- * f4_processrec is deployed for the latest f4_Node element. This method does not
+ * f4_processRecur is deployed for the latest f4_Node element. This method does not
  * analyse the genotype semantically, it only checks if the syntax is proper. The only
  * semantic aspect is neuron class name extraction, where the GenoOperators
@@ -494 +494 @@
  * @return 0 if processing was successful, otherwise returns the position of an error in the genotype
  */
-int f4_processrec(const char *genot, unsigned pos0, f4_Node *parent);
+int f4_processRecur(const char *genot, unsigned pos0, f4_Node *parent);
 
 /**