Commit Graph

186 Commits

Author SHA1 Message Date
Clement Jamin 04136b980c Improved export to OFF files 2015-05-27 17:54:58 +02:00
Clement Jamin 002748790e Fix perturb (the size of the translation was always m_half_radius) 2015-05-27 17:53:49 +02:00
Clement Jamin 045b463cff export_inconsistent_stars_to_OFF_files 2015-05-27 17:51:16 +02:00
Clement Jamin fb0e11a2aa Fix collapse 2015-05-27 17:47:34 +02:00
Clement Jamin 9b0fca5019 Replaced NUM_POINTS_FOR_PCA by BASE_VALUE_FOR_PCA^intrinsic_dim 2015-05-27 17:46:40 +02:00
Clement Jamin 8fb2b92663 Fix compilation + code clean-up 2015-05-27 17:44:14 +02:00
Mael Rouxel-Labbé 065d355442 Fix compilation issues
(cherry picked from commit 444c982540a1b4301d829556027784d81ffe0f55)

Conflicts:
	Tangential_complex/include/CGAL/Tangential_complex.h
2015-04-30 14:39:08 +02:00
Clement Jamin 3ceb5992b0 fix_inconsistencies => fix_inconsistencies_using_perturbation 2015-04-29 17:55:06 +02:00
Clement Jamin e5407e0142 Solve ambiguity on "i" 2015-04-29 17:39:09 +02:00
Mael Rouxel-Labbé 7ff3c99876 Avoid an unnecessary projection on tangent planes
If the center of the star is the origin of the tangent basis, there is
no need to compute a projection (it'll be the origin, locally)

(cherry picked from commit e04c440477a43498aa79fa10e36f07893bcf572b)
2015-04-29 17:35:46 +02:00
Mael Rouxel-Labbé 9cfc9ea8ea Avoid an unecessary initialization
If external weights aren't set, the memory vector of weights will be
full of 0 and isn't needed.

(cherry picked from commit f6a4ba6169d792bf73a9121a7102d11a53469e24)
2015-04-29 17:35:45 +02:00
Mael Rouxel-Labbé 05500a49e0 Add point weights memory
This is done to prevent consecutive weight perturbations from accumulating

(cherry picked from commit 6f23a80ae682d515b301e0ac6c7f068005e18a64)
2015-04-29 17:35:44 +02:00
Mael Rouxel-Labbé ff00de4e22 Fix const correctness
(cherry picked from commit 6b52e73a677f322bf3a2f17ec9eee7106b44d924)
2015-04-29 17:33:23 +02:00
Mael Rouxel-Labbé 83e01e3a91 Add a tiny comment
(cherry picked from commit 5a3b3edd6a6cbab4f5d56b08474ef8f4b4cbab7b)
2015-04-29 17:32:00 +02:00
Mael Rouxel-Labbé 17739d847d Clean code (trailing whitespace, indentation, etc.)
(cherry picked from commit 75b44442cfbc4ba8b69160b98b8115ceda7d07ef)
2015-04-29 17:31:57 +02:00
Mael Rouxel-Labbé 2997d7464b Adapt TC code to be compatible with the anisotropic mesh algorithms
The main changes are :
-Points always have a weight (defaulted to 0), but we keep using
 Points and Weights vectors rather than Weighted_points to ease
 the interface with ANN queries.
-Tangent spaces know a point through which they go to allow them
 to not necessarily go through their corresponding m_points.
-Tangent spaces and weights can be set externally

(cherry picked from commit ce8c08a03263e9769c76851a9fc5f63f40f9ac97)
2015-04-29 17:24:08 +02:00
Mael Rouxel-Labbé 213cd0071a Additional compilation fixes
(cherry picked from commit 207f119ab0dcd35a203b4da2d66508ccad927d0c)
2015-04-29 17:23:29 +02:00
Mael Rouxel-Labbé b3bd06aa21 Fix trailing whitespace
(cherry picked from commit 502ab45855e9d5c42660be842f8e27cbe94bea3e)
2015-04-29 17:21:15 +02:00
Mael Rouxel-Labbé 5aedcaea15 Fix compilation issues
(cherry picked from commit b02fdcb35398ba5d87ce7ae0523357e3f5d867a2)
2015-04-29 17:19:05 +02:00
Clement Jamin e6cb33d97e Fixed indentation + typo 2015-04-29 16:52:51 +02:00
Clement Jamin bee9976153 Added get_simplices_matching_test() + added checks in add_simplex 2015-04-29 16:51:35 +02:00
Clement Jamin 7fab99906a Allow several colors in export_to_off + const correctness 2015-04-29 12:57:04 +02:00
Clement Jamin 509bff1152 Add is_pure_pseudomanifold__do_not_check_if_stars_are_connected + minor changes 2015-04-29 12:54:22 +02:00
Clement Jamin 1dff5b1d81 First implementation of alpha-TC
+ typos + bug fix in export_to_off
2015-04-16 16:03:44 +02:00
Clement Jamin bddbd463f0 Use indexed point ranges in does_blabla_intersect 2015-04-16 15:59:55 +02:00
Clement Jamin 2fb396cadd Function does_voronoi_face_and_alpha_tangent_subspace_intersect 2015-04-14 20:10:27 +02:00
Clement Jamin d40325bae4 Added the ability to compute the orthogonal space basis 2015-04-13 17:03:05 +02:00
Clement Jamin a9c14b2009 Added normalize_vector 2015-04-13 16:42:23 +02:00
Clement Jamin cbc108171b Updated script and config 2015-03-18 18:05:10 +01:00
Clement Jamin d23a39c740 Added SC::is_pure_manifold 2015-03-18 18:04:50 +01:00
Clement Jamin 672f3ac0c1 Bug fix: go one step further in the recursive call 2015-03-13 17:09:46 +01:00
Clement Jamin 742b9d45e2 Clarify comment 2015-03-13 11:07:26 +01:00
Clement Jamin 20f8711740 Remove useless function call 2015-03-09 14:49:12 +01:00
Clement Jamin 8ad1b81323 Now taking weights into account for the computation of "min_a" 2015-03-04 16:54:23 +01:00
Clement Jamin 16279ad631 Refined margin computation + Use Power_center_d and Power_distance_d 2015-03-04 15:43:22 +01:00
Clement Jamin 7357337195 Added a TODO 2015-03-03 16:41:46 +01:00
Clement Jamin c3a7c29762 Updated script + config file 2015-03-03 16:17:38 +01:00
Clement Jamin 91a52fe65b Improve solve_inconsistency_by_adding_higher_dimensional_simplices
Now, it handles the case where more than one vertices are in the Tq-centered
sphere. Also, fixes a bug with the star-sphere radius.
2015-03-03 16:02:15 +01:00
Clement Jamin 907483a0d0 Remove unused classes 2015-03-03 14:35:14 +01:00
Clement Jamin a08463fd4d check_if_all_simplices_are_in_the_ambient_delaunay takes weights into account 2015-03-03 14:32:19 +01:00
Clement Jamin bdf8a6286b Add TODOs and temporary comments 2015-02-23 17:43:30 +01:00
Clement Jamin 70c4d330c5 More exports in the benchmark 2015-02-20 22:57:27 +01:00
Clement Jamin 9dbdaf42c4 Better export + debug code 2015-02-20 22:56:37 +01:00
Clement Jamin 1e11e67859 Moved code around + updated check_if_all_simplices_are_in_the_ambient_delaunay 2015-02-20 13:49:46 +01:00
Clement Jamin f5c1e2a7e0 First try with complex collapsing 2015-02-18 18:06:07 +01:00
Clement Jamin 5db662c0c2 Fix order of initialization 2015-02-17 10:53:58 +01:00
Clement Jamin c4bf916686 Position perturbation is now parallel
And it's almost 10x faster on 10 cores
2015-02-17 08:37:41 +01:00
Clement Jamin 0029c57ab1 Partially parallelized fix_inconsistencies
Does not work for position perturbation for now.
2015-02-16 18:39:09 +01:00
Clement Jamin e5b56dc504 Added a new way to fix inconsistencies + simpler export_simplices_to_off
Remaining inconsistencies are fixed by adding higher-dim simplices.
Future work: collapse them.
2015-02-12 00:09:55 +01:00
Clement Jamin 7d928b4489 Re-added the ability to perturb the k + 1 + m closest points 2015-02-11 16:17:46 +01:00
Clement Jamin ed7fb72f11 Added "unproject_point" + fixed export_simplices_to_off (multiple dimensions) 2015-02-11 16:13:39 +01:00
Clement Jamin d810bd58ee Update number_of_inconsistent_simplices to use cache "m_stars" 2015-02-11 15:56:43 +01:00
Clement Jamin c73b9c3316 Added the ability to perturb tangent spaces
+ fix Compute_tangent_triangulation constructor
2015-02-10 19:33:07 +01:00
Clement Jamin 039af01fe5 Optimize functions thanks to the cache "m_stars"
Most calls to incident_full_cells can be avoided
2015-02-10 16:34:22 +01:00
Clement Jamin 0ed94233cb Add a cache to store stars (uses std::set) 2015-02-10 13:11:23 +01:00
Clement Jamin a9c27d8db6 Added option USE_ANOTHER_POINT_SET_FOR_TANGENT_SPACE_ESTIM + fix export 2015-02-05 11:53:28 +01:00
Clement Jamin 39524b21eb Fixed debug code (2-sphere normal computation) 2015-02-04 18:32:23 +01:00
Clement Jamin 875a33fef1 Avoid to export duplicate simplices 2015-02-04 18:10:34 +01:00
Clement Jamin 6012256fc1 Updated comment 2015-02-03 15:01:41 +01:00
Clement Jamin 4a588310d9 Unused variable 2015-02-02 10:18:39 +01:00
Clement Jamin 2cec91f5f5 Try another technique 2015-01-28 18:31:08 +01:00
Clement Jamin 0e41484487 Added Final_num_inconsistent_local_tr + bugfix 2015-01-28 18:16:15 +01:00
Clement Jamin 40981e372d INPUT_SPARSITY constant is for test only 2015-01-28 16:37:26 +01:00
Clement Jamin 69b9e2b442 Make "sparsity" a parameter 2015-01-28 16:19:33 +01:00
Clement Jamin 19a229254a More stats + fixed a bug when there are infinite cells in the star 2015-01-28 16:06:36 +01:00
Clement Jamin b42bdf8c3c Change CGAL_TC_NUMBER_OF_PERTURBED_POINTS => macro 2015-01-28 14:41:00 +01:00
Clement Jamin b6a4f6d600 Dimensions can now be set at runtime by using Dynamic_dimension_tag 2015-01-26 17:58:19 +01:00
Clement Jamin 0c876e6ba6 Refactored try_to_solve function 2015-01-26 14:00:33 +01:00
Clement Jamin 68b0f5839c Added time limit to fix_inconsistencies() 2015-01-26 13:20:59 +01:00
Clement Jamin 499b702e9b Added the CGAL_TC_PERTURB_THE_1_STAR strategy 2015-01-21 13:40:48 +01:00
Clement Jamin be21ff3dc1 Added another strategy to perturb the points 2015-01-20 19:49:32 +01:00
Clement Jamin 9255141ae7 Rename macro 2015-01-20 12:34:37 +01:00
Clement Jamin cc1379396c Improved output 2015-01-20 12:32:36 +01:00
Clement Jamin 751f592f44 Added an option to perturb point positions instead of weights 2015-01-19 15:52:03 +01:00
Clement Jamin dd86950760 Improve code using a transform_iterator 2015-01-16 16:53:40 +01:00
Clement Jamin c4820faa1b Restore original code 2015-01-15 15:46:00 +01:00
Clement Jamin a2423310b1 Handles the case when the local triangulation has a dimension < intrinsic dim 2015-01-15 15:39:25 +01:00
Clement Jamin 1885d666c7 Added new refresh strategy + better benchmark 2014-12-19 12:04:56 +01:00
Clement Jamin 786f40d376 "fix_inconsistencies" now returns the number of steps it took 2014-12-19 07:16:31 +01:00
Clement Jamin 248c4b915d Comment mutexes out since we don't use them for now 2014-12-18 20:46:30 +01:00
Clement Jamin dfbf887751 Add TBB_USE_THREADING_TOOL in debug mode 2014-12-18 20:29:19 +01:00
Clement Jamin 3557c38245 Remove unused variables 2014-12-12 16:41:00 +01:00
Clement Jamin 1f4015aedf Added a function to help estimating the intrinsic dimension 2014-12-12 16:36:27 +01:00
Clement Jamin 7a05ab7424 Faster "star_sphere" test 2014-12-12 10:39:35 +01:00
Clement Jamin e18ba7133c Add an accurate but slow way to generate a sparse point set 2014-12-11 18:17:32 +01:00
Clement Jamin 9e48b7caf4 Add an insert function to the spatial sorting data structure 2014-12-11 18:14:09 +01:00
Clement Jamin 2328dbc852 Code clean-up & improvements 2014-12-10 18:47:08 +01:00
Clement Jamin 305e02c865 Try a new way to solve inconsistencies 2014-12-05 18:00:23 +01:00
Clement Jamin cd1fe19554 No need to recompute the tangent plane here 2014-12-05 12:09:42 +01:00
Clement Jamin 1172403b97 Simplify computation of the weight (projected points) 2014-12-05 12:09:12 +01:00
Clement Jamin 0e089a2081 Use Power_center for the "star sphere" optimization 2014-12-04 17:31:25 +01:00
Mael Rouxel-Labbé 94af9d1443 Merge branch 'Tangential_complex-cjamin' of ssh://scm.cgal.org/var/git/cgal into
Tangential_complex-cjamin

Conflicts:
	Tangential_complex/include/CGAL/Tangential_complex.h
2014-11-18 11:34:24 +01:00
Mael Rouxel-Labbé 3f5bb0cdd5 Fix trailing whitespace 2014-11-18 11:33:31 +01:00
Mael Rouxel-Labbé 1b32cc9563 Fix compilation errors for linux 2014-11-18 11:31:17 +01:00
Clement Jamin 6981ebe0d4 Do not test consistency of infinite cells + fix indentation 2014-11-18 10:31:26 +01:00
Clement Jamin 7115484e5d Better version of the inconsistencies solver 2014-11-04 14:36:04 +01:00
Clement Jamin b1f795a6da Fisrt try to remove inconsistencies. Not very good. 2014-10-17 17:34:06 +02:00
Clement Jamin d0544766e5 New constructor to include only a part of the vertices into the tree 2014-10-16 15:30:40 +02:00
Clement Jamin f455969e08 Display the number of vertices + bug fix when there is very few points 2014-10-16 15:29:38 +02:00
Clement Jamin ff4491a7b3 Trick to export complexes with intrinsic dim = 2 2014-10-15 19:00:07 +02:00