Changeset 749 for cpp/frams/genetics/oper_fx.cpp

Timestamp:

02/28/18 19:42:24 (6 years ago)

Author:

Maciej Komosinski

Message:

Added a new function to linearly mix two vectors of real numbers

File:

• cpp/frams/genetics/oper_fx.cpp (modified) (2 diffs)

cpp/frams/genetics/oper_fx.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-2018  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -150 +150 @@
 void GenoOperators::setIntFromDoubleWithProbabilisticDithering(ParamInterface &p, int index, double value) //TODO
 {
-        p.setInt(index, (paInt)value); //TODO value=2.5 will result in 2 but we want it to be 2 or 3 with equal probability. value=2.1 would be mostly 2, rarely 3. Careful with negative values (test it!)
+        p.setInt(index, (paInt)(value + 0.5)); //TODO value=2.499 will result in 2 and 2.5 will result in 3, but we want these cases to be 2 or 3 with almost equal probability. value=2.1 should be mostly 2, rarely 3. Careful with negative values (test it!)
+}
+
+void GenoOperators::linearMix(vector<double> &p1, vector<double> &p2, double proportion)
+{
+        if (p1.size() != p2.size())
+        {
+                logPrintf("GenoOperators", "linearMix", LOG_ERROR, "Cannot mix vectors of different length (%d and %d)", p1.size(), p2.size());
+                return;
+        }
+        for (unsigned int i = 0; i < p1.size(); i++)
+        {
+                double v1 = p1[i];
+                double v2 = p2[i];
+                p1[i] = v1*proportion + v2*(1 - proportion);
+                p2[i] = v2*proportion + v1*(1 - proportion);
+        }
 }