summaryrefslogtreecommitdiff
path: root/fuzzylite/src/term/Gaussian.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'fuzzylite/src/term/Gaussian.cpp')
-rw-r--r--fuzzylite/src/term/Gaussian.cpp48
1 files changed, 21 insertions, 27 deletions
diff --git a/fuzzylite/src/term/Gaussian.cpp b/fuzzylite/src/term/Gaussian.cpp
index 5b709f9..8413b59 100644
--- a/fuzzylite/src/term/Gaussian.cpp
+++ b/fuzzylite/src/term/Gaussian.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/Gaussian.h"
@@ -28,24 +20,26 @@ namespace fl {
Gaussian::Gaussian(const std::string& name,
scalar mean, scalar standardDeviation, scalar height)
- : Term(name, height), _mean(mean), _standardDeviation(standardDeviation) {
- }
+ : Term(name, height), _mean(mean), _standardDeviation(standardDeviation) { }
- Gaussian::~Gaussian() {
- }
+ Gaussian::~Gaussian() { }
std::string Gaussian::className() const {
return "Gaussian";
}
+ Complexity Gaussian::complexity() const {
+ return Complexity().comparison(1).arithmetic(7).function(1);
+ }
+
scalar Gaussian::membership(scalar x) const {
- if (fl::Op::isNaN(x)) return fl::nan;
- return _height * std::exp((-(x - _mean) * (x - _mean)) / (2 * _standardDeviation * _standardDeviation));
+ if (Op::isNaN(x)) return fl::nan;
+ return Term::_height * std::exp((-(x - _mean) * (x - _mean)) / (2.0 * _standardDeviation * _standardDeviation));
}
std::string Gaussian::parameters() const {
return Op::join(2, " ", _mean, _standardDeviation) +
- (not Op::isEq(_height, 1.0) ? " " + Op::str(_height) : "");
+ (not Op::isEq(getHeight(), 1.0) ? " " + Op::str(getHeight()) : "");
}
void Gaussian::configure(const std::string& parameters) {
@@ -56,7 +50,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);
}
setMean(Op::toScalar(values.at(0)));
setStandardDeviation(Op::toScalar(values.at(1)));
@@ -64,16 +58,16 @@ namespace fl {
setHeight(Op::toScalar(values.at(required)));
}
- void Gaussian::setMean(scalar c) {
- this->_mean = c;
+ void Gaussian::setMean(scalar mean) {
+ this->_mean = mean;
}
scalar Gaussian::getMean() const {
return this->_mean;
}
- void Gaussian::setStandardDeviation(scalar sigma) {
- this->_standardDeviation = sigma;
+ void Gaussian::setStandardDeviation(scalar standardDeviation) {
+ this->_standardDeviation = standardDeviation;
}
scalar Gaussian::getStandardDeviation() const {