Changeset 1130 for cpp/frams/neuro


Ignore:
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

Location:
cpp/frams/neuro/impl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpp/frams/neuro/impl/neuroimpl-channels.cpp

    r907 r1130  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
    55#include "neuroimpl-channels.h"
    6 #include <common/nonstd_stl.h>
     6#include <algorithm>
    77
    88void NI_Channelize::go()
     
    1818        if (c < 2) { setState(getWeightedInputState(1)); return; }
    1919        double s = getWeightedInputState(0);
    20         s = (max(-1.0, min(1.0, s)) + 1.0) / 2.0; // 0..1
     20        s = (std::max(-1.0, std::min(1.0, s)) + 1.0) / 2.0; // 0..1
    2121        int i1;
    22         i1 = (int)(s * (c - 1)); i1 = max(0, min(i1, c - 2));
     22        i1 = (int)(s * (c - 1)); i1 = std::max(0, std::min(i1, c - 2));
    2323        double sw = 1.0 / (c - 1);
    2424        double s1 = sw * i1;
  • cpp/frams/neuro/impl/neuroimpl-fuzzy-f0.cpp

    r973 r1130  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
     
    77
    88#include "neuroimpl-fuzzy-f0.h"
    9 #include <common/nonstd_stl.h> //min,max
     9#include <algorithm>
    1010
    1111//this part concerns fuzzy sets transformation
     
    132132                                return -1;
    133133                        if ((k >= inNr) && ((k % 2) == 0))
    134                                 maxOutputNr = max(maxOutputNr, rules[j][k]);
     134                                maxOutputNr = std::max(maxOutputNr, rules[j][k]);
    135135                }
    136136        }
  • cpp/frams/neuro/impl/neuroimpl-fuzzy.cpp

    r973 r1130  
    11// This file is a part of Framsticks SDK.  http://www.framsticks.com/
    2 // Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
     2// Copyright (C) 1999-2021  Maciej Komosinski and Szymon Ulatowski.
    33// See LICENSE.txt for details.
    44
    55#include "neuroimpl-fuzzy.h"
    66#include "neuroimpl-fuzzy-f0.h"
    7 #include <common/nonstd_stl.h> //min,max
    87
    98int NI_FuzzyNeuro::countOuts(const Model *m, const Neuro *fuzzy)
     
    109108                        nrFuzzySet = rules[i][j * 2 + 1]; // j*2 moves pointer through each output, +1 moves to nr of fuzzy set
    110109                        inputNr = rules[i][j * 2]; // as above but gives input number
    111                         minimumCut = min(minimumCut, TrapeziumFuzz(nrFuzzySet, getWeightedInputState(inputNr))); // value of membership function for this input and given fuzzy set
     110                        minimumCut = std::min(minimumCut, TrapeziumFuzz(nrFuzzySet, getWeightedInputState(inputNr))); // value of membership function for this input and given fuzzy set
    112111                }
    113112                if ((minimumCut > 1) || (minimumCut < 0))
Note: See TracChangeset for help on using the changeset viewer.