Changeset 671 for cpp/frams/genetics/f4/oper_f4.cpp

Timestamp:

08/18/17 15:24:59 (8 years ago)

Author:

Maciej Komosinski

Message:

Unified property names of f1 and f4; improved docs; 3.141 -> M_PI

File:

• cpp/frams/genetics/f4/oper_f4.cpp (modified) (8 diffs)

cpp/frams/genetics/f4/oper_f4.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2017  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -231 +231 @@
                 // must pick a node with parent, and at least one child
                 // already picked a node, but repeat may be needed
-                for (int i = 0; i < 10; i++) {
+                for (int i = 0; i < 10; i++)
+                {
                         if ((NULL != n1->parent) && (g != n1->parent))
                                 if (NULL != n1->child)
@@ -247 +248 @@
                                 n2 = n1->parent;
                                 n2->removeChild(n1);
-                                if (NULL != n1->child) {
+                                if (NULL != n1->child)
+                                {
                                         n1->child->parent = n2;
                                         n2->addChild(n1->child);
                                         n1->child = NULL;
                                 }
-                                if (NULL != n1->child2) {
+                                if (NULL != n1->child2)
+                                {
                                         n1->child2->parent = n2;
                                         n2->addChild(n1->child2);
@@ -309 +312 @@
                         if (i >= 20) return GENOPER_OPFAIL;
                 }
-                switch (n1->name) {
+                switch (n1->name)
+                {
                 case '<':
                         // swap children
@@ -348 +352 @@
         nn->i1 = i;
         nn->l1 = 0;
-        if (0 == i) {
+        if (0 == i)
+        {
                 // relative input link
                 nn->l1 = (int)(4.0f * (rnd01 - 0.5f));
@@ -407 +412 @@
         if (prob1 < 0.5f) count++;
         else count--;
-        if (count<1) count = 1;
-        if (count>REP_MAXCOUNT) count = REP_MAXCOUNT;
+        if (count < 1) count = 1;
+        if (count > REP_MAXCOUNT) count = REP_MAXCOUNT;
         nn->i1 = count;
 }
@@ -464 +469 @@
         if (f4_processrec(g, 0, root) || root->childCount() != 1)
         {
-                delete root; return GENOPER_OPFAIL;
+                delete root;
+                return GENOPER_OPFAIL;
         } // could not convert or bad: fail
         // mutate one node, set chg as this percent
@@ -470 +476 @@
         if (MutateOneValid(root, method) != GENOPER_OK)
         {
-                delete root; return GENOPER_OPFAIL;
+                delete root;
+                return GENOPER_OPFAIL;
         }
         // OK, convert back to string