revert r3512, which broke on Mac

astraw · astraw · commit 2800827fae15 · 2007-07-13T21:55:07.000Z
svn path=/trunk/matplotlib/; revision=3515
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,9 +2,6 @@
            numpified axes.py, and cleaned up the imports in axes.py
 	   - JDH
 
-2007-07-13 Removed our own MPL_isnan.h in favor of numpy's
-	   implementation -ADS
-
 2007-07-13 Added legend.loc as configurable option that could in
            future default to 'best'. - NN
 
diff --git a/setup.py b/setup.py
@@ -82,7 +82,7 @@
 from setupext import build_agg, build_gtkagg, build_tkagg, build_wxagg,\
      build_ft2font, build_image, build_windowing, build_transforms, \
      build_contour, build_nxutils, build_enthought, build_swigagg, build_gdk, \
-     build_subprocess, build_ttconv
+     build_subprocess, build_isnan, build_ttconv
 import distutils.sysconfig
 
 for line in file('lib/matplotlib/__init__.py').readlines():
@@ -156,6 +156,8 @@
     if sys.platform == 'win32':
         build_subprocess(ext_modules, packages)
 
+build_isnan(ext_modules, packages)
+
 try: import datetime
 except ImportError: havedate = False
 else: havedate = True
diff --git a/setupext.py b/setupext.py
@@ -809,3 +809,11 @@ def build_subprocess(ext_modules, packages):
         )
     add_base_flags(module)
     ext_modules.append(module)
+
+def build_isnan(ext_modules, packages):
+    module = Extension(
+        'matplotlib._isnan',
+        [ 'src/_isnan.c'],
+        )
+    add_base_flags(module)
+    ext_modules.append(module)
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -23,6 +23,7 @@
 #include "_backend_agg.h"
 #include "_transforms.h"
 #include "mplutils.h"
+#include "MPL_isnan.h"
 
 #include "swig_runtime.h"
 
@@ -1584,7 +1585,7 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
         moveto = true;
         continue;
       }
-      if (isnan(thisx) || isnan(thisy)) {
+      if (MPL_isnan64(thisx) || MPL_isnan64(thisy)) {
         moveto = true;
         continue;
       }
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -4,13 +4,16 @@
 
 #include "_transforms.h"
 #include "mplutils.h"
+#include "MPL_isnan.h"
 
 
 #include "numpy/arrayobject.h"
-#include "numpy/ufuncobject.h"
-#if !defined(isfinite)
-#define isfinite(x) (!(isinf((x)) || isnan((x))))
-#endif
+//#include "numpy/ufuncobject.h"
+
+
+//bool skip_float(double x) {
+//  return !MPL_isnan64(x) && !isinf(x);
+//}
 
 Value::~Value() {
   _VERBOSE("Value::~Value");
@@ -467,23 +470,31 @@ Bbox::update(const Py::Tuple &args) {
 
   Py::Tuple tup;
   if (ignore) {
-    minx = miny = std::numeric_limits<double>::max();
-    maxx = maxy = std::numeric_limits<double>::min();
+    tup = xys[0];
+    double x = Py::Float(tup[0]);
+    double y = Py::Float(tup[1]);
+
+    minx=x;
+    maxx=x;
+    miny=y;
+    maxy=y;
   }
 
+
   for (size_t i=0; i<Nx; ++i) {
     tup = xys[i];
     double x = Py::Float(tup[0]);
     double y = Py::Float(tup[1]);
-    if (isnan(x) || isnan(y)) continue;
     _posx.update(x);
     _posy.update(y);
     if (x<minx) minx=x;
     if (x>maxx) maxx=x;
     if (y<miny) miny=y;
     if (y>maxy) maxy=y;
+
   }
 
+
   _ll->x_api()->set_api(minx);
   _ll->y_api()->set_api(miny);
   _ur->x_api()->set_api(maxx);
@@ -539,7 +550,7 @@ Bbox::update_numerix_xy(const Py::Tuple &args) {
   for (size_t i=0; i< Nxy; ++i) {
     thisx = *(double *)(xyin->data + i*xyin->strides[0]);
     thisy = *(double *)(xyin->data + i*xyin->strides[0] + xyin->strides[1]);
-    if (isnan(thisx) || isnan(thisy)) continue;
+    if (MPL_isnan64(thisx) || MPL_isnan64(thisy)) continue;
     _posx.update(thisx);
     _posy.update(thisy);
     if (thisx<minx) minx=thisx;
@@ -606,14 +617,37 @@ Bbox::update_numerix(const Py::Tuple &args) {
     _ignore = 0; // don't ignore future updates
   }
   if (ignore) {
-    minx = miny = std::numeric_limits<double>::max();
-    maxx = maxy = std::numeric_limits<double>::min();
+    int xok=0;
+    int yok=0;
+    // loop through values until we find some nans...
+    for (size_t i=0; i< Nx; ++i) {
+      thisx = *(double *)(x->data + i*x->strides[0]);
+      thisy = *(double *)(y->data + i*y->strides[0]);
+
+      if (!xok) {
+	if (!MPL_isnan64(thisx)) {
+	  minx=thisx;
+	  maxx=thisx;
+	  xok=1;
+	}
+      }
+
+      if (!yok) {
+	if (!MPL_isnan64(thisy)) {
+	  miny=thisy;
+	  maxy=thisy;
+	  yok=1;
+	}
+      }
+
+      if (xok && yok) break;
+    }
   }
 
   for (size_t i=0; i< Nx; ++i) {
     thisx = *(double *)(x->data + i*x->strides[0]);
     thisy = *(double *)(y->data + i*y->strides[0]);
-    if (isnan(thisx) || isnan(thisy)) continue;
+
     _posx.update(thisx);
     _posy.update(thisy);
     if (thisx<minx) minx=thisx;
@@ -1255,18 +1289,18 @@ Transformation::nonlinear_only_numerix(const Py::Tuple & args, const Py::Dict &k
 
     double thisx = *(double *)(x->data + i*x->strides[0]);
     double thisy = *(double *)(y->data + i*y->strides[0]);
-    if (isnan(thisx) || isnan(thisy)) {
+    if (MPL_isnan64(thisx) || MPL_isnan64(thisy)) {
       if (returnMask) {
 	*(unsigned char *)(retmask->data + i*retmask->strides[0]) = 0;
       }
-      double MPL_not_finite; // don't require C99 math features - find our own nan
-      if (isnan(thisx)) {
-	MPL_not_finite=thisx;
+      double MPLnan; // don't require C99 math features - find our own nan
+      if (MPL_isnan64(thisx)) {
+	MPLnan=thisx;
       } else {
-	MPL_not_finite=thisy;
+	MPLnan=thisy;
       }
-      *(double *)(retx->data + i*retx->strides[0]) = MPL_not_finite;
-      *(double *)(rety->data + i*rety->strides[0]) = MPL_not_finite;
+      *(double *)(retx->data + i*retx->strides[0]) = MPLnan;
+      *(double *)(rety->data + i*rety->strides[0]) = MPLnan;
     } else {
       try {
 	this->nonlinear_only_api(&thisx, &thisy);

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`#include "_backend_agg.h"`
`24`	`24`	`#include "_transforms.h"`
`25`	`25`	`#include "mplutils.h"`
	`26`	`+#include "MPL_isnan.h"`
`26`	`27`
`27`	`28`	`#include "swig_runtime.h"`
`28`	`29`
`@@ -1584,7 +1585,7 @@ RendererAgg::draw_lines(const Py::Tuple& args) {`
`1584`	`1585`	`moveto = true;`
`1585`	`1586`	`continue;`
`1586`	`1587`	`}`
`1587`		`- if (isnan(thisx) \|\| isnan(thisy)) {`
	`1588`	`+ if (MPL_isnan64(thisx) \|\| MPL_isnan64(thisy)) {`
`1588`	`1589`	`moveto = true;`
`1589`	`1590`	`continue;`
`1590`	`1591`	`}`