Changeset 1130 for cpp/frams/neuro/impl/neuroimpl-fuzzy-f0.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-f0.cpp (modified) (3 diffs)

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]);
                 }
         }