8 files changed, 372 insertions, 0 deletions
diff --git a/fuzzylite/src/norm/t/AlgebraicProduct.cpp b/fuzzylite/src/norm/t/AlgebraicProduct.cpp
new file mode 100644
index 0000000..eefe309
--- /dev/null
+++ b/fuzzylite/src/norm/t/AlgebraicProduct.cpp
@@ -0,0 +1,41 @@
+/*
+ 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 FuzzyLite License included with the software.
+
+ 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/norm/t/AlgebraicProduct.h"
+
+namespace fl {
+
+    std::string AlgebraicProduct::className() const {
+        return "AlgebraicProduct";
+    }
+
+    Complexity AlgebraicProduct::complexity() const {
+        return Complexity().arithmetic(1);
+    }
+
+    scalar AlgebraicProduct::compute(scalar a, scalar b) const {
+        return a * b;
+    }
+
+    AlgebraicProduct* AlgebraicProduct::clone() const {
+        return new AlgebraicProduct(*this);
+    }
+
+    TNorm* AlgebraicProduct::constructor() {
+        return new AlgebraicProduct;
+    }
+
+}
diff --git a/fuzzylite/src/norm/t/BoundedDifference.cpp b/fuzzylite/src/norm/t/BoundedDifference.cpp
new file mode 100644
index 0000000..3775aa4
--- /dev/null
+++ b/fuzzylite/src/norm/t/BoundedDifference.cpp
@@ -0,0 +1,43 @@
+/*
+ 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 FuzzyLite License included with the software.
+
+ 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/norm/t/BoundedDifference.h"
+
+#include "fl/Operation.h"
+
+namespace fl {
+
+    std::string BoundedDifference::className() const {
+        return "BoundedDifference";
+    }
+
+    Complexity BoundedDifference::complexity() const {
+        return Complexity().arithmetic(2).function(1);
+    }
+
+    scalar BoundedDifference::compute(scalar a, scalar b) const {
+        return Op::max(scalar(0.0), a + b - scalar(1.0));
+    }
+
+    BoundedDifference* BoundedDifference::clone() const {
+        return new BoundedDifference(*this);
+    }
+
+    TNorm* BoundedDifference::constructor() {
+        return new BoundedDifference;
+    }
+
+}
diff --git a/fuzzylite/src/norm/t/DrasticProduct.cpp b/fuzzylite/src/norm/t/DrasticProduct.cpp
new file mode 100644
index 0000000..5bfdc87
--- /dev/null
+++ b/fuzzylite/src/norm/t/DrasticProduct.cpp
@@ -0,0 +1,46 @@
+/*
+ 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 FuzzyLite License included with the software.
+
+ 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/norm/t/DrasticProduct.h"
+
+#include "fl/Operation.h"
+
+namespace fl {
+
+    std::string DrasticProduct::className() const {
+        return "DrasticProduct";
+    }
+
+    Complexity DrasticProduct::complexity() const {
+        return Complexity().comparison(1).function(2);
+    }
+
+    scalar DrasticProduct::compute(scalar a, scalar b) const {
+        if (Op::isEq(Op::max(a, b), 1.0)) {
+            return Op::min(a, b);
+        }
+        return 0.0;
+    }
+
+    DrasticProduct* DrasticProduct::clone() const {
+        return new DrasticProduct(*this);
+    }
+
+    TNorm* DrasticProduct::constructor() {
+        return new DrasticProduct;
+    }
+
+}
diff --git a/fuzzylite/src/norm/t/EinsteinProduct.cpp b/fuzzylite/src/norm/t/EinsteinProduct.cpp
new file mode 100644
index 0000000..bbb3966
--- /dev/null
+++ b/fuzzylite/src/norm/t/EinsteinProduct.cpp
@@ -0,0 +1,41 @@
+/*
+ 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 FuzzyLite License included with the software.
+
+ 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/norm/t/EinsteinProduct.h"
+
+namespace fl {
+
+    std::string EinsteinProduct::className() const {
+        return "EinsteinProduct";
+    }
+
+    Complexity EinsteinProduct::complexity() const {
+        return Complexity().arithmetic(6);
+    }
+
+    scalar EinsteinProduct::compute(scalar a, scalar b) const {
+        return (a * b) / (2.0 - (a + b - a * b));
+    }
+
+    EinsteinProduct* EinsteinProduct::clone() const {
+        return new EinsteinProduct(*this);
+    }
+
+    TNorm* EinsteinProduct::constructor() {
+        return new EinsteinProduct;
+    }
+
+}
diff --git a/fuzzylite/src/norm/t/HamacherProduct.cpp b/fuzzylite/src/norm/t/HamacherProduct.cpp
new file mode 100644
index 0000000..9416084
--- /dev/null
+++ b/fuzzylite/src/norm/t/HamacherProduct.cpp
@@ -0,0 +1,44 @@
+/*
+ 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 FuzzyLite License included with the software.
+
+ 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/norm/t/HamacherProduct.h"
+
+#include "fl/Operation.h"
+
+namespace fl {
+
+    std::string HamacherProduct::className() const {
+        return "HamacherProduct";
+    }
+
+    Complexity HamacherProduct::complexity() const {
+        return Complexity().arithmetic(5);
+    }
+
+    scalar HamacherProduct::compute(scalar a, scalar b) const {
+        if (Op::isEq(a + b, 0.0)) return 0.0;
+        return (a * b) / (a + b - a * b);
+    }
+
+    HamacherProduct* HamacherProduct::clone() const {
+        return new HamacherProduct(*this);
+    }
+
+    TNorm* HamacherProduct::constructor() {
+        return new HamacherProduct;
+    }
+
+}
diff --git a/fuzzylite/src/norm/t/Minimum.cpp b/fuzzylite/src/norm/t/Minimum.cpp
new file mode 100644
index 0000000..1a63658
--- /dev/null
+++ b/fuzzylite/src/norm/t/Minimum.cpp
@@ -0,0 +1,44 @@
+/*
+ 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 FuzzyLite License included with the software.
+
+ 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/norm/t/Minimum.h"
+
+#include "fl/Operation.h"
+
+namespace fl {
+
+    std::string Minimum::className() const {
+        return "Minimum";
+    }
+
+    Complexity Minimum::complexity() const {
+        return Complexity().function(1);
+    }
+
+    scalar Minimum::compute(scalar a, scalar b) const {
+        return Op::min(a, b);
+    }
+
+    Minimum* Minimum::clone() const {
+        return new Minimum(*this);
+    }
+
+    TNorm* Minimum::constructor() {
+        return new Minimum;
+    }
+
+
+}
diff --git a/fuzzylite/src/norm/t/NilpotentMinimum.cpp b/fuzzylite/src/norm/t/NilpotentMinimum.cpp
new file mode 100644
index 0000000..7ab906b
--- /dev/null
+++ b/fuzzylite/src/norm/t/NilpotentMinimum.cpp
@@ -0,0 +1,47 @@
+/*
+ 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 FuzzyLite License included with the software.
+
+ 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/norm/t/NilpotentMinimum.h"
+
+#include "fl/Operation.h"
+
+namespace fl {
+
+    std::string NilpotentMinimum::className() const {
+        return "NilpotentMinimum";
+    }
+
+    Complexity NilpotentMinimum::complexity() const {
+        return Complexity().comparison(1).arithmetic(1).function(1);
+    }
+
+    scalar NilpotentMinimum::compute(scalar a, scalar b) const {
+        if (Op::isGt(a + b, 1.0)) {
+            return Op::min(a, b);
+        }
+        return 0.0;
+    }
+
+    NilpotentMinimum* NilpotentMinimum::clone() const {
+        return new NilpotentMinimum(*this);
+    }
+
+    TNorm* NilpotentMinimum::constructor() {
+        return new NilpotentMinimum;
+    }
+
+
+}
diff --git a/fuzzylite/src/norm/t/TNormFunction.cpp b/fuzzylite/src/norm/t/TNormFunction.cpp
new file mode 100644
index 0000000..1e0563e
--- /dev/null
+++ b/fuzzylite/src/norm/t/TNormFunction.cpp
@@ -0,0 +1,66 @@
+/*
+ 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 FuzzyLite License included with the software.
+
+ 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/norm/t/TNormFunction.h"
+
+namespace fl {
+
+    TNormFunction::TNormFunction(const std::string& formula) : TNorm() {
+        _function.variables["a"] = fl::nan;
+        _function.variables["b"] = fl::nan;
+        if (not formula.empty()) {
+            _function.load(formula);
+        }
+    }
+
+    std::string TNormFunction::className() const {
+        return "TNormFunction";
+    }
+
+    Complexity TNormFunction::complexity() const {
+        if (_function.root())
+            return _function.complexity().function(2 * std::log(scalar(_function.variables.size())));
+        return _function.complexity();
+    }
+
+    scalar TNormFunction::compute(scalar a, scalar b) const {
+        _function.variables["a"] = a;
+        _function.variables["b"] = b;
+        return _function.evaluate();
+    }
+
+    Function& TNormFunction::function() {
+        return this->_function;
+    }
+
+    void TNormFunction::setFormula(const std::string& formula) {
+        this->_function.load(formula);
+    }
+
+    std::string TNormFunction::getFormula() const {
+        return _function.getFormula();
+    }
+
+    TNormFunction* TNormFunction::clone() const {
+        return new TNormFunction(*this);
+    }
+
+    TNorm* TNormFunction::constructor() {
+        return new TNormFunction;
+    }
+
+
+}