1 files changed, 19 insertions, 25 deletions

diff --git a/fuzzylite/src/term/SigmoidDifference.cpp b/fuzzylite/src/term/SigmoidDifference.cpp
index 55a586c..8f7ee80 100644
--- a/fuzzylite/src/term/SigmoidDifference.cpp
+++ b/fuzzylite/src/term/SigmoidDifference.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/SigmoidDifference.h"
@@ -29,27 +21,29 @@ namespace fl {
     SigmoidDifference::SigmoidDifference(const std::string& name,
             scalar left, scalar rising,
             scalar falling, scalar right, scalar height)
-    : Term(name, height), _left(left), _rising(rising), _falling(falling), _right(right) {
-    }
+    : Term(name, height), _left(left), _rising(rising), _falling(falling), _right(right) { }
 
-    SigmoidDifference::~SigmoidDifference() {
-    }
+    SigmoidDifference::~SigmoidDifference() { }
 
     std::string SigmoidDifference::className() const {
         return "SigmoidDifference";
     }
 
+    Complexity SigmoidDifference::complexity() const {
+        return Complexity().comparison(1).arithmetic(2 + 4 + 4).function(2 + 1);
+    }
+
     scalar SigmoidDifference::membership(scalar x) const {
-        if (fl::Op::isNaN(x)) return fl::nan;
+        if (Op::isNaN(x)) return fl::nan;
 
-        scalar a = 1.0 / (1 + std::exp(-_rising * (x - _left)));
-        scalar b = 1.0 / (1 + std::exp(-_falling * (x - _right)));
-        return _height * std::abs(a - b);
+        const scalar a = 1.0 / (1.0 + std::exp(-_rising * (x - _left)));
+        const scalar b = 1.0 / (1.0 + std::exp(-_falling * (x - _right)));
+        return Term::_height * std::abs(a - b);
     }
 
     std::string SigmoidDifference::parameters() const {
         return Op::join(4, " ", _left, _rising, _falling, _right) +
-                (not Op::isEq(_height, 1.0) ? " " + Op::str(_height) : "");
+                (not Op::isEq(getHeight(), 1.0) ? " " + Op::str(getHeight()) : "");
     }
 
     void SigmoidDifference::configure(const std::string& parameters) {
@@ -60,7 +54,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);
         }
         setLeft(Op::toScalar(values.at(0)));
         setRising(Op::toScalar(values.at(1)));