Changeset 1130 for cpp/frams/neuro/impl/neuroimpl-fuzzy.cpp

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

File:

• cpp/frams/neuro/impl/neuroimpl-fuzzy.cpp (modified) (2 diffs)

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))