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

[intersection] remove the two passes because this is now handled before

Browse Source 
by the traversal_switch_detector
This commit is contained in:
Barend Gehrels
2016-08-31 11:44:32 +02:00
parent 007ef451c2
commit 0ece0dfc75
2 changed files with 5 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/boost/geometry/algorithms/detail/overlay/traversal_ring_creator.hpp
View File

@@ -64,9 +64,7 @@ struct traversal_ring_creator
, m_clusters(clusters)
, m_robust_policy(robust_policy)
, m_visitor(visitor)
, m_has_uu(false)
{
}
template <typename Ring>
@@ -276,49 +274,21 @@ struct traversal_ring_creator
template <typename Rings>
void iterate(Rings& rings, std::size_t& finalized_ring_size,
typename Backtrack::state_type& state,
int pass)
typename Backtrack::state_type& state)
{
if (pass == 1)
{
if (target_operation == operation_intersection)
{
// Second pass currently only used for uu
return;
}
if (! m_has_uu)
{
// There is no uu found in first pass
return;
}
}
// Iterate through all unvisited points
for (std::size_t turn_index = 0; turn_index < m_turns.size(); ++turn_index)
{
turn_type const& start_turn = m_turns[turn_index];
turn_type const& turn = m_turns[turn_index];
if (start_turn.discarded || start_turn.blocked())
if (turn.discarded || turn.blocked())
{
// Skip discarded and blocked turns
continue;
}
if (target_operation == operation_union)
{
if (start_turn.both(operation_union))
{
// Start with a uu-turn only in the second pass
m_has_uu = true;
if (pass == 0)
{
continue;
}
}
}
for (int op_index = 0; op_index < 2; op_index++)
{
traverse_with_operation(start_turn, turn_index, op_index,
traverse_with_operation(turn, turn_index, op_index,
rings, finalized_ring_size, state);
}
}
@@ -333,10 +303,6 @@ private:
Clusters const& m_clusters;
RobustPolicy const& m_robust_policy;
Visitor& m_visitor;
// Next member is only used for operation union
bool m_has_uu;
};
}} // namespace detail::overlay

5
include/boost/geometry/algorithms/detail/overlay/traverse.hpp
View File

@@ -97,10 +97,7 @@ public :
typename Backtrack::state_type state;
for (int pass = 0; pass < 2; pass++)
{
trav.iterate(rings, finalized_ring_size, state, pass);
}
trav.iterate(rings, finalized_ring_size, state);
}
};