From 6ce553563bc795f389f639a3a8cdfe356de71441 Mon Sep 17 00:00:00 2001
From: Johannes 'josch' Schauer <josch@debian.org>
Date: Sun, 27 Jan 2019 13:56:24 +0100
Subject: new upstream version 6.0

---
 fuzzylite/fl/defuzzifier/WeightedSum.h | 51 ++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 15 deletions(-)

(limited to 'fuzzylite/fl/defuzzifier/WeightedSum.h')

diff --git a/fuzzylite/fl/defuzzifier/WeightedSum.h b/fuzzylite/fl/defuzzifier/WeightedSum.h
index a754023..fb61ef3 100644
--- a/fuzzylite/fl/defuzzifier/WeightedSum.h
+++ b/fuzzylite/fl/defuzzifier/WeightedSum.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_WEIGHTEDSUM_H
@@ -30,6 +22,18 @@
 
 namespace fl {
 
+    /**
+      The WeightedSum class is a WeightedDefuzzifier that computes the
+      weighted sum of a fuzzy set represented in an Aggregated Term.
+
+      @author Juan Rada-Vilela, Ph.D.
+      @see WeightedSumCustom
+      @see WeightedAverage
+      @see WeightedAverageCustom
+      @see WeightedDefuzzifier
+      @see Defuzzifier
+      @since 4.0
+     */
     class FL_API WeightedSum : public WeightedDefuzzifier {
     public:
         explicit WeightedSum(Type type = Automatic);
@@ -38,6 +42,23 @@ namespace fl {
         FL_DEFAULT_COPY_AND_MOVE(WeightedSum)
 
         virtual std::string className() const FL_IOVERRIDE;
+
+        virtual Complexity complexity(const Term* term) const FL_IOVERRIDE;
+
+        /**
+          Computes the weighted sum of the given fuzzy set represented as an
+          Aggregated Term as @f$y = \sum_i{w_iz_i} @f$,
+          where @f$w_i@f$ is the activation degree of term @f$i@f$, and @f$z_i
+          = \mu_i(w_i) @f$.
+
+          From version 6.0, the implication and aggregation operators are not
+          utilized for defuzzification.
+
+          @param term is the fuzzy set represented as an AggregatedTerm
+          @param minimum is the minimum value of the range (only used for Tsukamoto)
+          @param maximum is the maximum value of the range (only used for Tsukamoto)
+          @return the weighted sum of the given fuzzy set
+         */
         virtual scalar defuzzify(const Term* term,
                 scalar minimum, scalar maximum) const FL_IOVERRIDE;
         virtual WeightedSum* clone() const FL_IOVERRIDE;
-- 
cgit v1.2.3