Changeset 1130 for cpp/frams/_demos/evol_test.cpp

Timestamp:

04/16/21 15:55:34 (4 years ago)

Author:

Maciej Komosinski

Message:

Used std::min(), std::max() explicitly to avoid compiler confusion. Used std::size() explicitly instead of the equivalent macro

File:

• cpp/frams/_demos/evol_test.cpp (modified) (3 diffs)

cpp/frams/_demos/evol_test.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 2019-2020  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 2019-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -195 +195 @@
         for (int i = 0; i < nr_evals; i++)
         {
-                int selected_positive = tournament(population, max(2, int(sqrt(population.size()) / 2))); //moderate positive selection pressure
+                int selected_positive = tournament(population, std::max(2, int(sqrt(population.size()) / 2))); //moderate positive selection pressure
                 int selected_negative = rndUint(population.size()); //random negative selection
 
@@ -214 +214 @@
                 else
                 {
-                        int selected_positive2 = tournament(population, max(2, int(sqrt(population.size()) / 2)));
+                        int selected_positive2 = tournament(population, std::max(2, int(sqrt(population.size()) / 2)));
                         Geno xover = genman.crossOver(population[selected_positive].geno, population[selected_positive2].geno);
                         if (xover.getGenes() == "")