Changeset 853 for cpp/frams/genetics/fB

Timestamp:

02/15/19 03:09:31 (6 years ago)

Author:

Maciej Komosinski

Message:

The official C++17 fallthrough? attribute instead of comments no break

File:

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

cpp/frams/genetics/fB/fB_oper.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -301 +301 @@
                 }
         }
-        /* no break */
+        [[fallthrough]];
         case FB_INSERTION:
         {
@@ -359 +359 @@
                 res.insert(res.end(), iters[3], tokenized.end());
 
-//              SString first = line.substr(cuts[0], cuts[1] - cuts[0]);
-//              SString second = line.substr(cuts[2], cuts[3] - cuts[2]);
-//              SString result = line.substr(0, cuts[0]) + second +
-//                      line.substr(cuts[1], cuts[2] - cuts[1]) + first + line.substr(cuts[3]);
+                //              SString first = line.substr(cuts[0], cuts[1] - cuts[0]);
+                //              SString second = line.substr(cuts[2], cuts[3] - cuts[2]);
+                //              SString result = line.substr(0, cuts[0]) + second +
+                //                      line.substr(cuts[1], cuts[2] - cuts[1]) + first + line.substr(cuts[3]);
                 line = detokenizeSequence(&res);
                 chg = (float)(cuts[3] - cuts[2] + cuts[1] - cuts[0]) / line.len();
@@ -420 +420 @@
                 break;
         }
-//      case FB_CROSSING_OVER:
-//      {
-//              // iterate through all genes of the first parent and assign them
-//              // randomly to children
-//              for (int i = 0; i < fB_GenoHelpers::geneCount(parent1); i++)
-//              {
-//                      int start, end;
-//                      SString gene = fB_GenoHelpers::getGene(i, parent1, start, end);
-//                      if (randomN(2) == 0)
-//                      {
-//                              child1 += gene;
-//                              chg1 += 1.0f;
-//                      }
-//                      else
-//                      {
-//                              child2 += gene;
-//                      }
-//              }
-//              chg1 /= fB_GenoHelpers::geneCount(parent1);
-//
-//              // do the same with second parent
-//              for (int i = 0; i < fB_GenoHelpers::geneCount(parent2); i++)
-//              {
-//                      int start, end;
-//                      SString gene = fB_GenoHelpers::getGene(i, parent2, start, end);
-//                      if (randomN(2) == 0)
-//                      {
-//                              child1 += gene;
-//                      }
-//                      else
-//                      {
-//                              child2 += gene;
-//                              chg2 += 1.0f;
-//                      }
-//              }
-//              chg2 /= fB_GenoHelpers::geneCount(parent2);
-//              break;
-//      }
+        //      case FB_CROSSING_OVER:
+        //      {
+        //              // iterate through all genes of the first parent and assign them
+        //              // randomly to children
+        //              for (int i = 0; i < fB_GenoHelpers::geneCount(parent1); i++)
+        //              {
+        //                      int start, end;
+        //                      SString gene = fB_GenoHelpers::getGene(i, parent1, start, end);
+        //                      if (randomN(2) == 0)
+        //                      {
+        //                              child1 += gene;
+        //                              chg1 += 1.0f;
+        //                      }
+        //                      else
+        //                      {
+        //                              child2 += gene;
+        //                      }
+        //              }
+        //              chg1 /= fB_GenoHelpers::geneCount(parent1);
+        //
+        //              // do the same with second parent
+        //              for (int i = 0; i < fB_GenoHelpers::geneCount(parent2); i++)
+        //              {
+        //                      int start, end;
+        //                      SString gene = fB_GenoHelpers::getGene(i, parent2, start, end);
+        //                      if (randomN(2) == 0)
+        //                      {
+        //                              child1 += gene;
+        //                      }
+        //                      else
+        //                      {
+        //                              child2 += gene;
+        //                              chg2 += 1.0f;
+        //                      }
+        //              }
+        //              chg2 /= fB_GenoHelpers::geneCount(parent2);
+        //              break;
+        //      }
         case FB_CROSSING_OVER:
         {
                 // get maximal count of genes from both parents
                 int maxgenecount = max(fB_GenoHelpers::geneCountNoNested(parent1),
-                                fB_GenoHelpers::geneCountNoNested(parent2));
+                        fB_GenoHelpers::geneCountNoNested(parent2));
 
                 // while there are genes in at least one genotype
@@ -472 +472 @@
                         // if both parents have genes available, then distribute them
                         if (i < fB_GenoHelpers::geneCountNoNested(parent1) &&
-                                        i < fB_GenoHelpers::geneCountNoNested(parent2))
+                                i < fB_GenoHelpers::geneCountNoNested(parent2))
                         {
                                 if (randomN(2) == 0)