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

Replace Compact_container with boost::container::deque

This commit is contained in:
Andreas Fabri 2021-04-12 09:08:36 +01:00
parent c2a71f23d7
commit 0246431abd
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Nef_3/include/CGAL/Nef_3/K3_tree.h
View File

@ -22,7 +22,7 @@
#include <CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h> #include <CGAL/Nef_3/quotient_coordinates_to_homogeneous_point.h>
#include <CGAL/Lazy_kernel.h> #include <CGAL/Lazy_kernel.h>
#include <CGAL/Cartesian.h> #include <CGAL/Cartesian.h>
#include <CGAL/Compact_container.h> #include <boost/container/deque.hpp>
#ifdef CGAL_NEF3_TRIANGULATE_FACETS #ifdef CGAL_NEF3_TRIANGULATE_FACETS
#include <CGAL/Constrained_triangulation_2.h> #include <CGAL/Constrained_triangulation_2.h>
@ -289,10 +289,10 @@ typedef Smaller_than<
Vertex_handle, Vertex_handle,
int> Smaller_; int> Smaller_;
class Node : public Compact_container_base { class Node {
friend class K3_tree<Traits>; friend class K3_tree<Traits>;
public: public:
typedef typename Compact_container<Node>::iterator Node_handle; typedef Node* Node_handle;
Node( Node_handle p, Node_handle l, Node_handle r, Plane_3 pl, const Object_list& O) : Node( Node_handle p, Node_handle l, Node_handle r, Plane_3 pl, const Object_list& O) :
parent_node(p), left_node(l), right_node(r), splitting_plane(pl), parent_node(p), left_node(l), right_node(r), splitting_plane(pl),
@ -468,9 +468,8 @@ private:
Object_list object_list; Object_list object_list;
}; };
typedef Compact_container<Node> Node_range; typedef boost::container::deque<Node> Node_range;
typedef typename Node_range::iterator Node_iterator; typedef Node* Node_handle;
typedef Node_iterator Node_handle;
public: public:
@ -529,7 +528,7 @@ public:
Self& operator++() { Self& operator++() {
if( S.empty()) if( S.empty())
node = Node_handle(); // end of the iterator node = nullptr; // end of the iterator
else { else {
while( !S.empty()) { while( !S.empty()) {
Node_handle n = S.front().first; Node_handle n = S.front().first;
@ -777,7 +776,7 @@ private:
Node_handle root; Node_handle root;
Compact_container<Node> nodes; boost::container::deque<Node> nodes;
int max_depth; int max_depth;
Bounding_box_3 bounding_box; Bounding_box_3 bounding_box;
@ -996,7 +995,7 @@ typename Object_list::difference_type n_vertices = std::distance(objects.begin()
void transform(const Aff_transformation_3& t) { void transform(const Aff_transformation_3& t) {
// TODO: Bounding box must be updated/transformed, too // TODO: Bounding box must be updated/transformed, too
if(root != 0) if(root != nullptr)
root->transform(t); root->transform(t);
BBox_updater bbup; BBox_updater bbup;
@ -1138,7 +1137,8 @@ Node_handle build_kdtree(Object_list& O, Object_iterator v_end,
CGAL_NEF_TRACEN( "build_kdtree: "<<dump_object_list(O,1)); CGAL_NEF_TRACEN( "build_kdtree: "<<dump_object_list(O,1));
if( !can_set_be_divided(O.begin(), v_end, depth)) { if( !can_set_be_divided(O.begin(), v_end, depth)) {
CGAL_NEF_TRACEN("build_kdtree: set cannot be divided"); CGAL_NEF_TRACEN("build_kdtree: set cannot be divided");
return nodes.insert(Node( parent, Node_handle(), Node_handle(), Plane_3(), O)); nodes.push_back(Node( parent, nullptr, nullptr, Plane_3(), O));
return &(nodes.back());
} }
Object_iterator median; Object_iterator median;
Plane_3 partition_plane = construct_splitting_plane(O.begin(), v_end, median, depth); Plane_3 partition_plane = construct_splitting_plane(O.begin(), v_end, median, depth);
@ -1180,7 +1180,8 @@ Node_handle build_kdtree(Object_list& O, Object_iterator v_end,
if( !splitted) { if( !splitted) {
CGAL_NEF_TRACEN("build_kdtree: splitting plane not found"); CGAL_NEF_TRACEN("build_kdtree: splitting plane not found");
// if(depth > max_depth) // if(depth > max_depth)
return nodes.insert(Node( parent, Node_handle(), Node_handle(), Plane_3(), O)); nodes.push_back(Node( parent, nullptr, nullptr, Plane_3(), O));
return &(nodes.back());
} else { } else {
CGAL_NEF_TRACEN("Sizes " << O1.size() << ", " << O2.size() << ", " << O.size()); CGAL_NEF_TRACEN("Sizes " << O1.size() << ", " << O2.size() << ", " << O.size());
CGAL_assertion( O1.size() <= O.size() && O2.size() <= O.size()); CGAL_assertion( O1.size() <= O.size() && O2.size() <= O.size());
@ -1193,9 +1194,11 @@ Node_handle build_kdtree(Object_list& O, Object_iterator v_end,
non_efective_splits = 0; non_efective_splits = 0;
if( non_efective_splits > 2) { if( non_efective_splits > 2) {
CGAL_NEF_TRACEN("build_kdtree: non efective splits reached maximum"); CGAL_NEF_TRACEN("build_kdtree: non efective splits reached maximum");
return nodes.insert(Node( parent, Node_handle(), Node_handle(), Plane_3(), O)); nodes.push_back(Node( parent, nullptr, nullptr, Plane_3(), O));
return &(nodes.back());
} }
Node_handle node = nodes.insert(Node( parent, Node_handle(), Node_handle(), partition_plane, Object_list())); nodes.push_back(Node( parent, nullptr, nullptr, partition_plane, Object_list()));
Node_handle node = &(nodes.back());
node->left_node = build_kdtree( O1, O1.begin()+v_end1, depth + 1, node, non_efective_splits); node->left_node = build_kdtree( O1, O1.begin()+v_end1, depth + 1, node, non_efective_splits);
node->right_node = build_kdtree( O2, O2.begin()+v_end2, depth + 1, node, non_efective_splits); node->right_node = build_kdtree( O2, O2.begin()+v_end2, depth + 1, node, non_efective_splits);
return node; return node;