Commit Graph

301 Commits

Author SHA1 Message Date
Clement Jamin 5b13d122f9 Bug fix for when the first points lie in a lower dimension 2014-12-12 16:20:27 +01:00
Clement Jamin c5ae1ba1dd Derecursify insert_in_tagged_hole
No stack overflow anymore.
2014-12-11 12:46:21 +01:00
Clement Jamin f277603c05 Fix the FIXMEs: "infinite vertex is NOT at index 0 a priori" 2014-12-10 17:32:54 +01:00
Clement Jamin d558985a14 Fix an "Internal compiler error" in MSVC 2013 2014-12-01 21:01:13 +01:00
Clement Jamin 7b230a4ff2 Fix warnings 2014-11-26 17:35:46 +01:00
Clement Jamin ee73601172 Fix a warning and a "FIXME" 2014-11-26 17:26:13 +01:00
Clement Jamin 0aa818ca1f Fix a bug in the input/output (due to mixed sizes of integers) 2014-11-25 13:21:53 +01:00
Clement Jamin 1aa392ef57 Fix a compilation error of some platforms 2014-11-25 13:20:53 +01:00
Clement Jamin d6a3e6aebc Fix gcc warnings (unused typedefs) 2014-11-20 13:06:59 +01:00
Clement Jamin c2185923e3 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2014-10-28 17:52:29 +01:00
Clement Jamin 9259bd777f Also uses 64 bits for Xor_type on 32-bit systems, if possible 2014-10-28 17:47:18 +01:00
Clement Jamin fa796a088d unsigned long was not big enough here 2014-10-28 16:56:44 +01:00
Clement Jamin 6078634d07 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2014-09-23 08:56:09 +02:00
Clement Jamin 2974822d30 Fix warnings 2014-09-22 15:20:46 +02:00
Clement Jamin e0474c1b92 Remove unused typedefs 2014-09-22 14:29:07 +02:00
Clement Jamin 080d913416 Reorder initializer list to suppress a warning 2014-09-22 14:26:08 +02:00
Clement Jamin c17b04e319 Pedantic GCC doesn't like those useless semicolons 2014-09-19 15:32:51 +02:00
Clement Jamin 9a1c16fc9f Prevent name conflict with min/max 2014-09-19 12:22:36 +02:00
Clement Jamin a2f9041d54 Fix spatial_sort 2014-09-14 09:06:21 +02:00
Clement Jamin 121fabd264 Removed some "auto" keywords 2014-09-12 17:04:26 +02:00
Clement Jamin d6255a16f0 Fix syntax 2014-09-12 16:56:47 +02:00
Clement Jamin bf946d4e87 Temporarily remove spatial_sort as it was wrong 2014-09-12 16:51:12 +02:00
Clement Jamin 4b48d7db87 Comments clean-up 2014-09-05 16:03:08 +02:00
Clement Jamin 3d8bb299d2 Fix insert_if_in_star 2014-09-05 12:45:39 +02:00
Clement Jamin f1a7c45490 Hidden points are now handled during insertion and stored in a common container
Note that they are not handled/restored during removal yet
2014-09-05 09:17:23 +02:00
Clement Jamin eb884bd4eb Removed a precondition
This precondition may be false when processing the hidden cells of
the regular triangulation
2014-09-05 08:17:17 +02:00
Clement Jamin ec7f3a6fd3 Pass-by-ref the traits + slightly better handling of hidden points (WIP) 2014-09-05 07:44:44 +02:00
Clement Jamin e41484a3f0 Pass-by-ref the traits 2014-09-05 07:43:31 +02:00
Clement Jamin 544d3a1ef1 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2014-09-04 17:36:21 +02:00
Clement Jamin dfb38ed1af Do not insert hidden points
Hidden points are not handled for now
2014-09-04 17:05:18 +02:00
Clement Jamin ee825951d2 Removed two local static variables
Local static variables are not thread-safe
2014-09-04 16:06:29 +02:00
Clement Jamin 72601f6cbd Fix a bug in the copy-constructor of TDS
When the dimension is -1, there is one vertex: the infinite vertex.
2014-09-02 18:47:00 +02:00
Clement Jamin 429e992570 Fix a bug in the copy-constructor of TDS
When the dimension is -1, there is one vertex: the infinite vertex.

(cherry picked from commit f466414a75)
2014-09-02 18:42:30 +02:00
Clement Jamin 5cc88e11e4 This version of insert_if_in_star seems to work better
At least in 2D
2014-07-30 18:26:44 +02:00
Clement Jamin b916d18319 First version of insert_if_in_star that is too restrictive
We need to check that star_center is not part of the conflict zone.
2014-07-30 18:07:03 +02:00
Clement Jamin 9d8d255307 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2014-07-30 16:42:33 +02:00
Clement Jamin 96fa41a1e7 Add a comment 2014-07-29 16:59:50 +02:00
Clement Jamin 018929fecf Replace operator<< for Point_d by output_point 2014-07-22 17:26:55 +02:00
Clement Jamin d0b8281ab7 Update license in the code (QPL => GPL) 2014-06-24 15:47:47 +02:00
Clement Jamin 8ff09b38a0 Comment fix 2014-06-19 07:56:10 +02:00
Clement Jamin d02296de83 Missing using/typedef + bug fix 2014-06-19 07:52:14 +02:00
Clement Jamin 7d0d7293f0 Derecursify insert_in_tagged_hole
No stack overflow anymore.
2014-06-18 19:27:52 +02:00
Clement Jamin 7b9cfe4168 Fix tabulation (size = 2 spaces) 2014-06-18 14:57:59 +02:00
Clement Jamin cb848a4375 Remove useless typedefs 2014-06-17 17:38:03 +02:00
Clement Jamin 490adcdd1b Add DT::is_valid and RT::is_valid 2014-06-17 17:36:41 +02:00
Clement Jamin 754808bef7 Change default param value (for export) 2014-06-17 14:53:10 +02:00
Clement Jamin 54ab0fc5a1 Clean-up debug traces 2014-06-17 14:48:34 +02:00
Clement Jamin d8b0e2904e New data for 2D and 3D + improved export 2014-06-17 14:48:03 +02:00
Clement Jamin ad12bb88df Fix MSVC warnings 2014-06-17 11:23:33 +02:00
Clement Jamin 60fc6b63f3 RTd to OFF application 2014-06-17 11:23:12 +02:00
Clement Jamin 2f4c40cdad Fix a warning 2014-06-17 00:18:34 +02:00
Clement Jamin 3898ccdd8b Remove Triangulation_io.h 2014-06-17 00:17:51 +02:00
Clement Jamin 907f7bec01 Export to OFF (2D & 3D triangulations) 2014-06-16 11:44:06 +02:00
Clement Jamin 9055e27175 Improve output + variable renaming 2014-06-16 09:26:14 +02:00
Clement Jamin d141311a5b Some operator<< for the points 2014-06-16 09:25:24 +02:00
Clement Jamin 41a312bca3 Revert "Temporary ugly code that runs without crashing"
Now it works.
This reverts commit d829e61fd1.
2014-06-16 08:06:52 +02:00
Clement Jamin d829e61fd1 Temporary ugly code that runs without crashing 2014-06-14 08:17:16 +02:00
Clement Jamin 9277e907db Commented the traces out 2014-06-14 08:16:30 +02:00
Clement Jamin 92de88555f More debug traces 2014-06-13 19:12:34 +02:00
Clement Jamin 25a319f4a5 Fix compilation with GCC 2014-06-13 15:33:22 +02:00
Clement Jamin 54a3641ae7 Regular_triangulation. Compiles but does not work. 2014-06-12 13:54:29 +02:00
Clement Jamin 174fde081e Update doc according to Menelaos review 2014-05-23 17:02:52 +02:00
Clement Jamin 19f4c90954 Fix indentation 2014-05-22 07:51:04 +02:00
Clement Jamin 37f2286036 Fix precondition 2014-05-22 07:50:36 +02:00
Clement Jamin 8266346f6d Move Substitute_point_in_vertex_iterator outside of Triangulation 2014-04-07 10:00:28 +02:00
Clement Jamin 144d03f08f Merge branch 'Triangulation-higher_dimensions-odevil_shornus' of ssh://scm.cgal.org/var/git/cgal into Triangulation-higher_dimensions-odevil_shornus 2014-04-04 22:55:02 +02:00
Clement Jamin b4b05769fd Missing includes 2014-04-04 22:51:10 +02:00
Marc Glisse 4a321e57d2 Let it compile. Substitute_point_in_vertex_iterator should move out of
Triangulation ASAP.
2014-04-04 22:37:19 +02:00
Clement Jamin 9c8a469339 Use transform_iterator instead of iterator_adaptor 2014-04-04 16:06:33 +02:00
Clement Jamin 0709be0904 Substitute_iterator is not used anymore 2014-04-04 15:35:06 +02:00
Clement Jamin e2faf48a5c Store a pointer instead of a ref in Substitute_point_in_vertex_iterator 2014-04-04 15:28:04 +02:00
Clement Jamin 5c5151ce2b New "substitution iterator" for orientation computation 2014-04-03 17:39:29 +02:00
Clement Jamin 40538db82e Use boost::optional::get_ptr() + comments 2014-04-01 17:19:54 +02:00
Clement Jamin 2258e7a810 Fix: use a pointer instead of a copy of Flat_orientation_d
Note: the previous commit fixing this problem (using
construct_flat_orientation_d_object()) was not compilable
2014-04-01 16:01:21 +02:00
Clement Jamin 3e7422dc75 Remove useless consts 2014-04-01 15:22:58 +02:00
Clement Jamin 92f3d67ebc Do not use Flat_orientation_d default constructor (it might not exist) 2014-04-01 15:02:06 +02:00
Clement Jamin 939b8b648f Fix warnings 2014-04-01 14:40:44 +02:00
Clement Jamin 53b9729d71 Merge branch 'Triangulation-higher_dimensions-odevil_shornus' of ssh://scm.cgal.org/var/git/cgal into Triangulation-higher_dimensions-odevil_shornus 2014-04-01 13:57:13 +02:00
Clement Jamin 2f874ff8a3 Bug fix (reference to temporary object)
Conflict_predicate now stores copies of the predicates instead of references.
2014-04-01 13:56:38 +02:00
Marc Glisse 5887acc1b4 typename only for dependent nested types. 2014-03-31 20:56:41 +02:00
Clement Jamin 3db5931721 Remove debugging code (oops) 2014-03-31 20:07:26 +02:00
Clement Jamin 3090bad5ce Fix Dark_triangulation orientation bug.
See commit 7cb5ef208d
2014-03-31 20:06:12 +02:00
Clement Jamin c7c7c184a3 Merge branch 'Triangulation-higher_dimensions-odevil_shornus' of ssh://scm.cgal.org/var/git/cgal into Triangulation-higher_dimensions-odevil_shornus 2014-03-31 19:41:15 +02:00
Clement Jamin ee1183f8b5 Doc fixes according to Mariette's review 2014-03-31 19:38:56 +02:00
Marc Glisse 6728dede7f Remove unused and illegal default arguments of do_locate. 2014-03-31 18:09:41 +02:00
Clement Jamin b7cfd3928f rename get_tds_data=>tds_data + more detail in the doc 2014-03-26 16:54:14 +01:00
Marc Glisse 9e3028ba87 Let it compile.
Move the wrapper after the typedefs it uses.
Missing typename.
The last using typename may have to be replaced with a typedef for
gcc-4.6.
2014-03-25 16:53:46 +01:00
Clement Jamin 885741d466 Use Marc's new Kernel_d 2014-03-25 11:51:23 +01:00
Clement Jamin 94ae9ec16a Fix warnings 2014-03-25 11:48:39 +01:00
Clement Jamin 4afe04851b Fix a warning 2014-03-25 11:23:08 +01:00
Clement Jamin 7008499422 Syntax fix 2014-03-24 16:17:16 +01:00
Clement Jamin efe8aabd90 Changes according to reviews (with Olivier) 2014-03-20 18:15:38 +01:00
Clement Jamin 35fdca409a Untabify + rename 'd' => 'dim' in some functions 2014-03-19 16:54:52 +01:00
Olivier Devillers 5ad9f44d83 Triangulation user manual 2013-12-05 08:50:49 +01:00
Samuel Hornus 8907c117b7 additions to the TODO list 2012-09-10 13:14:40 +00:00
Samuel Hornus c823a02ae9 fix minor issues with code and doc regarding the locate() functions 2012-09-10 12:15:28 +00:00
Samuel Hornus f99bc3b258 removed now-useless header inclusion 2012-07-19 13:52:57 +00:00
Samuel Hornus 475ca91c6a revised the definition of TDS::Facet and TDS::Rotor to avoid problems with automatic casting of Full_cell_handle to Facet, and fix Facet_iterator to not use the equality comparison of two Facets, which is not in the TDS concept 2012-07-19 13:46:48 +00:00
Samuel Hornus c46b18dee1 small fixed on is_infinite 2012-07-18 18:56:52 +00:00
Samuel Hornus 057c00d3c6 various stuff 2012-07-18 15:30:54 +00:00
Samuel Hornus 427add5d67 removed points_begin()/end() from TriangulationFullCell 2012-07-17 12:44:39 +00:00
Samuel Hornus ba7c89c860 revised is_valid code and doc for Triangulation class 2012-07-10 13:13:41 +00:00
Samuel Hornus f4bc57b8ef removed useless healder inclusion 2012-07-10 13:13:13 +00:00
Samuel Hornus e96a8301eb code and doc for is_valid, for vertex, full_cell and tds 2012-07-09 16:06:37 +00:00
Olivier Devillers 284142f645 ambient vs max dim, (code first step) 2012-07-06 14:13:18 +00:00
Samuel Hornus 0aa3a83f6f improve the is_valid() method: more thorough test 2012-07-04 15:43:53 +00:00
Olivier Devillers 6416b4a73b default arg to tds constructor 2012-07-03 15:33:45 +00:00
Samuel Hornus acccab37ca - added missing "using Base::..."
- fixed DT::remove() to account for the removal of is_vertex(p, v, hint) function from the Triangulation class.
- call tds().incident... since the local incident... function has been removed.
2012-07-03 15:16:31 +00:00
Olivier Devillers adbf200c70 all details in reviews implemented, remain some stuff in the todo list 2012-06-20 16:13:27 +00:00
Olivier Devillers c4d210193c implementing_reviews 2012-06-08 16:04:21 +00:00
Olivier Devillers 78a3224468 implementing the reviews 2012-06-08 12:26:30 +00:00
Olivier Devillers 53d5c41759 implementing reviews of concept TDS 2012-05-25 14:45:48 +00:00
Olivier Devillers dddd995972 details 2012-05-24 14:31:26 +00:00
Olivier Devillers 20b9923723 reviwer 2, user manual 2012-05-22 14:28:36 +00:00
Olivier Devillers c922c1b474 following reviews 2012-05-16 12:41:38 +00:00
Samuel Hornus f08323e864 add comments for future fixes to be done 2012-01-09 15:46:16 +00:00
Olivier Devillers 910c32a14c remove hack of substituting the query in the simplex before calling orientation 2011-10-20 07:41:32 +00:00
Olivier Devillers 952eff0b21 remove hack of substituting the query in the simplex before calling orientation 2011-10-19 17:22:12 +00:00
Olivier Devillers 84a832fa4d few things 2011-10-14 14:46:25 +00:00
Olivier Devillers a1bb0c01b8 removing the requirement that infinity has index 0 2011-10-14 13:27:36 +00:00
Olivier Devillers 42e210f739 spatial sort include a random shuffle 2011-10-14 08:32:42 +00:00
Olivier Devillers 6f972ff658 is_finite --> ! is_infinite 2011-10-13 15:27:14 +00:00
Samuel Hornus 5b031ef0ac fix finite_vertex_iteartor 2011-10-13 13:52:02 +00:00
Samuel Hornus 05b6f935b7 quick fix 2011-06-21 11:35:15 +00:00
Samuel Hornus 1e05274cc3 quick fix 2011-06-21 11:35:05 +00:00
Samuel Hornus 50b53cbf79 copy constructor for the class Triangulation 2011-06-20 12:54:31 +00:00
Samuel Hornus a6a22e4d02 copy constructor for TDS (class only, not in concept) 2011-06-20 12:38:32 +00:00
Samuel Hornus 32984361ef getting rid of pure complex term 2011-06-17 08:52:05 +00:00
Samuel Hornus 1e991fcbe5 minor fixes 2011-06-09 14:50:59 +00:00
Samuel Hornus 6c798df21d *) cleaner (like Triangulation_data_structure_3) handling of flags in simplices.
*) Remove usage of non-documented function from TDS in Delaunay_triangulation.h (ie, functions not in the TDS concept, mostly set/get_visited)
2011-05-31 12:11:11 +00:00
Samuel Hornus 195275e0c3 IN_SIMPLEX -> IN_FULL_CELL, and little a cleaning 2011-05-20 11:17:17 +00:00
Samuel Hornus 8280eccd6a mark functions in Triangulation_face.h as required by the Concept. Add precondition that Face be of dim strictly smaller than ambient_dim; fix bug due to this precondition, in Triangulation.h 2011-05-11 15:01:38 +00:00
Samuel Hornus dcf05ce797 compute_star -> star, remove adjacent, mark Concept function as such 2011-05-11 14:11:50 +00:00
Samuel Hornus 0f15bc8a38 mark function from Concept as such for Triangulation_ds_vertex.h 2011-05-10 21:39:51 +00:00
Samuel Hornus 35ccb9ff86 mark function from Concept as such (in comment) and update TODO 2011-05-10 21:33:05 +00:00
Samuel Hornus 1dafc48b7a renamed some functions, see TODO 2011-05-10 19:49:31 +00:00
Samuel Hornus 42ba0c960d some cleanup in the code 2011-05-10 15:56:58 +00:00
Samuel Hornus 5f9d0ee0bd rename all classes, did not rename some member functions yet 2011-05-10 14:34:11 +00:00
Samuel Hornus c623439481 renamed all simplex and vertex classes 2011-05-10 14:10:39 +00:00
Samuel Hornus 52f1b45abc change Pure_complex_ds* to Triangulation_ds* 2011-05-10 13:13:59 +00:00
Samuel Hornus 3829cc5ca6 change Pure_complex_face to Triangulation_face 2011-05-10 12:54:33 +00:00
Samuel Hornus aa763317f5 rename simplex storage policies files 2011-05-10 12:45:58 +00:00
Samuel Hornus 6934fe43d9 renaming internal directory 2011-05-10 12:38:08 +00:00
Samuel Hornus c46b43fa08 change some internal files names 2011-05-10 12:33:19 +00:00
Samuel Hornus 1d4d6d99ac rename include-guard-macros, PCDS template param, PCDS* class name, internal namespaces 2011-05-10 12:26:23 +00:00
Samuel Hornus 090007350c fix small bug in stream output 2011-05-09 20:22:48 +00:00
Samuel Hornus 37ff7093f6 easier reading of member variables 2011-05-06 17:06:55 +00:00
Samuel Hornus e47bbc2078 Checked the correctness of the perturbed predicate, found no mistake 2011-05-03 22:13:43 +00:00
Samuel Hornus 5401fc9be6 fix the perturbation scheme to comply with the negative-inside convemtion of CGAL side_of_oriented_sphere tests 2011-05-01 21:40:46 +00:00
Samuel Hornus 74c7d5992d small fix to compile with both cpp0x and plain old cpp 2011-05-01 21:37:26 +00:00
Olivier Devillers 76e95c9689 import from experimental packages in the new branch model 2011-04-28 13:25:16 +00:00