# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1278589897 -7200
# Node ID 6892c55629505d1bc543ba36fe536c31f96a7c31
# Parent  cfb13443434f06e4dfd5a976b1a08adf06efc514
fix bug in accumarray

diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-08  Jaroslav Hajek  <highegg@gmail.com>
+
+	* general/accumarray.m: Fix incorrect handling of nondefault fill
+	values in min/max reductions of integers.
+
 2010-07-07  David Bateman  <dbateman@free.fr>
 
 	* __next_line_color__.m: Allow conditional initialisation of the
diff --git a/scripts/general/accumarray.m b/scripts/general/accumarray.m
--- a/scripts/general/accumarray.m
+++ b/scripts/general/accumarray.m
@@ -205,7 +205,7 @@
         A = reshape (A, sz);
       endif
 
-      if (fillval != zero && isnan (fillval) != isnan (zero))
+      if (fillval != zero && ! (isnan (fillval) || isnan (zero)))
         mask = true (size (A));
         mask(subs) = false;
         A(mask) = fillval;
@@ -228,7 +228,7 @@
         A = reshape (A, sz);
       endif
 
-      if (fillval != zero && isnan (fillval) != isnan (zero))
+      if (fillval != zero && ! (isnan (fillval) || isnan (zero)))
         mask = true (size (A));
         mask(subs) = false;
         A(mask) = fillval;