some minor cleanups in transform limits stuff

astraw · astraw · commit 7362369db0e7 · 2007-07-13T22:06:57.000Z
svn path=/trunk/matplotlib/; revision=3516
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2007-07-13 Some minor cleanups in _transforms.cpp - ADS
+
 2007-07-13 Removed the rest of the numerix extension code detritus,
            numpified axes.py, and cleaned up the imports in axes.py
 	   - JDH
diff --git a/src/_transforms.cpp b/src/_transforms.cpp
@@ -6,14 +6,7 @@
 #include "mplutils.h"
 #include "MPL_isnan.h"
 
-
 #include "numpy/arrayobject.h"
-//#include "numpy/ufuncobject.h"
-
-
-//bool skip_float(double x) {
-//  return !MPL_isnan64(x) && !isinf(x);
-//}
 
 Value::~Value() {
   _VERBOSE("Value::~Value");
@@ -470,28 +463,22 @@ Bbox::update(const Py::Tuple &args) {
 
   Py::Tuple tup;
   if (ignore) {
-    tup = xys[0];
-    double x = Py::Float(tup[0]);
-    double y = Py::Float(tup[1]);
-
-    minx=x;
-    maxx=x;
-    miny=y;
-    maxy=y;
+    minx = miny = std::numeric_limits<double>::max();
+    maxx = maxy = std::numeric_limits<double>::min();
   }
 
 
   for (size_t i=0; i<Nx; ++i) {
     tup = xys[i];
     double x = Py::Float(tup[0]);
     double y = Py::Float(tup[1]);
+    if (MPL_isnan64(x) || MPL_isnan64(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;
-
   }
 
 
@@ -617,37 +604,14 @@ Bbox::update_numerix(const Py::Tuple &args) {
     _ignore = 0; // don't ignore future updates
   }
   if (ignore) {
-    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;
-    }
+    minx = miny = std::numeric_limits<double>::max();
+    maxx = maxy = -std::numeric_limits<double>::max();
   }
 
   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 (MPL_isnan64(thisx) || MPL_isnan64(thisy)) continue;
     _posx.update(thisx);
     _posy.update(thisy);
     if (thisx<minx) minx=thisx;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2007-07-13 Some minor cleanups in _transforms.cpp - ADS`
	`2`	`+`
`1`	`3`	`2007-07-13 Removed the rest of the numerix extension code detritus,`
`2`	`4`	`numpified axes.py, and cleaned up the imports in axes.py`
`3`	`5`	`- JDH`