Revert 2c1bc6b for performance

mdboom · mdboom · commit 27d119900dd3 · 2016-05-19T08:15:33.000-04:00
diff --git a/lib/matplotlib/tests/test_path.py b/lib/matplotlib/tests/test_path.py
@@ -39,7 +39,6 @@ def test_contains_points_negative_radius():
     expected = [True, False, False]
     result = path.contains_points(points, radius=-0.5)
 
-    assert result.dtype == np.bool
     assert np.all(result == expected)
 
 
diff --git a/src/_path.h b/src/_path.h
@@ -79,7 +79,7 @@ struct XY
 template <class PathIterator, class PointArray, class ResultArray>
 void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &inside_flag)
 {
-    bool yflag1;
+    uint8_t yflag1;
     double vtx0, vty0, vtx1, vty1;
     double tx, ty;
     double sx, sy;
@@ -89,13 +89,13 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins
 
     size_t n = points.size();
 
-    std::vector<bool> yflag0(n);
-    std::vector<bool> subpath_flag(n);
+    std::vector<uint8_t> yflag0(n);
+    std::vector<uint8_t> subpath_flag(n);
 
     path.rewind(0);
 
     for (i = 0; i < n; ++i) {
-        inside_flag[i] = false;
+        inside_flag[i] = 0;
     }
 
     unsigned code = 0;
@@ -118,7 +118,7 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins
                 // get test bit for above/below X axis
                 yflag0[i] = (vty0 >= ty);
 
-                subpath_flag[i] = false;
+                subpath_flag[i] = 0;
             }
         }
 
@@ -164,7 +164,7 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins
                     // Haigh-Hutchinson's different polygon inclusion
                     // tests.
                     if (((vty1 - ty) * (vtx0 - vtx1) >= (vtx1 - tx) * (vty0 - vty1)) == yflag1) {
-                        subpath_flag[i] = subpath_flag[i] ^ true;
+                        subpath_flag[i] ^= 1;
                     }
                 }
 
@@ -196,8 +196,8 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins
                     subpath_flag[i] = subpath_flag[i] ^ true;
                 }
             }
-            inside_flag[i] = inside_flag[i] || subpath_flag[i];
-            if (inside_flag[i] == false) {
+            inside_flag[i] |= subpath_flag[i];
+            if (inside_flag[i] == 0) {
                 all_done = false;
             }
         }
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -93,7 +93,7 @@ static PyObject *Py_points_in_path(PyObject *self, PyObject *args, PyObject *kwd
     }
 
     npy_intp dims[] = { (npy_intp)points.size() };
-    numpy::array_view<bool, 1> results(dims);
+    numpy::array_view<uint8_t, 1> results(dims);
 
     CALL_CPP("points_in_path", (points_in_path(points, r, path, trans, results)));
 
@@ -152,7 +152,7 @@ static PyObject *Py_points_on_path(PyObject *self, PyObject *args, PyObject *kwd
     }
 
     npy_intp dims[] = { (npy_intp)points.size() };
-    numpy::array_view<bool, 1> results(dims);
+    numpy::array_view<uint8_t, 1> results(dims);
 
     CALL_CPP("points_on_path", (points_on_path(points, r, path, trans, results)));
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ struct XY`
`79`	`79`	`template <class PathIterator, class PointArray, class ResultArray>`
`80`	`80`	`void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &inside_flag)`
`81`	`81`	`{`
`82`		`- bool yflag1;`
	`82`	`+ uint8_t yflag1;`
`83`	`83`	`double vtx0, vty0, vtx1, vty1;`
`84`	`84`	`double tx, ty;`
`85`	`85`	`double sx, sy;`
`@@ -89,13 +89,13 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins`
`89`	`89`
`90`	`90`	`size_t n = points.size();`
`91`	`91`
`92`		`- std::vector<bool> yflag0(n);`
`93`		`- std::vector<bool> subpath_flag(n);`
	`92`	`+ std::vector<uint8_t> yflag0(n);`
	`93`	`+ std::vector<uint8_t> subpath_flag(n);`
`94`	`94`
`95`	`95`	`path.rewind(0);`
`96`	`96`
`97`	`97`	`for (i = 0; i < n; ++i) {`
`98`		`- inside_flag[i] = false;`
	`98`	`+ inside_flag[i] = 0;`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`unsigned code = 0;`
`@@ -118,7 +118,7 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins`
`118`	`118`	`// get test bit for above/below X axis`
`119`	`119`	`yflag0[i] = (vty0 >= ty);`
`120`	`120`
`121`		`- subpath_flag[i] = false;`
	`121`	`+ subpath_flag[i] = 0;`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`@@ -164,7 +164,7 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins`
`164`	`164`	`// Haigh-Hutchinson's different polygon inclusion`
`165`	`165`	`// tests.`
`166`	`166`	`if (((vty1 - ty) * (vtx0 - vtx1) >= (vtx1 - tx) * (vty0 - vty1)) == yflag1) {`
`167`		`- subpath_flag[i] = subpath_flag[i] ^ true;`
	`167`	`+ subpath_flag[i] ^= 1;`
`168`	`168`	`}`
`169`	`169`	`}`
`170`	`170`
`@@ -196,8 +196,8 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins`
`196`	`196`	`subpath_flag[i] = subpath_flag[i] ^ true;`
`197`	`197`	`}`
`198`	`198`	`}`
`199`		`- inside_flag[i] = inside_flag[i] \|\| subpath_flag[i];`
`200`		`- if (inside_flag[i] == false) {`
	`199`	`+ inside_flag[i] \|= subpath_flag[i];`
	`200`	`+ if (inside_flag[i] == 0) {`
`201`	`201`	`all_done = false;`
`202`	`202`	`}`
`203`	`203`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ static PyObject Py_points_in_path(PyObject self, PyObject args, PyObject kwd`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`npy_intp dims[] = { (npy_intp)points.size() };`
`96`		`- numpy::array_view<bool, 1> results(dims);`
	`96`	`+ numpy::array_view<uint8_t, 1> results(dims);`
`97`	`97`
`98`	`98`	`CALL_CPP("points_in_path", (points_in_path(points, r, path, trans, results)));`
`99`	`99`
`@@ -152,7 +152,7 @@ static PyObject Py_points_on_path(PyObject self, PyObject args, PyObject kwd`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`npy_intp dims[] = { (npy_intp)points.size() };`
`155`		`- numpy::array_view<bool, 1> results(dims);`
	`155`	`+ numpy::array_view<uint8_t, 1> results(dims);`
`156`	`156`
`157`	`157`	`CALL_CPP("points_on_path", (points_on_path(points, r, path, trans, results)));`
`158`	`158`