Hello community,
here is the log from the commit of package octave-forge-fuzzy-logic-toolkit for
openSUSE:Factory checked in at 2019-03-10 09:38:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/octave-forge-fuzzy-logic-toolkit (Old)
and
/work/SRC/openSUSE:Factory/.octave-forge-fuzzy-logic-toolkit.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-fuzzy-logic-toolkit"
Sun Mar 10 09:38:00 2019 rev:2 rq:682626 version:0.4.5
Changes:
--------
---
/work/SRC/openSUSE:Factory/octave-forge-fuzzy-logic-toolkit/octave-forge-fuzzy-logic-toolkit.changes
2015-06-16 15:11:27.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.octave-forge-fuzzy-logic-toolkit.new.28833/octave-forge-fuzzy-logic-toolkit.changes
2019-03-10 09:38:03.816137616 +0100
@@ -1,0 +2,6 @@
+Thu Mar 7 18:55:05 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Update to version 0.4.5
+- Fix build with current octave, add inst-defuz.m-update-anonymous-funtion.diff
+
+-------------------------------------------------------------------
Old:
----
fuzzy-logic-toolkit-0.4.4.tar.gz
New:
----
fuzzy-logic-toolkit-0.4.5.tar.gz
inst-defuz.m-update-anonymous-funtion.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ octave-forge-fuzzy-logic-toolkit.spec ++++++
--- /var/tmp/diff_new_pack.URakzt/_old 2019-03-10 09:38:04.528137446 +0100
+++ /var/tmp/diff_new_pack.URakzt/_new 2019-03-10 09:38:04.528137446 +0100
@@ -1,7 +1,7 @@
#
# spec file for package octave-forge-fuzzy-logic-toolkit
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,19 +12,21 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define octpkg fuzzy-logic-toolkit
Name: octave-forge-%{octpkg}
-Version: 0.4.4
+Version: 0.4.5
Release: 0
Summary: Fuzzy logic toolkit for Octave
-License: GPL-3.0+
+License: GPL-3.0-or-later
Group: Productivity/Scientific/Math
Url: http://octave.sourceforge.net
Source0:
http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM
https://sourceforge.net/p/octave/fuzzy-logic-toolkit/ci/00e05af94b3762d2e051ad28fb436da089160f40/
+Patch0: inst-defuz.m-update-anonymous-funtion.diff
BuildArch: noarch
BuildRequires: octave-devel
Requires: octave-cli >= 3.2.4
@@ -35,6 +37,7 @@
%prep
%setup -q -c %{name}-%{version}
+%patch0 -p1
%octave_pkg_src
%build
@@ -53,7 +56,6 @@
%octave --eval "pkg rebuild"
%files
-%defattr(-,root,root)
%{octpackages_dir}/%{octpkg}-%{version}
%changelog
++++++ fuzzy-logic-toolkit-0.4.4.tar.gz -> fuzzy-logic-toolkit-0.4.5.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fuzzy-logic-toolkit/ChangeLog
new/fuzzy-logic-toolkit/ChangeLog
--- old/fuzzy-logic-toolkit/ChangeLog 2014-06-27 00:53:01.000000000 +0200
+++ new/fuzzy-logic-toolkit/ChangeLog 2014-07-02 02:45:05.000000000 +0200
@@ -1,3 +1,12 @@
+2014-07-01 L. Markowsky <[email protected]>
+
+ * Version 0.4.5 released.
+ * ChangeLog: Updated file.
+ * DESCRIPTION: Updated file.
+ * NEWS: Updated file.
+ * inst/setfis.m: Bug #38018 was fixed (typo in function setfis.m --
+ wrong function name).
+
2014-06-26 L. Markowsky <[email protected]>
* Version 0.4.4 released.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fuzzy-logic-toolkit/DESCRIPTION
new/fuzzy-logic-toolkit/DESCRIPTION
--- old/fuzzy-logic-toolkit/DESCRIPTION 2014-06-26 18:48:32.000000000 +0200
+++ new/fuzzy-logic-toolkit/DESCRIPTION 2014-07-02 02:36:13.000000000 +0200
@@ -1,6 +1,6 @@
Name: fuzzy-logic-toolkit
-Version: 0.4.4
-Date: 2014-06-26
+Version: 0.4.5
+Date: 2014-07-01
Author: L. Markowsky <[email protected]>
Maintainer: L. Markowsky <[email protected]>
Title: Octave Fuzzy Logic Toolkit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fuzzy-logic-toolkit/NEWS new/fuzzy-logic-toolkit/NEWS
--- old/fuzzy-logic-toolkit/NEWS 2014-06-27 00:55:13.000000000 +0200
+++ new/fuzzy-logic-toolkit/NEWS 2014-07-02 02:43:56.000000000 +0200
@@ -1,3 +1,8 @@
+Summary of important user-visible changes for fuzzy-logic-toolkit 0.4.5:
+------------------------------------------------------------------------
+
+ ** Bug #38018 was fixed (typo in function setfis.m -- wrong function name).
+
Summary of important user-visible changes for fuzzy-logic-toolkit 0.4.4:
------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/fuzzy-logic-toolkit/inst/setfis.m
new/fuzzy-logic-toolkit/inst/setfis.m
--- old/fuzzy-logic-toolkit/inst/setfis.m 2014-06-14 16:49:33.000000000
+0200
+++ new/fuzzy-logic-toolkit/inst/setfis.m 2014-07-02 02:34:42.000000000
+0200
@@ -80,7 +80,7 @@
## Keywords: fuzzy-logic-toolkit fuzzy inference system fis
## Directory: fuzzy-logic-toolkit/inst/
## Filename: setfis.m
-## Last-Modified: 20 Aug 2012
+## Last-Modified: 1 Jul 2014
##----------------------------------------------------------------------
@@ -90,8 +90,8 @@
switch (nargin)
case 3 fis = setfis_three_args (fis, arg2, arg3);
case 5 fis = setfis_five_args (fis, arg2, arg3, arg4, arg5);
- case 7 fis = setfis_six_args (fis, arg2, arg3, arg4, arg5, ...
- arg6, arg7);
+ case 7 fis = setfis_seven_args (fis, arg2, arg3, arg4, arg5, ...
+ arg6, arg7);
otherwise
puts ("Type 'help setfis' for more information.\n");
error ("setfis requires 3, 5, or 7 arguments\n");
++++++ inst-defuz.m-update-anonymous-funtion.diff ++++++
--- a/fuzzy-logic-toolkit/inst/defuzz.m
+++ b/fuzzy-logic-toolkit/inst/defuzz.m
@@ -1,4 +1,4 @@
-## Copyright (C) 2011-2014 L. Markowsky <[email protected]>
+## Copyright (C) 2011-2018 L. Markowsky <[email protected]>
##
## This file is part of the fuzzy-logic-toolkit.
##
@@ -162,7 +162,16 @@
function crisp_x = mom (x, y)
max_y = max (y);
- y_val = @(y_val) if (y_val == max_y) 1 else 0 endif;
+
+ function y_val = calc_yval(y_val)
+ if (y_val == max_y)
+ y_val = 1;
+ else
+ y_val = 0;
+ endif
+ endfunction
+
+ y_val = @(y_val) calc_yval(y_val);
max_y_locations = arrayfun (y_val, y);
crisp_x = sum (x .* max_y_locations) / sum (max_y_locations);
@@ -185,7 +194,16 @@
function crisp_x = som (x, y)
max_y = max (y);
- y_val = @(y_val) if (y_val == max_y) 1 else (NaN) endif;
+
+ function y_val = calc_yval(y_val)
+ if (y_val == max_y)
+ y_val = 1;
+ else
+ y_val = (NaN);
+ endif
+ endfunction
+
+ y_val = @(y_val) calc_yval(y_val);
max_y_locations = arrayfun (y_val, y);
crisp_x = min (x .* max_y_locations);
@@ -207,7 +225,16 @@
function crisp_x = lom (x, y)
max_y = max (y);
- y_val = @(y_val) if (y_val == max_y) 1 else (NaN) endif;
+
+ function y_val = calc_yval(y_val)
+ if (y_val == max_y)
+ y_val = 1;
+ else
+ y_val = (NaN);
+ endif
+ endfunction
+
+ y_val = @(y_val) calc_yval(y_val);
max_y_locations = arrayfun (y_val, y);
crisp_x = max (x .* max_y_locations);
