Changeset 797 for cpp/frams/genetics/fB/fB_general.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_general.h (modified) (4 diffs)

cpp/frams/genetics/fB/fB_general.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_GENERAL_H_
 #define _FB_GENERAL_H_
@@ -10 +14 @@
         {
                 int start = 0;
+                int prev = 0;
                 int count = -1;
                 do {
                         count++;
                         start = geno.indexOf("aa", start) + 1; // +1 is for progress, starting codons can overlap
+                        int quotecount = 0;
+                        for (int q = prev; q < start; q++) if (geno[q] == '\"') quotecount++;
+                        prev = start;
+                        if (quotecount % 2 != 0) count--; // 'aa' sequence is within quotes
                 } while (start - 1 != -1);
                 return count;
@@ -25 +34 @@
                         count++;
                         start = genotype.indexOf("aa", start) + 1;
+                        int quotecount = 0;
+                        for (int q = 0; q < start; q++) if (genotype[q] == '\"') quotecount++;
+                        if (quotecount % 2 != 0) count--; // 'aa' sequence is within quotes
                 } while (start - 1 != -1 && count != i);
                 if (start - 1 == -1) // there is no gene with a given "i"
@@ -33 +45 @@
                 }
                 end = start;
-                end = genotype.indexOf("zz", end);
+                int quotecount = 0;
+                do {
+                        quotecount = 0;
+                        end = genotype.indexOf("zz", end);
+                        if (end != -1)
+                        {
+                                for (int q = start; q < end; q++) if (genotype[q] == '\"') quotecount++;
+                                if (quotecount % 2 != 0) end++;
+                        }
+                } while (quotecount % 2 != 0 && end != -1);
+
                 if (end == -1) end = genotype.len();
                 else end += 2;