Skip to content

Move points_in_polygon to Cython #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
corranwebster merged 3 commits into from
May 26, 2017
Merged

Move points_in_polygon to Cython #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de0d236
Move points_in_polygon to Cython
jwiggins Nov 5, 2016
338b3c0
Move point_in_polygon back to kiva
jwiggins Dec 30, 2016
b170a17
Oops, wrong extension name
jwiggins Dec 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions enable/primitives/polygon.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
from numpy import array

# Enthought library imports.
from kiva.constants import EOF_FILL_STROKE, FILL, FILL_STROKE
from kiva.agg import points_in_polygon
from traits.api import Any, Event, Float, HasTraits, Instance, List, \
Property, Trait, Tuple
from kiva.api import EOF_FILL_STROKE, FILL, FILL_STROKE, points_in_polygon
from traits.api import (Any, Event, Float, HasTraits, Instance, List,
Property, Trait, Tuple)
from traitsui.api import Group, View

# Local imports.
Expand Down
18 changes: 9 additions & 9 deletions examples/kiva/agg/polygon_hit_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import numpy

from kiva import agg
from kiva.api import points_in_polygon

poly = numpy.array((( 0.0, 0.0),
(10.0, 0.0),
(10.0, 10.0),
( 0.0, 10.0)))

print(agg.point_in_polygon(-1,-1,poly))
print(agg.point_in_polygon(0.0,0.0,poly))
print(agg.point_in_polygon(5,5,poly))
print(agg.point_in_polygon(10,10,poly))
print(agg.point_in_polygon(15,15,poly))
print(point_in_polygon(-1,-1,poly))
print(point_in_polygon(0.0,0.0,poly))
print(point_in_polygon(5,5,poly))
print(point_in_polygon(10,10,poly))
print(point_in_polygon(15,15,poly))

pts = numpy.array(((-1.0, -1.0),
( 0.1, 0.0),
Expand All @@ -21,15 +21,15 @@
( 10.0, 10.0),
( 15.0, 15.0)))

results = agg.points_in_polygon(pts, poly)
results = points_in_polygon(pts, poly)

print(results)

pts = numpy.random.random_sample((20000, 2))*12.5-2.5

import time
t1 = time.clock()
results = agg.points_in_polygon(pts, poly)
results = points_in_polygon(pts, poly)
t2 = time.clock()
print('points_in_polygon() for %d pts in %d point polygon (sec): %f' % \
(len(pts), len(poly), t2-t1))
Expand All @@ -51,7 +51,7 @@
( 0.0, 10.0)))

t1 = time.clock()
results = agg.points_in_polygon(pts, poly)
results = points_in_polygon(pts, poly)
t2 = time.clock()
print('points_in_polygon() for %d pts in %d point polygon (sec): %f' % \
(len(pts), len(poly), t2-t1))
Expand Down
Loading