Changeset 1130 for cpp/frams/genetics/fS

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

Location:

cpp/frams/genetics/fS

Files:

• fS_general.cpp (modified) (2 diffs)
• fS_oper.cpp (modified) (4 diffs)

cpp/frams/genetics/fS/fS_general.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.
 
@@ -13 +13 @@
 #include "common/nonstd_math.h"
 #include <frams/model/geometry/part_distance_estimator.h>
+#include <algorithm>
 
 int fS_Genotype::precision = 4;

cpp/frams/genetics/fS/fS_oper.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.
 
@@ -7 +7 @@
 #include "fS_oper.h"
 #include "frams/util/rndutil.h"
+#include <algorithm>
 
 #define FIELDSTRUCT GenoOper_fS
@@ -362 +363 @@
                         {
                                 // Remove the selected child
-                                swap(randomNode->children[selectedIndex], randomNode->children[childCount - 1]);
+                                std::swap(randomNode->children[selectedIndex], randomNode->children[childCount - 1]);
                                 randomNode->children.pop_back();
                                 randomNode->children.shrink_to_fit();
@@ -586 +587 @@
                         fS_Neuron *it = randomNode->neurons[rndUint(size)];
                         geno.rearrangeNeuronConnections(it, SHIFT::LEFT);        // Important to rearrange the neurons before deleting
-                        swap(it, randomNode->neurons.back());
+                        std::swap(it, randomNode->neurons.back());
                         randomNode->neurons.pop_back();
                         randomNode->neurons.shrink_to_fit();