songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
113,832 Commits 3 Branches 156 Tags 959 MiB
Commit Graph

284 Commits

Author SHA1 Message Date
JacksonCampolattaro 759905b136 Merge remote-tracking branch 'origin/orthtree-generalization' into orthtree-generalization 2023-09-16 10:26:35 +02:00
JacksonCampolattaro 4681f17ca8 Fix a small issue with the Octree definition 2023-09-16 10:24:24 +02:00
Sébastien Loriot 33dce33e0b fix some doc issues 2023-09-14 09:58:04 +02:00
Sébastien Loriot da33014535 Merge remote-tracking branch 'cgal/master' 2023-09-14 09:07:00 +02:00
JacksonCampolattaro c4e6ad77f7 Update documentation for Orthtree member functions. 2023-09-13 09:19:33 +02:00
JacksonCampolattaro ed32969908 Prefer `using` over `typedef` universally, for consistency 2023-09-08 12:42:20 +02:00
JacksonCampolattaro 3e20800b7f Update documentation for Traits concepts 2023-09-08 12:13:27 +02:00
JacksonCampolattaro ea59877c19 Automatically determine the correct typedefs for an ambient dimension using template specializations & SFINAE 2023-09-07 17:19:04 +02:00
JacksonCampolattaro 750ca578a8 Combine 2d, 3d, and d-d points traits into one template 2023-09-07 13:25:35 +02:00
JacksonCampolattaro 32c6d61f27 Eliminate Array and Construct_point_d_from_array 2023-09-07 11:44:14 +02:00
JacksonCampolattaro bf5bbcc0f1 Add `construct_point_d_object` to traits classes 
Not yet documented by the OrthtreeTraits concept. Will replace construct_point_d_from_array.
 2023-09-06 14:23:47 +02:00
JacksonCampolattaro 039b693b61 Add support for trees with non-cubic bounding boxes 
High-order orthtrees break, because Epick_d::Point is somehow defined as an array
 2023-09-02 17:37:34 +02:00
JacksonCampolattaro fd34fb5302 `root_node_contents` now produces a Bbox directly 
Some tests fail due to non-cubic bounding boxes
 2023-09-02 16:49:32 +02:00
JacksonCampolattaro 51aae3a6a8 Bbox construction functor is no longer necessary; Bbox_d type must be constructible from a pair of points 2023-09-02 15:19:07 +02:00
JacksonCampolattaro 99a2d5612f Replace bbox with Iso_rectangle/_cuboid/_box 2023-09-02 15:09:16 +02:00
JacksonCampolattaro 1566750766 Switch license to GPL 2023-09-01 17:45:09 +02:00
JacksonCampolattaro d0fa6ed68b Add missing license header 2023-09-01 17:19:29 +02:00
JacksonCampolattaro 40b2c0dff0 Convert nearest neighbor methods to free functions 2023-09-01 17:16:54 +02:00
JacksonCampolattaro e9ca3cc561 Update face graph traits to use functors 2023-09-01 16:43:26 +02:00
Sébastien Loriot 40a08f1416 add missing license include 2023-09-01 14:52:26 +02:00
JacksonCampolattaro 77f240b1b6 Delete Orthtree::Node class, now used nowhere 2023-08-31 12:48:52 +02:00
JacksonCampolattaro 2d8f7d483d Rename Properties.h for clarity 2023-08-30 15:32:38 +02:00
JacksonCampolattaro 07c671e6e9 Convert methods to functor objects for consistency (proof-of-concept) 2023-08-29 19:13:11 +02:00
JacksonCampolattaro b950c6c494 Add base traits classes with common typedefs for convenience 2023-07-27 13:52:10 +02:00
JacksonCampolattaro 6f31cbddd6 Point traits now share the generic reassign_points method 2023-07-27 10:13:49 +02:00
JacksonCampolattaro 8fe57f5adf Rename traverse_indices to traverse (now that it's the only traversal function) 2023-07-27 09:49:20 +02:00
JacksonCampolattaro 5bc0962b81 Eliminate non-index versions of split predicates & traversals 2023-07-26 14:13:00 +02:00
JacksonCampolattaro 4998f7bc57 Adapt remaining examples to use the generalized orthtree 2023-07-26 13:48:36 +02:00
JacksonCampolattaro 61a29f0fdb Fix an issue where side-per-depth wasn't updated when a node was manually split 2023-07-26 09:57:44 +02:00
JacksonCampolattaro cfdb167e35 Fix a couple of small issues which came up during LCC conversion 2023-07-18 10:35:48 +02:00
JacksonCampolattaro dccda38424 Reference type of traversal iterator is a Node_index (and not a reference to one) 
This resolves the issue with segfaults during traversal. In some circumstances, the index would go out of scope before being used for access.
 2023-07-09 17:51:50 +02:00
JacksonCampolattaro 03cda70191 Replace boost::optional with std::optional 2023-07-09 17:49:12 +02:00
albert-github 301728a8a9 issue #7395 Improvement of layout of model relations 
- Completed the cgalModels part
 2023-07-09 12:43:36 +02:00
Sébastien Loriot 02e10bf85a add TODO 2023-07-06 09:24:44 +02:00
Sébastien Loriot 4e1dabe0c0 version version of traits for triangle meshes 
example currently segfault, to be debugged...
 2023-07-03 17:16:10 +02:00
JacksonCampolattaro dc18e1b1db Replace `tree.points(node)` with `tree.data(node)` 2023-06-27 14:58:13 +02:00
JacksonCampolattaro 22e76aac65 Adapt 2D & dD traits for the new system 
There's a lot of duplicated code in the traits classes, at the very least `reassign_points` should be shared.
 2023-06-26 18:07:17 +02:00
JacksonCampolattaro b08eabae93 Move point-specific functionality to traits class 
(only Point_3 is currently supported)
 2023-06-26 16:59:02 +02:00
JacksonCampolattaro c41faf1274 Delete independent `Node` type, move relevant typedefs to Orthtree.h 2023-06-25 13:54:19 +02:00
JacksonCampolattaro 01aad4af7a Add a minimal test of custom node properties 2023-06-25 12:42:24 +02:00
JacksonCampolattaro 774aa1f324 Add node-access convenience functions, and simplify tests 2023-06-22 15:24:39 +02:00
JacksonCampolattaro bfe584590e Orthtree no longer instantiates Node types 2023-06-22 14:44:38 +02:00
JacksonCampolattaro 08b418bda2 Ensure properties of a moved-from tree are also moved-from 2023-06-22 14:11:30 +02:00
JacksonCampolattaro ed9266e70f Add parallel node system using properties 
bug: moved-from is not reset
 2023-06-22 10:23:29 +02:00
JacksonCampolattaro d1ac73d087 Use index-based access for split predicates 2023-06-21 17:34:26 +02:00
JacksonCampolattaro b09e4d0fa6 Add a property container with all aspects of the nodes (currently unused) 2023-06-21 16:39:17 +02:00
JacksonCampolattaro 9a52cf7026 Add a "Maybe" type hiding the boost::optional implementation detail 2023-04-25 16:07:00 +02:00
JacksonCampolattaro f2467dea77 Remove unused Node methods 2023-04-25 16:00:24 +02:00
JacksonCampolattaro 53b3278d3f root() now returns an index, like parent() and child() 2023-04-25 15:21:02 +02:00
JacksonCampolattaro e7f236678e Replace children() helper with individual child() access 2023-04-25 13:48:21 +02:00
JacksonCampolattaro 33358ae838 Only access node properties through helpers 
This will make later refactoring to use property maps much simpler
 2023-04-25 12:15:46 +02:00
JacksonCampolattaro 0707300f99 reassign_points() implemented in terms of indices 2023-04-25 11:32:11 +02:00
JacksonCampolattaro 43b7543d3b nearest_k_neighbors() implemented in terms of indices 2023-04-25 11:24:56 +02:00
JacksonCampolattaro 8712032193 adjacent_node() implemented in terms of indices 2023-04-25 11:11:53 +02:00
JacksonCampolattaro d761f6ebc0 adjacent_node() now returns an optional index 2023-04-25 10:57:56 +02:00
JacksonCampolattaro 825abd1727 Locate now returns a node index 2023-04-24 14:01:01 +02:00
JacksonCampolattaro 782561598e Intersection writes indices to the output iterator 2023-04-24 13:49:13 +02:00
JacksonCampolattaro b267403b95 Recursive intersection now uses indices 2023-04-24 13:38:05 +02:00
JacksonCampolattaro c0a8bbf2c9 Topology equality is done by index 2023-04-20 11:57:35 +02:00
JacksonCampolattaro b9ed5a4221 Relative node access is now done only by index 2023-04-19 19:11:59 +02:00
JacksonCampolattaro b4f04645f1 Level traversal is done by index, has a new unit test 2023-04-19 18:44:30 +02:00
JacksonCampolattaro 62fa9db7a6 Preorder traversal is now implemented in terms of indices 2023-04-19 10:42:48 +02:00
JacksonCampolattaro 07968655f6 Add support for traversal by index 2023-04-18 14:45:00 +02:00
JacksonCampolattaro 8c12fd3bc7 Implement desired behavior for repeated refinement 2023-04-12 12:10:53 +02:00
JacksonCampolattaro 4e3fc7edf6 Add shims for using functions with indices 2023-04-12 11:17:57 +02:00
JacksonCampolattaro 9103affe72 Splitting is done by index (internally) 
Pre-allocating nodes is no longer necessary, since refine() isn't broken by pointer invalidation
 2023-04-11 17:52:52 +02:00
JacksonCampolattaro a5a92ad795 Traversal is now done by index (internally) 2023-04-11 12:17:32 +02:00
JacksonCampolattaro 1a1ca5cf28 Node access is now done solely by index 
Nodes no longer hold references to their parents and children
 2023-03-31 15:58:42 +02:00
JacksonCampolattaro 14726a1e41 Add functions to get node indices & retrieve nodes by index 2023-03-29 22:46:52 +02:00
JacksonCampolattaro 6dec072b00 Node parent access is now done through the tree 2023-03-29 16:38:45 +02:00
JacksonCampolattaro 45244da9e1 Node can no longer directly access its children without the tree 
This is necessary for the next step, but makes the API a pain to use. Some sort of `Node_handle` type is definitely worthwhile.
 2023-03-27 18:12:20 +02:00
JacksonCampolattaro 353acb57ed Nodes are allocated in an std::vector, and contain a boost::span of children 
This reference-based approach breaks when the vector re-allocates. This is a stepping-stone to using indices.
 2023-03-27 12:20:57 +02:00
JacksonCampolattaro d8b42fd3f3 Remove subscript operator for direct access to children of root 
This operator will be used for access by node ID in the future, and this functionality was less clear than tree.root[].
 2023-03-26 21:32:55 +02:00
JacksonCampolattaro 035db48542 Nodes can't split, unsplit, or copy themselves. 
This ensures allocating and deallocating nodes is strictly the responsibility of the orthtree object.
 2023-03-26 16:50:06 +02:00
JacksonCampolattaro 4f6d249c1f Eliminate heap allocated `Data *m_data` 
This required changing return types to `Node *` in many cases. All unit tests have been updated to account for the new interface.
 2023-03-23 09:58:20 +01:00
albert-github 01a7852f70 Merge branch 'master' into feature/bug_documentation_spell_20221113 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Synchronize with master
 2022-11-16 13:58:05 +01:00
albert-github eed54a0ae5 spelling corrections 
Some spelling corrections (Directories starting with `O`-`S` , first part),
some backward work
some forward work
 2022-11-15 18:45:39 +01:00
Laurent Rineau c01757bc80 Merge pull request #7028 from afabri/Orthtree-CC-GF 
Orthtree:  Fix memory leak
 2022-11-15 17:01:29 +01:00
albert-github 45478184de spelling corrections 
Some spelling corrections (Directories starting with `E`-` L`),
some backward work
some forward work
 2022-11-15 13:39:40 +01:00
Andreas Fabri 331ea2898a Orthtree: Fix memory leak 2022-11-09 08:47:54 +00:00
Andreas Fabri d1eca8310f typo 2022-11-09 08:47:37 +00:00
Andreas Fabri efddc4ae84 Orthtree: Fix in test code 2022-06-30 15:57:21 +01:00
Andreas Fabri 2b836ab7ab no need for int D 2022-06-21 17:11:28 +01:00
Andreas Fabri 9a633432ba change order of parameters 2022-06-21 17:05:35 +01:00
Andreas Fabri 329f52175a Orthtree: Fix memory leak in test code 2022-06-21 16:54:27 +01:00
Andreas Fabri 191e99adc8 Fix Orthtree 2022-05-17 10:41:26 +01:00
Simon Giraudot 8f8679e038 Fix uninitialized pointer 2021-04-13 09:42:15 +02:00
Simon Giraudot 24aa93dcaf Use raw pointers instead of shared pointers (and let Orthtree manage memory) 2021-04-07 14:26:50 +02:00
Simon Giraudot 4d761ed9cd More corrections from review 2021-04-01 14:21:01 +02:00
Simon Giraudot 616cd5a549 Apply corrections from review 2021-04-01 08:55:51 +02:00
Simon Giraudot 692c7a6f90 Remove unused parameter 2021-03-23 11:44:50 +01:00
Simon Giraudot 9724bed342 Prevent min/max macro substitution on windows 2021-03-22 08:24:44 +01:00
Simon Giraudot 0da0b71980 Fix missing typename 2021-03-17 15:45:43 +01:00
Simon Giraudot 2fa19c2818 Fix more warnings 2021-03-17 08:12:53 +01:00
Simon Giraudot 701f230f24 Fix warning (unsigned is always >= 0) 2021-03-16 12:14:45 +01:00
Simon Giraudot a14dfc4e96 Fix bbox init for EPECK compatibility 2021-03-16 12:01:27 +01:00
Simon Giraudot 39d3051d9f Fix warnings 2021-03-16 08:54:36 +01:00
Simon Giraudot e1cd919ea4 Fix warnings 2021-03-15 09:36:12 +01:00
Simon Giraudot 349717097f Fix doc warnings 2021-03-11 10:21:07 +01:00
Simon Giraudot ea17a54671 Fix max() Windows error 2021-03-11 08:32:30 +01:00
Simon Giraudot 57af406402 Fix multiple inclusion guard 2021-03-04 15:55:14 +01:00
Simon Giraudot 67c1f3fad1 Add missing includes 2021-03-04 15:12:23 +01:00
Simon Giraudot 0b1d696c97 Add Orthtree.h include so that Node.h compiles 2021-03-04 08:29:24 +01:00
Simon Giraudot e95dea12cd Fix missing include 2021-03-03 15:00:49 +01:00
Simon Giraudot 0f40608714 Make node comparable 2021-02-03 08:26:25 +01:00
Simon Giraudot c15327a901 Add level traversal 2021-02-03 08:26:03 +01:00
Simon Giraudot 5aeb07d654 Minor fixes 2021-02-02 08:27:44 +01:00
Simon Giraudot 8d30b39b73 More fixes from review 2021-02-02 08:17:54 +01:00
Simon Giraudot 1db1829b91 Insist on the points not being copied 2021-01-27 10:36:57 +01:00
Simon Giraudot a0c24379ce Fixes from review 2021-01-27 09:31:55 +01:00
Simon Giraudot 42a3e182a9 Minor fix of template names 2021-01-21 11:12:27 +01:00
Simon Giraudot 1e02106dd1 Improve documentation of traversals / split predicates 2021-01-21 09:54:46 +01:00
Simon Giraudot 224766a605 Fix concept and models 2021-01-21 09:31:58 +01:00
Simon Giraudot 628b973aec Several minor corrections 2021-01-20 14:14:58 +01:00
Simon Giraudot 3254ad9e1e Fix copy/move of Orthtree + add test for these constructors 2021-01-20 11:08:15 +01:00
Simon Giraudot b7057e1785 Make Node a const range and fix encapsulation 2021-01-20 10:14:35 +01:00
Simon Giraudot e8e3cbda72 Improve documentation of operator[] 2021-01-20 09:41:35 +01:00
Simon Giraudot 011eb7e83d Change namespaces and fix doc 2021-01-20 09:22:36 +01:00
Simon Giraudot e91fbd8c3c Fix diagram in doc 2021-01-20 09:14:55 +01:00
Simon Giraudot 4e6932cbe9 Fix filenames 2021-01-19 13:50:35 +01:00
Simon Giraudot 6967f900f1 Change traversal concept name 2021-01-19 13:35:53 +01:00
Simon Giraudot a906b12b3c Fix traversal concept, model and examples 2021-01-19 13:31:41 +01:00
Simon Giraudot d8d47458ca Better brief description of Orthtree 2021-01-19 09:26:10 +01:00
Simon Giraudot 9a77173ab9 Clarify predicate names 2021-01-19 09:17:40 +01:00
Simon Giraudot b39df0e9ee WIP: corrections from review 2021-01-19 08:13:30 +01:00
Simon Giraudot 74b26e1bf2 Fix tests 2020-10-27 13:35:36 +01:00
Simon Giraudot aba3a1e4f2 Cleaning 2020-10-27 10:30:25 +01:00
Simon Giraudot 65ee28d33c Update user manual 2020-10-27 10:18:44 +01:00
Simon Giraudot 0fcb4cb2ef Finish reference manual 2020-10-27 09:04:13 +01:00
Simon Giraudot 0747b09e23 Make node trivially copiable and simplify APIs 2020-10-26 15:56:42 +01:00
Simon Giraudot 398fbb989c WIP: big pass on doc 2020-10-26 13:59:24 +01:00
Simon Giraudot feb8a21e3a WIP: Orthtree/quadtree/octree doc 2020-10-22 15:57:07 +02:00
Simon Giraudot 68e5c3c481 Make Orthtree work in dim>3 2020-10-22 15:01:34 +02:00
Simon Giraudot 066712c881 Use Orthtree everywhere + define Octree/Quadtree aliases 2020-10-22 13:00:34 +02:00