summaryrefslogtreecommitdiff
path: root/fuzzylite/fl/norm/s/Maximum.h
diff options
context:
space:
mode:
Diffstat (limited to 'fuzzylite/fl/norm/s/Maximum.h')
-rw-r--r--fuzzylite/fl/norm/s/Maximum.h46
1 files changed, 26 insertions, 20 deletions
diff --git a/fuzzylite/fl/norm/s/Maximum.h b/fuzzylite/fl/norm/s/Maximum.h
index 28a3b6d..c8ce488 100644
--- a/fuzzylite/fl/norm/s/Maximum.h
+++ b/fuzzylite/fl/norm/s/Maximum.h
@@ -1,25 +1,17 @@
/*
- Author: Juan Rada-Vilela, Ph.D.
- Copyright (C) 2010-2014 FuzzyLite Limited
- All rights reserved
+ fuzzylite (R), a fuzzy logic control library in C++.
+ Copyright (C) 2010-2017 FuzzyLite Limited. All rights reserved.
+ Author: Juan Rada-Vilela, Ph.D. <jcrada@fuzzylite.com>
This file is part of fuzzylite.
fuzzylite is free software: you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
+ the terms of the FuzzyLite License included with the software.
- fuzzylite is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
- for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with fuzzylite. If not, see <http://www.gnu.org/licenses/>.
-
- fuzzyliteâ„¢ is a trademark of FuzzyLite Limited.
+ You should have received a copy of the FuzzyLite License along with
+ fuzzylite. If not, see <http://www.fuzzylite.com/license/>.
+ fuzzylite is a registered trademark of FuzzyLite Limited.
*/
#ifndef FL_MAXIMUM_H
@@ -29,17 +21,31 @@
namespace fl {
- class FL_API Maximum : public SNorm {
+ /**
+ The Maximum class is an SNorm that computes the maximum of any two values.
+
+ @author Juan Rada-Vilela, Ph.D.
+ @see Minimum
+ @see SNorm
+ @see SNormFactory
+ @see Norm
+ @since 4.0
+ */
+ class FL_API Maximum FL_IFINAL : public SNorm {
public:
std::string className() const FL_IOVERRIDE;
+
+ Complexity complexity() const FL_IOVERRIDE;
+ /**
+ Computes the maximum of two membership function values
+ @param a is a membership function value
+ @param b is a membership function value
+ @return @f$\max(a,b)@f$
+ */
scalar compute(scalar a, scalar b) const FL_IOVERRIDE;
Maximum* clone() const FL_IOVERRIDE;
static SNorm* constructor();
};
-
-
}
-
#endif /* FL_MAXIMUM_H */
-