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

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

File:

• cpp/frams/neuro/impl/neuroimpl-channels.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;