Changeset 1130 for cpp/frams/genetics/fB

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/fB

Files:

• fB_conv.cpp (modified) (3 diffs)
• fB_oper.cpp (modified) (2 diffs)

cpp/frams/genetics/fB/fB_conv.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.
 
@@ -7 +7 @@
 #include <frams/param/paramobj.h>
 #include <vector>
+#include <algorithm>
 #include <frams/util/multimap.h>
 #include "fB_general.h"
@@ -250 +251 @@
                                 double mn, mx, def;
                                 par.getMinMaxDouble(propindex, mn, mx, def);
-                                par.setDouble(propindex, min(mx, max(mn, (mx - mn) * val + mn)));
+                                par.setDouble(propindex, std::min(mx, std::max(mn, (mx - mn) * val + mn)));
                         }
                         propindex++;

cpp/frams/genetics/fB/fB_oper.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.
 
 #include <frams/util/sstring.h>
 #include <vector>
+#include <algorithm>
 #include <frams/param/param.h>
 #include "fB_conv.h"
@@ -461 +462 @@
         {
                 // get maximal count of genes from both parents
-                int maxgenecount = max(fB_GenoHelpers::geneCountNoNested(parent1),
+                int maxgenecount = std::max(fB_GenoHelpers::geneCountNoNested(parent1),
                         fB_GenoHelpers::geneCountNoNested(parent2));