fuzzylite (5.1+dfsg-1) unstable; urgency=medium

  * new upstream version (Closes: #777858)
  * removed debian/patches/20140705-minor-improvements-on-building-script as
    upstream integrated it. Adjust build options in d/rules accordingly.
  * delete debian/patches/20140714-building-from-objects-just-once and
    debian/patches/20141027-fix-some-spelling as they have been applied
    upstream
  * install usr/lib/*/pkgconfig/fuzzylite.pc in fuzzylite-dev
  * SONAME bump from 5.0 to 5.1, so renaming libfuzzylite5.0 to
    libfuzzylite5.1
  * add debian/patches/pkgconfig_installdir to install pkgconfig file in
    correct location

# imported from the archive

8 files changed, 369 insertions, 0 deletions

diff --git a/fuzzylite/src/norm/s/AlgebraicSum.cpp b/fuzzylite/src/norm/s/AlgebraicSum.cpp
new file mode 100644
index 0000000..e96c1a7
--- /dev/null
+++ b/fuzzylite/src/norm/s/AlgebraicSum.cpp
@@ -0,0 +1,45 @@
+/*
+ Author: Juan Rada-Vilela, Ph.D.
+ Copyright (C) 2010-2014 FuzzyLite Limited
+ All rights reserved
+
+ 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.
+
+ 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.
+
+ */
+
+#include "fl/norm/s/AlgebraicSum.h"
+
+namespace fl {
+
+    std::string AlgebraicSum::className() const {
+        return "AlgebraicSum";
+    }
+
+    scalar AlgebraicSum::compute(scalar a, scalar b) const {
+        return a + b - (a * b);
+    }
+
+    AlgebraicSum* AlgebraicSum::clone() const {
+        return new AlgebraicSum(*this);
+    }
+
+    SNorm* AlgebraicSum::constructor() {
+        return new AlgebraicSum;
+    }
+
+}
diff --git a/fuzzylite/src/norm/s/BoundedSum.cpp b/fuzzylite/src/norm/s/BoundedSum.cpp
new file mode 100644
index 0000000..9c050c8
--- /dev/null
+++ b/fuzzylite/src/norm/s/BoundedSum.cpp
@@ -0,0 +1,45 @@
+/*
+ Author: Juan Rada-Vilela, Ph.D.
+ Copyright (C) 2010-2014 FuzzyLite Limited
+ All rights reserved
+
+ 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.
+
+ 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.
+
+ */
+
+#include "fl/norm/s/BoundedSum.h"
+
+namespace fl {
+
+    std::string BoundedSum::className() const {
+        return "BoundedSum";
+    }
+
+    scalar BoundedSum::compute(scalar a, scalar b) const {
+        return Op::min(scalar(1.0), a + b);
+    }
+
+    BoundedSum* BoundedSum::clone() const {
+        return new BoundedSum(*this);
+    }
+
+    SNorm* BoundedSum::constructor() {
+        return new BoundedSum;
+    }
+
+}
diff --git a/fuzzylite/src/norm/s/DrasticSum.cpp b/fuzzylite/src/norm/s/DrasticSum.cpp
new file mode 100644
index 0000000..c0629db
--- /dev/null
+++ b/fuzzylite/src/norm/s/DrasticSum.cpp
@@ -0,0 +1,48 @@
+/*
+ Author: Juan Rada-Vilela, Ph.D.
+ Copyright (C) 2010-2014 FuzzyLite Limited
+ All rights reserved
+
+ 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.
+
+ 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.
+
+ */
+
+#include "fl/norm/s/DrasticSum.h"
+
+namespace fl {
+
+    std::string DrasticSum::className() const {
+        return "DrasticSum";
+    }
+
+    scalar DrasticSum::compute(scalar a, scalar b) const {
+        if (Op::isEq(Op::min(a, b), 0.0)) {
+            return Op::max(a, b);
+        }
+        return 1.0;
+    }
+
+    DrasticSum* DrasticSum::clone() const {
+        return new DrasticSum(*this);
+    }
+
+    SNorm* DrasticSum::constructor() {
+        return new DrasticSum;
+    }
+
+}
diff --git a/fuzzylite/src/norm/s/EinsteinSum.cpp b/fuzzylite/src/norm/s/EinsteinSum.cpp
new file mode 100644
index 0000000..ec0fbd8
--- /dev/null
+++ b/fuzzylite/src/norm/s/EinsteinSum.cpp
@@ -0,0 +1,45 @@
+/*
+ Author: Juan Rada-Vilela, Ph.D.
+ Copyright (C) 2010-2014 FuzzyLite Limited
+ All rights reserved
+
+ 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.
+
+ 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.
+
+ */
+
+#include "fl/norm/s/EinsteinSum.h"
+
+namespace fl {
+
+    std::string EinsteinSum::className() const {
+        return "EinsteinSum";
+    }
+
+    scalar EinsteinSum::compute(scalar a, scalar b) const {
+        return (a + b) / (1.0 + a * b);
+    }
+
+    EinsteinSum* EinsteinSum::clone() const {
+        return new EinsteinSum(*this);
+    }
+
+    SNorm* EinsteinSum::constructor() {
+        return new EinsteinSum;
+    }
+
+}
diff --git a/fuzzylite/src/norm/s/HamacherSum.cpp b/fuzzylite/src/norm/s/HamacherSum.cpp
new file mode 100644
index 0000000..f9c0994
--- /dev/null
+++ b/fuzzylite/src/norm/s/HamacherSum.cpp
@@ -0,0 +1,45 @@
+/*
+ Author: Juan Rada-Vilela, Ph.D.
+ Copyright (C) 2010-2014 FuzzyLite Limited
+ All rights reserved
+
+ 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.
+
+ 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.
+
+ */
+
+#include "fl/norm/s/HamacherSum.h"
+
+namespace fl {
+
+    std::string HamacherSum::className() const {
+        return "HamacherSum";
+    }
+
+    scalar HamacherSum::compute(scalar a, scalar b) const {
+        return (a + b - 2.0 * a * b) / (1.0 - a * b);
+    }
+
+    HamacherSum* HamacherSum::clone() const {
+        return new HamacherSum(*this);
+    }
+
+    SNorm* HamacherSum::constructor() {
+        return new HamacherSum;
+    }
+
+}
diff --git a/fuzzylite/src/norm/s/Maximum.cpp b/fuzzylite/src/norm/s/Maximum.cpp
new file mode 100644
index 0000000..ed8a839
--- /dev/null
+++ b/fuzzylite/src/norm/s/Maximum.cpp
@@ -0,0 +1,45 @@
+/*
+ Author: Juan Rada-Vilela, Ph.D.
+ Copyright (C) 2010-2014 FuzzyLite Limited
+ All rights reserved
+
+ 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.
+
+ 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.
+
+ */
+
+#include "fl/norm/s/Maximum.h"
+
+namespace fl {
+
+    std::string Maximum::className() const {
+        return "Maximum";
+    }
+
+    scalar Maximum::compute(scalar a, scalar b) const {
+        return Op::max(a, b);
+    }
+
+    Maximum* Maximum::clone() const {
+        return new Maximum(*this);
+    }
+
+    SNorm* Maximum::constructor() {
+        return new Maximum;
+    }
+
+}
diff --git a/fuzzylite/src/norm/s/NilpotentMaximum.cpp b/fuzzylite/src/norm/s/NilpotentMaximum.cpp
new file mode 100644
index 0000000..0a09136
--- /dev/null
+++ b/fuzzylite/src/norm/s/NilpotentMaximum.cpp
@@ -0,0 +1,50 @@
+/*
+ Author: Juan Rada-Vilela, Ph.D.
+ Copyright (C) 2010-2014 FuzzyLite Limited
+ All rights reserved
+
+ 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.
+
+ 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.
+
+ */
+
+#include "fl/norm/s/NilpotentMaximum.h"
+
+namespace fl {
+
+    std::string NilpotentMaximum::className() const {
+        return "NilpotentMaximum";
+    }
+
+    scalar NilpotentMaximum::compute(scalar a, scalar b) const {
+        if (Op::isLt(a + b, 1.0)) {
+            return std::max(a, b);
+        }
+        return 1.0;
+    }
+
+    NilpotentMaximum* NilpotentMaximum::clone() const {
+        return new NilpotentMaximum(*this);
+    }
+
+    SNorm* NilpotentMaximum::constructor() {
+        return new NilpotentMaximum;
+    }
+
+
+}
+
diff --git a/fuzzylite/src/norm/s/NormalizedSum.cpp b/fuzzylite/src/norm/s/NormalizedSum.cpp
new file mode 100644
index 0000000..94ad5ea
--- /dev/null
+++ b/fuzzylite/src/norm/s/NormalizedSum.cpp
@@ -0,0 +1,46 @@
+/*
+ Author: Juan Rada-Vilela, Ph.D.
+ Copyright (C) 2010-2014 FuzzyLite Limited
+ All rights reserved
+
+ 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.
+
+ 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.
+
+ */
+
+#include "fl/norm/s/NormalizedSum.h"
+
+namespace fl {
+
+    std::string NormalizedSum::className() const {
+        return "NormalizedSum";
+    }
+
+    scalar NormalizedSum::compute(scalar a, scalar b) const {
+        return a + b / Op::max(scalar(1.0), Op::max(a, b));
+    }
+
+    NormalizedSum* NormalizedSum::clone() const {
+        return new NormalizedSum(*this);
+    }
+
+    SNorm* NormalizedSum::constructor() {
+        return new NormalizedSum;
+    }
+
+
+}