Changeset 797 for cpp/frams/genetics/fB/fB_oper.h

Timestamp:

06/06/18 01:45:18 (6 years ago)

Author:

Maciej Komosinski

Message:

A more complete implementation of fB, fH, fL

File:

• cpp/frams/genetics/fB/fB_oper.h (modified) (3 diffs)

cpp/frams/genetics/fB/fB_oper.h

@@ +1 @@
+// This file is a part of Framsticks SDK.  http://www.framsticks.com/
+// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// See LICENSE.txt for details.
+
 #ifndef _FB_OPER_H_
 #define _FB_OPER_H_
 
 #include "../genooperators.h"
+#include <list>
 
 /** @name Codes for general fB mutation types */
@@ -8 +13 @@
 #define FB_SUBSTITUTION  0 ///<Relative probability of mutation by changing single random letter in genotype (substitution)
 #define FB_INSERTION     1 ///<Relative probability of mutation by inserting characters in random place of genotype
-#define FB_DELETION      2 ///<Relative probability of mutation by deleting random characters in genotype
-#define FB_DUPLICATION   3 ///<Relative probability of mutation by copying single *gene* of genotype and appending it to the beginning of this genotype
-#define FB_TRANSLOCATION 4 ///<Relative probability of mutation by replacing two substrings in genotype
-#define FB_MUT_COUNT     5 ///<Count of mutation types
+#define FB_NCLASSINS     2 ///<Relative probability of mutation by inserting neuron class definition in random place of genotype
+#define FB_DELETION      3 ///<Relative probability of mutation by deleting random characters in genotype
+#define FB_DUPLICATION   4 ///<Relative probability of mutation by copying single *gene* of genotype and appending it to the beginning of this genotype
+#define FB_TRANSLOCATION 5 ///<Relative probability of mutation by replacing two substrings in genotype
+#define FB_MUT_COUNT     6 ///<Count of mutation types
 //@}
 
@@ -25 +31 @@
 private:
         bool hasStick(SString genotype);
+        SString detokenizeSequence(std::list<SString> tokenlist);
+        std::list<SString> tokenizeSequence(SString genotype);
 
 public: