Changeset 896 for cpp/frams/genetics/fT

Timestamp:

11/30/19 01:30:22 (4 years ago)

Author:

Maciej Komosinski

Message:

Replaced #defined macros for popular random-related operations with functions

File:

• cpp/frams/genetics/fT/fTest_oper.cpp (modified) (3 diffs)

cpp/frams/genetics/fT/fTest_oper.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-2019  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -88 +88 @@
         int changes = 0, len = strlen(geno);
         for (int i = 0; i < len; i++)
-                if (rnd01 < prob) //normalize prob with length of genotype
+                if (rndDouble(1) < prob) //normalize prob with length of genotype
                 {
-                        geno[i] = a[randomN(4)];
+                        geno[i] = a[rndUint(4)];
                         changes++;
                 }
@@ -101 +101 @@
 {
         int len1 = strlen(g1), len2 = strlen(g2);
-        int p1 = randomN(len1);  //random cut point for first genotype
-        int p2 = randomN(len2);  //random cut point for second genotype
+        int p1 = rndUint(len1);  //random cut point for first genotype
+        int p2 = rndUint(len2);  //random cut point for second genotype
         char *child1 = (char*)malloc(p1 + len2 - p2 + 1);
         char *child2 = (char*)malloc(p2 + len1 - p1 + 1);