Commit Graph

222 Commits

Author SHA1 Message Date
Clement Jamin 950978b2cf Clean-up Regular_triangulation_euclidean_traits 2015-09-03 18:20:52 +02:00
Clement Jamin 3833fe8883 Fix return type + add comments 2015-09-02 18:51:00 +02:00
Clement Jamin fd265e1e4f Missing const 2015-07-21 18:02:16 +02:00
Clement Jamin 80d046bc81 Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2015-07-20 12:17:03 +02:00
Laurent Rineau 7e6e3f62ba Fix a link error "multiple definition of"
Trivial fix for bug #158
2015-07-10 12:29:23 +02:00
Clement Jamin 2c1f647107 Forgot to fix Triangulation accordingly (see previous commit)
(cherry picked from commit 35555fd3f9)
2015-07-06 20:02:27 +02:00
Clement Jamin 5531f6f169 Definitely removed the "infinite vertex at position 0" constraint...
... and fixed the regular triangulation at the same time.
Even though this constraint had been dropped, the code was still
expecting the infinite vertex to be at position 0 in the cells.
Now, it's not the case anymore, the infinite vertex can be anywhere.
This is particularly useful for the 2D case, because the constraint made
the orientation of the "rightmost" infinite cell wrong.

(cherry picked from commit 48b8382de3)
2015-07-06 19:07:11 +02:00
Clement Jamin ef9b73ca2e Bugfix: ==
(cherry picked from commit aa81039e07)
2015-06-25 20:40:47 +02:00
Clement Jamin 63a5536699 Bugfix in RTd: in dimension 2, the points were never hidden
(cherry picked from commit fa3b2d9bea)
2015-06-25 20:40:33 +02:00
Clement Jamin c32373e75b Rename variable to avoid confusion + remove useless initialization 2015-01-12 17:49:25 +01:00
Clement Jamin d775cde6e6 Better bug fix
Handles the case where an existing point is at the same place as
the point we're trying to insert.
2015-01-12 17:47:09 +01:00
Clement Jamin f320bdee43 Temporary bug fix
Do not insert a point when an already existing point in at the same place.
TODO: something better when the weight is different.
2015-01-12 14:56:03 +01:00
Clement Jamin af405ac7a6 Add output_full_cell 2015-01-12 14:51:21 +01:00
Clement Jamin 10f7b688eb Add output_weighted_point 2015-01-12 11:10:33 +01:00
Clement Jamin bb654aec95 Fix the FIXMEs: "infinite vertex is NOT at index 0 a priori" 2015-01-12 08:49:47 +01:00
Clement Jamin 43d81bb12b Missing param 2015-01-09 15:02:46 +01:00
Mael Rouxel-Labbé 7a11937b97 Fixed TDS's incident_faces() using the wrong index for the first vertex
(and added consts)

(cherry picked from commit e312d7ddae0188ed0d99b4247f73871a57124f41)
2015-01-09 14:57:46 +01:00
Clement Jamin 81f68efb7e Oops. This fixes the previous bug fix (wrong place). 2014-12-18 11:00:12 +01:00
Clement Jamin 2f4bb69e0a Merge branch 'Triangulation-add_regular_tri-cjamin_mglisse-old' into Triangulation-add_regular_tri-cjamin_mglisse 2014-12-18 10:59:01 +01:00
Clement Jamin 6694b8adfb Bugfix: we can't call infinite_vertex() like this 2014-12-18 10:56:09 +01:00
Clement Jamin d605eff325 Restore 4-space identations 2014-12-18 10:24:44 +01:00
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