Changeset 1130 for cpp/frams/_demos

Timestamp:

04/16/21 15:55:34 (3 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

Location:

cpp/frams/_demos

Files:

• evol_test.cpp (modified) (3 diffs)
• printconvmap.cpp (modified) (2 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() == "")

cpp/frams/_demos/printconvmap.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-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -88 +88 @@
         :model(m)
 {
-        joint_offset = max(10, (int(9 + model.getPartCount()) / 10) * 10);
-        neuron_offset = joint_offset + max(10, (int(9 + model.getJointCount()) / 10) * 10);
-        max_element = neuron_offset + max(10, (int(9 + model.getNeuroCount()) / 10) * 10);
+        joint_offset = std::max(10, (int(9 + model.getPartCount()) / 10) * 10);
+        neuron_offset = joint_offset + std::max(10, (int(9 + model.getJointCount()) / 10) * 10);
+        max_element = neuron_offset + std::max(10, (int(9 + model.getNeuroCount()) / 10) * 10);
         for (int i = 0; i < model.getPartCount(); i++)
                 map.add(Model::partToMap(i), Model::partToMap(i), i, i);