Changeset 1130 for cpp/frams/neuro

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/neuro/impl

Files:

• neuroimpl-channels.cpp (modified) (2 diffs)
• neuroimpl-fuzzy-f0.cpp (modified) (3 diffs)
• neuroimpl-fuzzy.cpp (modified) (2 diffs)

cpp/frams/neuro/impl/neuroimpl-channels.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-2021  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
 #include "neuroimpl-channels.h"
-#include <common/nonstd_stl.h>
+#include <algorithm>
 
 void NI_Channelize::go()
@@ -18 +18 @@
         if (c < 2) { setState(getWeightedInputState(1)); return; }
         double s = getWeightedInputState(0);
-        s = (max(-1.0, min(1.0, s)) + 1.0) / 2.0; // 0..1
+        s = (std::max(-1.0, std::min(1.0, s)) + 1.0) / 2.0; // 0..1
         int i1;
-        i1 = (int)(s * (c - 1)); i1 = max(0, min(i1, c - 2));
+        i1 = (int)(s * (c - 1)); i1 = std::max(0, std::min(i1, c - 2));
         double sw = 1.0 / (c - 1);
         double s1 = sw * i1;

cpp/frams/neuro/impl/neuroimpl-fuzzy-f0.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 "neuroimpl-fuzzy-f0.h"
-#include <common/nonstd_stl.h> //min,max
+#include <algorithm>
 
 //this part concerns fuzzy sets transformation
@@ -132 +132 @@
                                 return -1;
                         if ((k >= inNr) && ((k % 2) == 0))
-                                maxOutputNr = max(maxOutputNr, rules[j][k]);
+                                maxOutputNr = std::max(maxOutputNr, rules[j][k]);
                 }
         }

cpp/frams/neuro/impl/neuroimpl-fuzzy.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 "neuroimpl-fuzzy.h"
 #include "neuroimpl-fuzzy-f0.h"
-#include <common/nonstd_stl.h> //min,max
 
 int NI_FuzzyNeuro::countOuts(const Model *m, const Neuro *fuzzy)
@@ -109 +108 @@
                         nrFuzzySet = rules[i][j * 2 + 1]; // j*2 moves pointer through each output, +1 moves to nr of fuzzy set
                         inputNr = rules[i][j * 2]; // as above but gives input number
-                        minimumCut = min(minimumCut, TrapeziumFuzz(nrFuzzySet, getWeightedInputState(inputNr))); // value of membership function for this input and given fuzzy set
+                        minimumCut = std::min(minimumCut, TrapeziumFuzz(nrFuzzySet, getWeightedInputState(inputNr))); // value of membership function for this input and given fuzzy set
                 }
                 if ((minimumCut > 1) || (minimumCut < 0))