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

311 Commits

Author SHA1 Message Date
Jackson Campolattaro 7f57f18a55 Force random seed for deterministic testing 2020-08-07 16:06:03 -04:00
Jackson Campolattaro 275feb0d3f Refactor check for enough samples 2020-08-07 11:03:23 -04:00
Jackson Campolattaro 6084084f3a Add more printouts to sample drawing 2020-08-07 10:47:25 -04:00
Jackson Campolattaro 1d19bca766 Remove printouts from refine() 2020-08-06 17:00:54 -04:00
Jackson Campolattaro 6905a65127 Add logic changing max level based on cluster epsilon 2020-08-06 16:05:10 -04:00
Jackson Campolattaro aa7b8114cf Implement node_containing_point using older version's logic 2020-08-06 15:07:03 -04:00
Jackson Campolattaro ba79b9ecc6 Refactor logic confirming the node was found 2020-08-06 14:56:17 -04:00
Jackson Campolattaro 8747114f72 Add printout whether the relevant node was found 2020-08-06 14:37:18 -04:00
Jackson Campolattaro 7337443b6f Include IO.h for printing octree nodes 2020-08-06 14:31:29 -04:00
Jackson Campolattaro 528918cf4f Reduce printouts to most relevant information 2020-08-06 14:22:54 -04:00
Jackson Campolattaro 6a36493744 Add printouts for loop information 2020-08-06 11:43:56 -04:00
Jackson Campolattaro 7a9d06d50e Add printouts for relevant functions 2020-08-06 10:50:00 -04:00
Jackson Campolattaro b0e703b9d1 Add printouts for detecting and preprocessing 2020-08-06 10:42:08 -04:00
Jackson Campolattaro 976af7e816 Add printouts when building and deleting Efficient_RANSAC 2020-08-06 10:38:03 -04:00
Jackson Campolattaro 718ce05be4 Rename boundingBox to bbox 2020-08-05 13:49:18 -04:00
Jackson Campolattaro 310481b456 Don't return bounding box by reference 2020-08-05 12:05:40 -04:00
Jackson Campolattaro 5e1c087b0f Make Direct_octree more similar to Indexed_octree 2020-08-05 10:49:49 -04:00
Jackson Campolattaro f01061858a Rename createTree to refine 2020-08-05 09:48:51 -04:00
Simon Giraudot 93b3f18275 Use indexed property map for Indexed octree 2020-08-05 11:23:48 +02:00
Jackson Campolattaro d02e2bef1f Update width to avoid access to private octree members 2020-08-04 22:59:06 -04:00
Jackson Campolattaro d7421812ba Add root accessor 2020-08-04 22:50:22 -04:00
Jackson Campolattaro 15e09e7940 Typedef Input_range as vector of ints 2020-08-04 22:48:58 -04:00
Jackson Campolattaro 94538c8686 Switch from is-a to has-a relationship with CGAL::Octree 2020-08-04 17:23:15 -04:00
Jackson Campolattaro bb23d27217 Replace Index() with dereference 2020-08-04 16:24:05 -04:00
Jackson Campolattaro 1e06093411 Add width accessor 2020-08-04 16:20:45 -04:00
Jackson Campolattaro 154a436537 Typedef Cell as Node 2020-08-04 16:17:16 -04:00
Jackson Campolattaro 3cb182548e Replace call to Index with dereferencing iterator 2020-08-04 16:16:45 -04:00
Jackson Campolattaro c3ca8f0bbf Add index map to both octrees 2020-08-04 15:13:27 -04:00
Jackson Campolattaro bc5832d861 Octrees use vectors of sizes rather than Input_range as Point_range 2020-08-04 15:09:57 -04:00
Jackson Campolattaro 83f416e50c Use for each loop over point indices contained by a node 2020-08-04 15:01:13 -04:00
Jackson Campolattaro 739bf9874e Replace code block with method for finding the leaf containing a point 2020-08-04 14:56:29 -04:00
Jackson Campolattaro 73ddea7fc1 Use octree to find barycenter positions 2020-08-04 14:52:08 -04:00
Jackson Campolattaro d96a4fd9a2 Typedef Cell as Node 2020-08-04 14:47:55 -04:00
Jackson Campolattaro e54f753312 Add Indexed_octree constructor 2020-08-04 14:47:11 -04:00
Jackson Campolattaro cdb25b8712 Add createTree function 2020-08-04 14:41:03 -04:00
Jackson Campolattaro 392fb5f30c Add Direct_octree constructor 2020-08-04 14:39:00 -04:00
Jackson Campolattaro 19b0c80b4c Add offset accessor 2020-08-04 14:20:46 -04:00
Jackson Campolattaro ef943b6d3b Add boundingBox method 2020-08-04 14:15:34 -04:00
Jackson Campolattaro 5afb9cf6aa Add size method 2020-08-04 14:13:34 -04:00
Jackson Campolattaro e2d1fdb4b6 Make both octrees extend the new octree 2020-08-04 14:07:23 -04:00
Jackson Campolattaro 6b4785a87d Remove Octree declaration and typedef from Shape_base 2020-08-04 14:05:31 -04:00
Jackson Campolattaro 5f641c4594 Add new octree class declarations 2020-08-04 14:02:06 -04:00
Jackson Campolattaro b7a4f50ac3 Remove all RANSAC octree code 2020-08-04 14:01:45 -04:00
Jackson Campolattaro 1f53a46e0f Mark code using Cell in ways incompatible with Node 2020-08-04 12:36:12 -04:00
Maxime Gimeno 9c15f2c9dc Use FeatureSummary in the demo, and remove CGAL_FOUND 2020-08-04 12:46:17 +02:00
Jackson Campolattaro 9405fd18be Make Cell center private, add barycenter accessor 2020-08-03 13:53:22 -04:00
Jackson Campolattaro baf7327021 Make Cell level private, add depth accessor 2020-08-03 13:45:29 -04:00
Jackson Campolattaro 5561dcb24f Rename isLeaf to is_leaf 2020-08-03 13:40:59 -04:00
Jackson Campolattaro cef9fad58c Move Cell class definition outside octrees 2020-08-03 13:36:40 -04:00
Jackson Campolattaro 0270ed6167 Remove beyond from Indexed_octree 2020-08-03 11:38:25 -04:00
Jackson Campolattaro d9649db9ff Remove first from Indexed_octree 2020-08-03 11:36:48 -04:00
Jackson Campolattaro 0c1fbe07af Remove beyond from Direct_octree 2020-08-03 11:32:58 -04:00
Jackson Campolattaro 55dd09407c Remove first from Direct_octree 2020-08-03 11:31:16 -04:00
Jackson Campolattaro df38189e63 Remove setData from Indexed_octree 2020-08-03 11:18:23 -04:00
Jackson Campolattaro 86354fa637 Remove setData from DirectOctree 2020-08-03 11:16:07 -04:00
Jackson Campolattaro 9a1581e513 Remove namespace Node 2020-08-03 09:51:58 -04:00
Jackson Campolattaro 74d6aa3014 Incorporate IndexedPointAccessor into Indexed_octree 2020-07-31 16:45:19 -04:00
Jackson Campolattaro 7a733cf44d Incorporate DirectPointAccessor into Direct_octree 2020-07-31 16:30:23 -04:00
Jackson Campolattaro c5d52350c2 Make externalized octree functions take a const pointer 2020-07-30 22:06:30 -04:00
Jackson Campolattaro 13fa41a3d4 Make accessor index() methods const 2020-07-30 22:06:05 -04:00
Jackson Campolattaro 2dd0b0d2e8 Split templated octree into pair of separately implemented versions 2020-07-30 21:32:26 -04:00
Jackson Campolattaro 47d141cb65 Begin implementing DirectOctree constructor 2020-07-30 13:46:55 -04:00
Jackson Campolattaro 066dc037bd Begin defining a DirectOctree class containing a CGAL::Octree 2020-07-30 11:38:14 -04:00
Jackson Campolattaro ed06a8bcb6 Remove extern int scoreTime 2020-07-29 18:41:44 -04:00
Jackson Campolattaro cbb8f6f338 Remove Efficient_RANSAC forward declaration 2020-07-29 18:24:37 -04:00
Jackson Campolattaro bc40cfa763 Move maxLevel argument from constructor to createTree 2020-07-29 18:20:04 -04:00
Jackson Campolattaro 707ba2536b Move bucketSize argument from constructor to createTree 2020-07-29 17:15:48 -04:00
Jackson Campolattaro 700f345b0e Remove normal map from octree 2020-07-29 16:51:40 -04:00
Jackson Campolattaro a81cef079a Make member variables private, with only const access 2020-07-29 14:59:29 -04:00
Jackson Campolattaro 587766f3e3 Add const width accessor 2020-07-29 14:57:45 -04:00
Jackson Campolattaro 32541f0074 Use const accessor everywhere root is used 2020-07-29 14:56:30 -04:00
Jackson Campolattaro eec45bc2b0 Add const root accessor 2020-07-29 14:51:17 -04:00
Jackson Campolattaro db16d02975 Remove drawSamplesFromCellContainingPoint from octree 2020-07-29 14:42:08 -04:00
Jackson Campolattaro 21f28d5134 Add drawSamplesFromCellContainingPoint outside octree 2020-07-29 14:40:31 -04:00
Jackson Campolattaro 161df54f00 Remove transl() 2020-07-29 13:12:31 -04:00
Jackson Campolattaro f515c4ee49 Eliminate use of transl() 2020-07-29 13:10:35 -04:00
Jackson Campolattaro 9a9e5d2e10 Replace translation function with a sum 2020-07-29 13:06:52 -04:00
Jackson Campolattaro 8ee9c468a9 Remove constr_vec() 2020-07-29 13:02:54 -04:00
Jackson Campolattaro 02ec67c2af Remove constr_pt() 2020-07-29 12:37:37 -04:00
Jackson Campolattaro fbc89d08e9 Eliminate use of constr_pt() 2020-07-29 12:36:28 -04:00
Jackson Campolattaro 7fa85e08ca Remove get_coord 2020-07-29 12:13:11 -04:00
Jackson Campolattaro 00c06e3fe5 Remove get_x, get_y, get_z 2020-07-29 12:12:10 -04:00
Jackson Campolattaro a5fe24c966 Eliminate use of get_coord 2020-07-29 12:10:10 -04:00
Jackson Campolattaro 824743df3f Eliminate use of get_x, get_y, get_z 2020-07-29 12:01:05 -04:00
Jackson Campolattaro 67a82563b3 Make split() private 2020-07-29 11:22:36 -04:00
Jackson Campolattaro 7ea5b1bc23 Make buildBoundingCube private 2020-07-29 11:21:03 -04:00
Jackson Campolattaro 6793b50d23 Remove ability to change bucket size after construction 2020-07-29 11:16:38 -04:00
Jackson Campolattaro 76b9ac3d1f Remove Shape typedef 2020-07-29 10:42:08 -04:00
Jackson Campolattaro e0e8aef745 Remove Efficient_RANSAC as friend class of octree 2020-07-29 10:11:47 -04:00
Jackson Campolattaro e410c514f3 Remove Efficient_RANSAC::fullScore() 2020-07-23 11:53:27 -04:00
Jackson Campolattaro 1add423e04 Remove Octree::fullScore(); it was never used! 2020-07-23 11:50:49 -04:00
Jackson Campolattaro d2d45d6ea5 Remove Octree::score() 2020-07-23 11:48:55 -04:00
Jackson Campolattaro 308255be4f Eliminate usage of Octree::score() 2020-07-23 11:46:48 -04:00
Jackson Campolattaro 1ef6ee1cd7 score and fullScore now take octree arg by pointer 2020-07-23 11:42:29 -04:00
Jackson Campolattaro a8abee4456 Define score method outside octree 2020-07-23 11:30:33 -04:00
Jackson Campolattaro 369cb69e08 Make Cell struct public 2020-07-23 11:13:27 -04:00
Jackson Campolattaro 0baee2d8fb Define fullScore method outside octree 2020-07-23 11:09:55 -04:00
Jackson Campolattaro 0e305fc8a9 Reinstate original RANSAC tree code 2020-07-23 10:42:08 -04:00
Jackson Campolattaro 41cc40ab13 Define extension of package Octree 2020-07-22 12:45:55 -04:00
Jackson Campolattaro 013cafd43b Remove RANSAC octree entirely 2020-07-22 12:35:17 -04:00
Jackson Campolattaro 12e82ce60c Add Internal_octree typedef 2020-07-22 12:12:14 -04:00
Jackson Campolattaro a0c3dbe39f Remove all RANSAC octree implementation details 2020-07-22 11:12:02 -04:00
Mael Rouxel-Labbé 26ae0d2b8c Misc compilation fixes 2020-06-23 19:11:55 +02:00
Mael Rouxel-Labbé 24d2ee9c75 Use the new IO functions in Point_set_3 / PSP_3 examples 2020-06-21 15:06:20 +02:00
Mael Rouxel-Labbé 2d49f7d702 Countless IO fixes... 
Don't have the patience to split it nicely
 2020-06-21 12:03:28 +02:00
Maxime Gimeno ea53a8d70d Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-06-17 14:25:21 +02:00
Maxime Gimeno 25c8313859 Replace IO functions in examples and fix Surface_mesh read_OFF() 2020-06-16 14:36:24 +02:00
Laurent Rineau 9b8ecd720b Merge pull request #4636 from sgiraudot/CMake-Third_party_imported_targets-GF 
CMake: Use Imported Targets for 3rd Party Libs
 2020-06-05 17:54:14 +02:00
Andreas Fabri d259d56712
Update PackageDescription.txt 
No need to say that this is CGAL.   And if we really want to keep it we have to use the macro or put a % before to avoid the link being generated.
 2020-05-31 17:59:18 +02:00
Simon Giraudot 89285f1feb Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-05-28 08:53:17 +02:00
Maxime Gimeno 049439fa6b Merge remote-tracking branch 'cgal/master' into CGAL_IO-maxGimeno 2020-04-30 16:47:58 +02:00
Maxime Gimeno 5b2d46cfa0 Fixes for min/max 2020-04-21 12:04:45 +02:00
Maxime Gimeno e9d41d7b7d Fixes for min/max 2020-04-21 11:38:37 +02:00
Simon Giraudot 1dd6a665a1 Merge remote-tracking branch 'mine/CMake-Third_party_imported_targets-GF' into CMake-Third_party_imported_targets-GF 2020-04-20 09:09:32 +02:00
Simon Giraudot 421096fd7f Use imported targets everywhere 2020-04-15 14:06:13 +02:00
Mael Rouxel-Labbé d8789f07c3 Remove tautological preconditions that spawn warnings on some platforms 2020-04-15 09:06:36 +02:00
Mael Rouxel-Labbé 9a8b48c8ea Remove trailing whitespace 2020-04-10 17:13:26 +02:00
Maxime Gimeno 553d3c2f2c Fix new warnings about precondition size_t >=0 2020-04-10 13:03:50 +02:00
Maxime Gimeno abc623d5a8 clean-up 2020-04-01 15:03:43 +02:00
Maxime Gimeno 69a2a23cc6 rename IO functions in point_set packages 2020-04-01 14:33:14 +02:00
Sébastien Loriot fdb17cb3f1 extra run of the script to remove tabs and trailing whitespaces 2020-03-26 19:26:10 +01:00
Sébastien Loriot 38789af55d Update branch from master after trailing whitespaces and tabs removal 2020-03-26 19:25:47 +01:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces 
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
 2020-03-26 14:26:59 +01:00
Sébastien Loriot 8b153fb495 Merge branch 'cgal/releases/CGAL-5.0-branch' 
whitespace+tab removal, merged with option -Xignore-space-change
 2020-03-26 14:22:32 +01:00
Sébastien Loriot 0779373835 extra run of the script to remove tabs and trailing whitespaces 
right after the  merge of 4.14 release branch

+ manual fix on one line in:
    * Arrangement_on_surface_2/include/CGAL/IO/Arr_text_formatter.h
    * .travis/generate_travis.sh
 2020-03-26 14:16:06 +01:00
Sébastien Loriot cc1bd20c7c Merge pull request #4356 from sgiraudot/Documentation-Update_cmake_variables-GF 
Third party libs: improve documentation + introduce new CMake functions
 2020-03-17 18:19:40 +01:00
Sébastien Loriot ef6949419f Merge remote-tracking branch 'cgal/releases/CGAL-5.0-branch' 2020-03-17 18:16:39 +01:00
Dmitry Anisimov 68e3a7b049 updated email address 2020-03-13 12:02:44 +01:00
Dmitry Anisimov 4134b89fd5 doc fix from the PR #4564 2020-03-11 14:44:28 +01:00
Dmitry Anisimov 4ace3cdf96 fixed PRs: #3864; #4563; #4570; added test with the degenerated mesh; fixed docs; cleanup 2020-03-11 14:44:27 +01:00
Thomas Karl Pietrowski afd2eefa78
Shape_detection: Correcting comment in efficient_RANSAC_with_parameters example 
Just because 200 != 500.
 2020-03-01 19:52:35 +01:00
Mael Rouxel-Labbé 8d8dbb1c0b Fix warnings about checking that an unsigned int is positive 2020-02-10 18:17:40 +01:00
Simon Giraudot 6c8fd43ebb Use CGAL_target_use_* mechanism for Eigen, LASLIB, OpenCV, TensorFlow, GLPK, SCIP, Boost IOStreams and Serialization 2020-02-10 11:57:56 +01:00
Laurent Rineau 7ce522d99d Merge pull request #4492 from sgiraudot/PSP-Cleanup_Point_with_normal_3_includes-GF 
Remove undocumented CGAL::Point_with_normal_3 from examples

# Conflicts:
#	Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/plane_regularization.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/shape_detection_with_callback.cpp
#	Shape_detection/examples/Shape_detection/efficient_RANSAC_with_point_access.cpp
#	Shape_detection/examples/Shape_detection/shape_detection_basic_deprecated.cpp
 2020-01-29 16:33:57 +01:00
Laurent Rineau 94051f3f63 Merge pull request #4492 from sgiraudot/PSP-Cleanup_Point_with_normal_3_includes-GF 
Remove undocumented CGAL::Point_with_normal_3 from examples

# Conflicts:
#	Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/reconstruction_structured.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_custom_shape.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/efficient_RANSAC_parameters.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/plane_regularization.cpp
#	Point_set_shape_detection_3/examples/Point_set_shape_detection_3/shape_detection_with_callback.cpp
#	Shape_detection/examples/Shape_detection/efficient_RANSAC_with_point_access.cpp
#	Shape_detection/examples/Shape_detection/shape_detection_basic_deprecated.cpp
 2020-01-29 16:21:31 +01:00
Laurent Rineau 65cde3ce79
Merge branch 'master' into Faster_dd_spatial_searching-cjamin 2019-12-03 19:18:15 +01:00
Laurent Rineau 15d9e1f0ff Restore the alphabetical order of `dependencies` files 2019-10-31 14:41:37 +01:00
Simon Giraudot c43c6ac2fa Merge remote-tracking branch 'clement/Faster_dd_spatial_searching-cjamin' into Faster_dd_spatial_searching-cjamin 2019-10-22 13:21:53 +02:00
Sébastien Loriot 254d60f642 First pass on removing license notice in header for GPL files 2019-10-19 15:23:19 +02:00
Sébastien Loriot 7356421d80 introduce Commercial license SPDX tag 2019-10-19 12:15:19 +02:00
Sébastien Loriot 9bd9c68b83 update LGPL[23]+ and GPL[23]+ SPDX tags 
ack -l --no-svg "SPDX-License-Identifier: GPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-3.0+/SPDX-License-Identifier: GPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-3.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-3.0+/SPDX-License-Identifier: LGPL-3.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: GPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: GPL-2.0+/SPDX-License-Identifier: GPL-2.0-or-later/"
ack -l --no-svg "SPDX-License-Identifier: LGPL-2.0\+" | xargs sed -i "s/SPDX-License-Identifier: LGPL-2.0+/SPDX-License-Identifier: LGPL-2.0-or-later/"
 2019-10-18 21:57:54 +02:00
Lingjie Zhu 5ce268f7d5
minor fix: add const specifier 2019-07-30 10:10:03 +08:00
Simon Giraudot 91dc961b18 Use cache optimisation for KD Tree on indices for classification + shape detection 2019-07-04 13:18:52 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Laurent Rineau be0d07d150 Merge pull request #3979 from afabri/CGAL-null_ptr-GF 
Replace NULL and Nullptr_t with nullptr and nullptr_t
 2019-06-17 14:10:35 +02:00
Dmitry Anisimov feb0bf88d8 cgal max fix 2019-06-12 10:57:20 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Dmitry Anisimov 5a4fa9e98b disabled warnings 2019-05-29 17:08:54 +02:00
Dmitry Anisimov bdc46b293d class name clash fix 2019-05-26 11:44:33 +02:00
Dmitry Anisimov 57cbe098fc added deprecated code for back compatability 2019-05-24 18:57:15 +02:00
Dmitry Anisimov 2fac5f2f13 face index to size_t warning fix 2019-05-21 17:52:00 +02:00
Dmitry Anisimov b2d64c796c time to unsigned int conversion warnings fix 2019-05-20 10:05:48 +02:00
Dmitry Anisimov 76feac2716 more warnings fixed 2019-05-19 14:42:24 +02:00
Dmitry Anisimov 28bdc838b1 surface mesh sd plugin + test fixes 2019-05-15 21:33:27 +02:00
Dmitry Anisimov c82199c012 improved demo + warnings fix 2019-05-13 19:08:07 +02:00
Dmitry Anisimov ec147f2cc8 demo fixes 2019-05-10 11:23:49 +02:00
Dmitry Anisimov a8a9c3bda4 bgl + shape detection dependent tests 2019-04-26 10:19:46 +02:00
Dmitry Anisimov 92d3417012 dependencies + structuring example fixes 2019-04-25 18:30:43 +02:00
Dmitry Anisimov 0ebebab1b8 shape detection dependent packages are fixed 2019-04-25 13:27:41 +02:00
Dmitry Anisimov 019a6a7954 cpp11 and boost foreach fixes 2019-04-24 11:41:05 +02:00
Dmitry Anisimov 44380db707 shape detection with region growing, benchmarks, examples, and tests - version 1.0 2019-04-18 17:34:57 +02:00