new upstream version 6.0

1 files changed, 27 insertions, 20 deletions

diff --git a/fuzzylite/fl/norm/t/EinsteinProduct.h b/fuzzylite/fl/norm/t/EinsteinProduct.h
index a4c1141..9d3a71b 100644
--- a/fuzzylite/fl/norm/t/EinsteinProduct.h
+++ b/fuzzylite/fl/norm/t/EinsteinProduct.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_EINSTEINPRODUCT_H
@@ -29,17 +21,32 @@
 
 namespace fl {
 
-    class FL_API EinsteinProduct : public TNorm {
+    /**
+      The EinsteinProduct class is a TNorm that computes the Einstein product
+      of any two values.
+
+      @author Juan Rada-Vilela, Ph.D.
+      @see EinsteinSum
+      @see TNorm
+      @see TNormFactory
+      @see Norm
+      @since 4.0
+     */
+    class FL_API EinsteinProduct FL_IFINAL : public TNorm {
     public:
         std::string className() const FL_IOVERRIDE;
+
+        Complexity complexity() const FL_IOVERRIDE;
+        /**
+          Computes the Einstein product of two membership function values
+          @param a is a membership function value
+          @param b is a membership function value
+          @return @f$(a\times b)/(2-(a+b-a\times b))@f$
+         */
         scalar compute(scalar a, scalar b) const FL_IOVERRIDE;
         EinsteinProduct* clone() const FL_IOVERRIDE;
 
         static TNorm* constructor();
     };
-
-
 }
-
 #endif  /* FL_EINSTEINPRODUCT_H */
-