boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-01 20:42:10 +00:00
Code Issues Projects Releases Wiki Activity

[traverse] move counting open spaces to sort_by_side structure

Browse Source
This commit is contained in:
Barend Gehrels
2016-04-27 14:18:47 +02:00
parent 9ed3809b58
commit 258183d7aa
2 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
include/boost/geometry/algorithms/detail/overlay/sort_by_side.hpp
View File

@@ -330,6 +330,35 @@ struct side_sorter
}
}
//! Check how many open spaces there are
template <typename Turns>
std::size_t open_count(Turns const& turns) const
{
typedef typename boost::range_value<Turns>::type turn_type;
typedef typename turn_type::turn_operation_type turn_operation_type;
std::size_t result = 0;
std::size_t last_rank = 0;
for (std::size_t i = 0; i < m_ranked_points.size(); i++)
{
rp const& ranked_point = m_ranked_points[i];
if (ranked_point.main_rank > last_rank
&& ranked_point.index == sort_by_side::index_to)
{
turn_type const& ranked_turn = turns[ranked_point.turn_index];
turn_operation_type const& ranked_op = ranked_turn.operations[ranked_point.op_index];
if (ranked_op.enriched.count_left == 0
&& ranked_op.enriched.count_right > 0)
{
result++;
last_rank = ranked_point.main_rank;
}
}
}
return result;
}
//protected :
typedef std::vector<rp> container_type;

24
include/boost/geometry/algorithms/detail/overlay/traversal.hpp
View File

@@ -493,30 +493,10 @@ struct traversal
sbs.apply(turn.point);
int open_count = 0;
std::size_t open_count = 0;
if (is_union) // && ! cinfo.switch_source)
{
// Check how many open spaces there are.
// TODO: might be moved to sbs itself, though it also uses turns
std::size_t last_rank = 0;
for (std::size_t i = 0; i < sbs.m_ranked_points.size(); i++)
{
typename sbs_type::rp const& ranked_point = sbs.m_ranked_points[i];
if (ranked_point.main_rank > last_rank
&& ranked_point.index == sort_by_side::index_to)
{
turn_type const& ranked_turn = m_turns[ranked_point.turn_index];
turn_operation_type const& ranked_op = ranked_turn.operations[ranked_point.op_index];
if (ranked_op.enriched.count_left == 0
&& ranked_op.enriched.count_right > 0)
{
open_count++;
last_rank = ranked_point.main_rank;
}
}
}
open_count = sbs.open_count(m_turns);
}
is_touching = open_count > 1;