songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Workaround for boost::container::deque; 1 bug fix

This commit is contained in:
Andreas Fabri 2015-01-09 10:22:53 +01:00
parent d3fb97b74b
commit 5adf8e388c
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Installation/changes.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!-- $Id$ <!-- $Id$
$URL$ $URL$
--> -->
@ -146,7 +146,9 @@ and <code>src/</code> directories).
caused the kd-tree to get linear. caused the kd-tree to get linear.
</li> </li>
<li> <li>
Improved performance of <code>orthogonal_k_neighbor_search</code>. Improved performance of <code>Orthogonal_k_neighbor_search</code>.
Note that VC 2013 does not compile boost::container::deque of Boost 1_55
and does hence have a workaround which does not have the improvement.
</li> </li>
<li> <li>
<b>Breaking change:</b> The concept <code>OrthogonalDistance</code> has <b>Breaking change:</b> The concept <code>OrthogonalDistance</code> has

8
Spatial_searching/include/CGAL/Kd_tree.h
View File

@ -76,8 +76,16 @@ public:
private: private:
SearchTraits traits_; SearchTraits traits_;
Splitter split; Splitter split;
// wokaround for https://svn.boost.org/trac/boost/ticket/9332
#if (_MSC_VER == 1800) && (BOOST_VERSION == 105500)
std::deque<Internal_node> internal_nodes;
std::deque<Leaf_node> leaf_nodes;
#else
boost::container::deque<Internal_node> internal_nodes; boost::container::deque<Internal_node> internal_nodes;
boost::container::deque<Leaf_node> leaf_nodes; boost::container::deque<Leaf_node> leaf_nodes;
#endif
Node_handle tree_root; Node_handle tree_root;

15
Spatial_searching/include/CGAL/Orthogonal_incremental_neighbor_search.h
View File

@ -162,10 +162,9 @@ namespace CGAL {
if (search_nearest){ if (search_nearest){
distance_to_root= distance_to_root=
Orthogonal_distance_instance.min_distance_to_rectangle(q, Orthogonal_distance_instance.min_distance_to_rectangle(q, tree.bounding_box(),dists);
tree.bounding_box(),dists);
Node_with_distance *The_Root = new Node_with_distance(tree.root(), Node_with_distance *The_Root = new Node_with_distance(tree.root(),
distance_to_root,dists); distance_to_root, dists);
PriorityQueue.push(The_Root); PriorityQueue.push(The_Root);
// rd is the distance of the top of the priority queue to q // rd is the distance of the top of the priority queue to q
@ -177,7 +176,7 @@ namespace CGAL {
Orthogonal_distance_instance.max_distance_to_rectangle(q, Orthogonal_distance_instance.max_distance_to_rectangle(q,
tree.bounding_box()); tree.bounding_box());
Node_with_distance *The_Root = new Node_with_distance(tree.root(), Node_with_distance *The_Root = new Node_with_distance(tree.root(),
distance_to_root,dists); distance_to_root, dists);
PriorityQueue.push(The_Root); PriorityQueue.push(The_Root);
// rd is the distance of the top of the priority queue to q // rd is the distance of the top of the priority queue to q
@ -293,7 +292,7 @@ namespace CGAL {
CGAL_assertion(new_rd >= copy_rd); CGAL_assertion(new_rd >= copy_rd);
dists[new_cut_dim] = diff1; dists[new_cut_dim] = diff1;
Node_with_distance *Upper_Child = Node_with_distance *Upper_Child =
new Node_with_distance(node->upper(), new_rd,dists); new Node_with_distance(node->upper(), new_rd, dists);
PriorityQueue.push(Upper_Child); PriorityQueue.push(Upper_Child);
dists[new_cut_dim] = dst; dists[new_cut_dim] = dst;
N=node->lower(); N=node->lower();
@ -304,7 +303,7 @@ namespace CGAL {
CGAL_assertion(new_rd >= copy_rd); CGAL_assertion(new_rd >= copy_rd);
dists[new_cut_dim] = diff2; dists[new_cut_dim] = diff2;
Node_with_distance *Lower_Child = Node_with_distance *Lower_Child =
new Node_with_distance(node->lower(), new_rd,dists); new Node_with_distance(node->lower(), new_rd, dists);
PriorityQueue.push(Lower_Child); PriorityQueue.push(Lower_Child);
dists[new_cut_dim] = dst; dists[new_cut_dim] = dst;
N=node->upper(); N=node->upper();
@ -378,7 +377,7 @@ namespace CGAL {
CGAL_assertion(new_rd >= copy_rd); CGAL_assertion(new_rd >= copy_rd);
Node_with_distance *Lower_Child = Node_with_distance *Lower_Child =
new Node_with_distance(node->lower(), copy_rd,dists); new Node_with_distance(node->lower(), copy_rd, dists);
PriorityQueue.push(Lower_Child); PriorityQueue.push(Lower_Child);
N=node->upper(); N=node->upper();
dists[new_cut_dim] = diff1; dists[new_cut_dim] = diff1;
@ -389,7 +388,7 @@ namespace CGAL {
new_rd=Orthogonal_distance_instance.new_distance(copy_rd,dst,diff2,new_cut_dim); new_rd=Orthogonal_distance_instance.new_distance(copy_rd,dst,diff2,new_cut_dim);
CGAL_assertion(new_rd >= copy_rd); CGAL_assertion(new_rd >= copy_rd);
Node_with_distance *Upper_Child = Node_with_distance *Upper_Child =
new Node_with_distance(node->upper(), copy_rd); new Node_with_distance(node->upper(), copy_rd, dists);
PriorityQueue.push(Upper_Child); PriorityQueue.push(Upper_Child);
N=node->lower(); N=node->lower();
dists[new_cut_dim] = diff2; dists[new_cut_dim] = diff2;