# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1234860334 -3600
# Node ID d23c33ec6bd3a84c110cb5abf37992049dd6fb71
# Parent  a2a9dc5e8565df416f8bd63a4486bd78f4931436
fix min/max behaviour with NaNs

diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-17  Jaroslav Hajek  <highegg@gmail.com>
+
+	* mx-inlines.cc (OP_MINMAX_FCN): Correct behaviour with NaNs.
+
 2009-02-17  Jaroslav Hajek  <highegg@gmail.com>
 
 	* MArray-defs.h: Move declarative part to MArray-decl.h
diff --git a/liboctave/mx-inlines.cc b/liboctave/mx-inlines.cc
--- a/liboctave/mx-inlines.cc
+++ b/liboctave/mx-inlines.cc
@@ -498,8 +498,12 @@
   if (! n) return; \
   T tmp = v[0]; \
   octave_idx_type i = 1; \
-  while (xisnan (tmp) && i < n) tmp = v[i++]; \
-  for (i = 1; i < n; i++) \
+  if (xisnan (tmp)) \
+    { \
+      for (; i < n && xisnan (v[i]); i++) ; \
+      if (i < n) tmp = v[i]; \
+    } \
+  for (; i < n; i++) \
     if (v[i] OP tmp) tmp = v[i]; \
   *r = tmp; \
 } \
@@ -510,8 +514,12 @@
   T tmp = v[0]; \
   octave_idx_type tmpi = 0; \
   octave_idx_type i = 1; \
-  while (xisnan (tmp) && i < n) tmp = v[i++]; \
-  for (i = 1; i < n; i++) \
+  if (xisnan (tmp)) \
+    { \
+      for (; i < n && xisnan (v[i]); i++) ; \
+      if (i < n) { tmp = v[i]; tmpi = i; } \
+    } \
+  for (; i < n; i++) \
     if (v[i] OP tmp) { tmp = v[i]; tmpi = i; }\
   *r = tmp; \
   *ri = tmpi; \