Changeset 1316 for cpp/frams

Timestamp:

07/11/24 17:38:44 (2 months ago)

Author:

Maciej Komosinski

Message:

Fixed the reported fraction of parent1 and parent2 genes in the child, when the second child is chosen (the fractions were previously swapped in this case, i.e, they did not match the order of parent names)

File:

• cpp/frams/genetics/genman.cpp (modified) (3 diffs)

cpp/frams/genetics/genman.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2024  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -370 +370 @@
         }
 
-        float chg;
+        float chg; //fraction of parent1 genes in the child
         bool ok = false;
         int pcount = count;
@@ -385 +385 @@
                         if (g1n[0] && g2n[0]) if (rndUint(2) == 0) g1n[0] = 0; else g2n[0] = 0; //both provided? we want only one
                         if (g1n[0]) { gn = g1n; chg = chg1; }
-                        else { gn = g2n; chg = chg2; }
+                        else { gn = g2n; chg = 1 - chg2; }
                         LoggerToMemory eh(LoggerBase::Enable | LoggerToMemory::StoreFirstMessage); //mute testValidity()
                         Geno G(gn, g1v.getFormat(), "", "");