svn commit: r469981 - in head/math/octave-forge-fuzzy-logic-toolkit: . files

[Stephen Montgomery-Smith]

Author: stephen
Date: Mon May 14 23:28:48 2018
New Revision: 469981
URL: https://svnweb.freebsd.org/changeset/ports/469981

Log:
  - Add patch to unbreak.
  - Bump portrevision (because of update of octave to 4.4.0).
  
  Obtained from:	https://sourceforge.net/p/octave/fuzzy-logic-toolkit/ci/default/tree/

Added:
  head/math/octave-forge-fuzzy-logic-toolkit/files/
  head/math/octave-forge-fuzzy-logic-toolkit/files/patch-inst_defuzz.m   (contents, props changed)
Modified:
  head/math/octave-forge-fuzzy-logic-toolkit/Makefile

Modified: head/math/octave-forge-fuzzy-logic-toolkit/Makefile
==============================================================================
--- head/math/octave-forge-fuzzy-logic-toolkit/Makefile	Mon May 14 22:11:02 2018	(r469980)
+++ head/math/octave-forge-fuzzy-logic-toolkit/Makefile	Mon May 14 23:28:48 2018	(r469981)
@@ -3,7 +3,7 @@
 
 PORTNAME=	octave-forge-fuzzy-logic-toolkit
 PORTVERSION=	0.4.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	stephen at FreeBSD.org
@@ -12,11 +12,11 @@ COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
-BROKEN=		parse error when installing with octave 4.4.0
-
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${OCTAVE_PKGNAME}
+
+WRKSRC=		${WRKDIR}/${OCTSRC}	# Only required so that patch will apply.
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 

Added: head/math/octave-forge-fuzzy-logic-toolkit/files/patch-inst_defuzz.m
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/octave-forge-fuzzy-logic-toolkit/files/patch-inst_defuzz.m	Mon May 14 23:28:48 2018	(r469981)
@@ -0,0 +1,62 @@
+--- inst/defuzz.m.orig	2014-07-02 00:11:06 UTC
++++ inst/defuzz.m
+@@ -1,4 +1,4 @@
+-## Copyright (C) 2011-2014 L. Markowsky <lmarkov at users.sourceforge.net>
++## Copyright (C) 2011-2018 L. Markowsky <lmarkov at users.sourceforge.net>
+ ##
+ ## This file is part of the fuzzy-logic-toolkit.
+ ##
+@@ -162,7 +162,16 @@ endfunction
+ 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 @@ endfunction
+ 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 @@ endfunction
+ 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);
+