Skip to content

Prf maybe #6446

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

Closed
wants to merge 2 commits into from
Closed

Prf maybe #6446

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf09633
PRF: rearrange data
tacaswell May 19, 2016
da764a7
PRF: only check finiteness once
tacaswell May 19, 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
52 changes: 33 additions & 19 deletions src/_path.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct XY
// Input 2D polygon _pgon_ with _numverts_ number of vertices and test point
// _point_, returns 1 if inside, 0 if outside.
template <class PathIterator, class PointArray, class ResultArray>
void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &inside_flag)
void point_in_path_impl(const PointArray &points, PathIterator &path, ResultArray &inside_flag)
{
bool yflag1;
double vtx0, vty0, vtx1, vty1;
Expand All @@ -89,14 +89,30 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins

size_t n = points.size();

std::vector<double> _x(n);
std::vector<double> _y(n);

std::vector<bool> yflag0(n);
std::vector<bool> subpath_flag(n);
std::vector<bool> both_finite(n);


path.rewind(0);

for (i = 0; i < n; ++i) {
inside_flag[i] = false;
}
for (i = 0; i < n; ++i) {
tx = points[i][0];
ty = points[i][1];

_x[i] = tx;
_y[i] = ty;

both_finite[i] = (std::isfinite(tx) && std::isfinite(ty));

}


unsigned code = 0;
do {
Expand All @@ -112,14 +128,13 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins
sy = vty0 = vty1 = y;

for (i = 0; i < n; ++i) {
ty = points[i][1];

if (std::isfinite(ty)) {
// get test bit for above/below X axis
yflag0[i] = (vty0 >= ty);
if (! both_finite[i]){
continue;
}
// get test bit for above/below X axis
yflag0[i] = (vty0 >= ty);
subpath_flag[i] = false;

subpath_flag[i] = false;
}
}

do {
Expand All @@ -135,12 +150,12 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins
}

for (i = 0; i < n; ++i) {
tx = points[i][0];
ty = points[i][1];
if (! both_finite[i]){
continue;
}
tx = _x[i];
ty = _y[i];

if (!(std::isfinite(tx) && std::isfinite(ty))) {
continue;
}

yflag1 = (vty1 >= ty);
// Check if endpoints straddle (are on opposite sides) of
Expand Down Expand Up @@ -183,12 +198,11 @@ void point_in_path_impl(PointArray &points, PathIterator &path, ResultArray &ins

all_done = true;
for (i = 0; i < n; ++i) {
tx = points[i][0];
ty = points[i][1];

if (!(std::isfinite(tx) && std::isfinite(ty))) {
continue;
}
if (!both_finite[i]){
continue;
}
tx = _x[i];
ty = _y[i];

yflag1 = (vty1 >= ty);
if (yflag0[i] != yflag1) {
Expand Down