summaryrefslogtreecommitdiff
path: root/fuzzylite/src/term/Concave.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'fuzzylite/src/term/Concave.cpp')
-rw-r--r--fuzzylite/src/term/Concave.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/fuzzylite/src/term/Concave.cpp b/fuzzylite/src/term/Concave.cpp
index 37679ae..c585edc 100644
--- a/fuzzylite/src/term/Concave.cpp
+++ b/fuzzylite/src/term/Concave.cpp
@@ -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.
*/
#include "fl/term/Concave.h"
@@ -27,35 +19,47 @@
namespace fl {
Concave::Concave(const std::string& name, scalar inflection, scalar end, scalar height)
- : Term(name, height), _inflection(inflection), _end(end) {
-
- }
+ : Term(name, height), _inflection(inflection), _end(end) { }
- Concave::~Concave() {
-
- }
+ Concave::~Concave() { }
std::string Concave::className() const {
return "Concave";
}
+ Complexity Concave::complexity() const {
+ return Complexity().comparison(1 + 3).arithmetic(1 + 5);
+ }
+
scalar Concave::membership(scalar x) const {
- if (fl::Op::isNaN(x)) return fl::nan;
- if (fl::Op::isLE(_inflection, _end)) { //Concave increasing
- if (fl::Op::isLt(x, _end)) {
- return _height * (_end - _inflection) / (2 * _end - _inflection - x);
+ if (Op::isNaN(x)) return fl::nan;
+ if (Op::isLE(_inflection, _end)) { //Concave increasing
+ if (Op::isLt(x, _end)) {
+ return Term::_height * (_end - _inflection) / (2.0 * _end - _inflection - x);
}
} else { //Concave decreasing
- if (fl::Op::isGt(x, _end)) {
- return _height * (_inflection - _end) / (_inflection - 2 * _end + x);
+ if (Op::isGt(x, _end)) {
+ return Term::_height * (_inflection - _end) / (_inflection - 2.0 * _end + x);
}
}
- return _height * 1.0;
+ return Term::_height * 1.0;
+ }
+
+ scalar Concave::tsukamoto(scalar activationDegree, scalar minimum, scalar maximum) const {
+ FL_IUNUSED(minimum);
+ FL_IUNUSED(maximum);
+ scalar i = _inflection;
+ scalar e = _end;
+ return (i - e) / membership(activationDegree) + 2 * e - i;
+ }
+
+ bool Concave::isMonotonic() const {
+ return true;
}
std::string Concave::parameters() const {
return Op::join(2, " ", _inflection, _end) +
- (not Op::isEq(_height, 1.0) ? " " + Op::str(_height) : "");
+ (not Op::isEq(getHeight(), 1.0) ? " " + Op::str(getHeight()) : "");
}
@@ -67,7 +71,7 @@ namespace fl {
std::ostringstream ex;
ex << "[configuration error] term <" << className() << ">"
<< " requires <" << required << "> parameters";
- throw fl::Exception(ex.str(), FL_AT);
+ throw Exception(ex.str(), FL_AT);
}
setInflection(Op::toScalar(values.at(0)));
setEnd(Op::toScalar(values.at(1)));
@@ -100,8 +104,4 @@ namespace fl {
return new Concave;
}
-
-
-
-
}