Commit Graph

234 Commits

Author SHA1 Message Date
Sébastien Loriot 51c5a5c5ed remove unused variable warnings 2013-07-05 11:36:06 +02:00
Sébastien Loriot 72f117839f update the insert function to dispatch according to the value-type 2013-07-02 19:51:34 +02:00
Sébastien Loriot 1aa8ab8afa add function to insert a range of segments 2013-07-02 18:49:02 +02:00
Sébastien Loriot 1799dc232a add function to insert a range of segments from points and pairs of indices 2013-07-02 14:35:46 +02:00
Sébastien Loriot b9d1183cd0 add function to insert a range of points using spatial sorting 2013-07-02 11:58:40 +02:00
Sébastien Loriot 2fb80f6520 add Less_x_2 and Less_y_2 in the traits concept and its models
this is needed to use the spatial sorting
2013-07-02 11:57:02 +02:00
Andreas Fabri 1952bf7382 remove unused variables 2013-03-04 14:49:30 +01:00
Andreas Fabri 6f08686b71 obvious fix in an unused function 2013-02-27 13:55:06 +01:00
Andreas Fabri 10e495d897 Replace WARNING with ATTENTION to avoid a 'W' in the testsuite page 2013-02-27 13:42:18 +01:00
Laurent Rineau 68e2b709e2 Use CGAL_assertion_code to remove warnings about unused variables 2013-02-20 18:56:13 +01:00
Philipp Möller 833a32660d Replace boost/random.hpp with more precise headers 2012-12-14 17:29:14 +01:00
Philipp Möller 79b30908d5 WARNFIX: Silence a good part of unused variable/parameter warnings.
Wextra results in a dreadful wall of yellow in the test-suite and is
scary when using CGAL. Reduce some of the noise by silencing the
obvious cases with CGAL_USE or comments.
2012-08-07 11:04:32 +00:00
Sébastien Loriot 40e636e8e5 more warnings removed 2012-07-27 10:38:58 +00:00
Menelaos Karavelas 13ff351666 fixed bugs reported by Marc Moerig <marc@moerig.com>;
these bugs have been directly incorporated into next after approval by
Laurent, and after running the SDG testsuite locally on my machine;
2012-01-18 09:33:13 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00
Menelaos Karavelas a241eb1572 removed Notre Dame University from copyright headers;
still some headers contain FORTH as copyright headers;

this was done (incorrectly on the trunk (r65713) and reverted by Laurent; it is now properly done in ^/branches/next
2011-10-06 08:12:38 +00:00
Sébastien Loriot d5c2355419 merge the modification from experimental packages to
the candidate branch of the feature + few name bug fixes
2011-04-12 11:34:37 +00:00
Sébastien Loriot e5a96255ba *remove warnings.
In particular remove UNTESTED_XXXXXXXXXXX unused variable that possibly hide true warnings. 
In those cases, the string printed while executed now starts with "NOTE: ".
*CGAL internal code no longer rely on depecrated features
2011-02-28 15:28:28 +00:00
Andreas Fabri a8ffcea556 int -> size_t and the other way round for level as it cannot get that big 2010-06-22 10:15:50 +00:00
Sébastien Loriot d53e01f1a1 remove package namespace macro 2010-06-09 08:45:58 +00:00
Sébastien Loriot 52317dd49f add python script (replace_CGAL_NAMESPACE.py) to replace CGAL_BEGIN_NAMESPACE and CGAL_END_NAMESPACE
by namespace CGAL { and } //namespace CGAL. in all .h and .cpp files
in a directory.
Apply it to all packages in the trunk
Remove macro definition from the config.h file.
2010-06-09 07:37:13 +00:00
Andreas Fabri 6698aab158 Replace struct with class 2010-05-25 08:37:38 +00:00
Andreas Fabri 10716e81c1 Replace struct with class 2010-05-25 08:37:26 +00:00
Andreas Fabri 4acea23434 Add using statements for ansi-compliance 2010-05-18 08:12:56 +00:00
Andreas Fabri ceec03efbb Add 'using' for ansi compliance 2010-05-17 07:31:04 +00:00
Menelaos Karavelas 17463fae28 removed experimental code from branch 2010-05-12 10:46:05 +00:00
Menelaos Karavelas 6db1c586c4 added class that implements the filtered traits using also static filters
when possible;
benchmark_nox.cpp uses now the filtered traits with static filters by default;
this is activated by the CGAL_SDG_TRAITS_WITH_STATIC_FILTERS macro;
Vertex_conflict_C2.h: added operator() that takes four points;
Traits_wrapper_2.h: the Side_of_oriented_circle_2 class is now implemented
using the Vertex_conflict_2 class from the base traits;
2010-04-22 07:49:57 +00:00
Menelaos Karavelas 99f1616c26 removed code that was trying to insert a site using flips 2010-03-31 08:30:30 +00:00
Menelaos Karavelas 5b04684c3f fixed bug in arrangement type predicate for non-interseting segments;
added some types and some assertions in edge lists (both regular and in-place);
fixed bugs in post-increment operators of edge list circulators (edge_list.h)
2010-03-31 08:15:14 +00:00
Menelaos Karavelas 6d4a9bfb7c added iterator to the edge list (edge_list.h)
added various macros in double.cpp so that the fastest choices are made
2010-03-31 07:15:33 +00:00
Menelaos Karavelas f239e1bba4 created a face base for SDG;
moved face data in face base of SDG;
modified benchmark files about this change;
now using the SDG face base everywhere as the default face base;
2010-03-30 20:24:19 +00:00
Menelaos Karavelas 25e7a03b50 one more optimization in edge list iterator 2010-03-30 18:01:12 +00:00
Menelaos Karavelas 2acb84c4de added code for Segment Delaunay graph that does not support intersections;
the sites now store two points and currently there is no additional container
for input sites; info is not supported yet.
2010-03-30 07:54:45 +00:00
Menelaos Karavelas 75563e6124 no need to include the face with info now 2010-03-29 19:44:35 +00:00
Menelaos Karavelas 1a7f7eb32d local implementation of the in-place edge list; it assumes that the face data
in TDS2 is activated
2010-03-29 19:41:23 +00:00
Menelaos Karavelas b617e8ed31 modifications so that the code works with the in-place edge list stored in
the tds_data (face data)
2010-03-29 19:39:43 +00:00
Menelaos Karavelas aeb6c47cdb added alternate sym_edge implementation by AF.
the alternate implementation is used by defining the macro:
CGAL_SDG_ALTERNATE_SYMEDGE_IMPLEMENTATION_BY_AF
2010-03-26 09:25:51 +00:00
Menelaos Karavelas 8425a5647c fixed bug that made the SDG testsuite red (CGAL-3.7-Ic-23) 2010-03-24 08:57:12 +00:00
Menelaos Karavelas c2b48cb014 wrote code for the arrangement_type predicate that is specific to
non-intersecting segments; the code is activated by defining the
CGAL_SDG_USE_SIMPLIFIED_ARRANGEMENT_TYPE_PREDICATE macro, which is currently done in the benchmark program
2010-03-22 10:19:22 +00:00
Menelaos Karavelas 23ac67113c added support for an in-place edge list stored at the faces; the edge list is used to represent the boundary of the conflict region;
added support for in-place storage (at the faces) of the faces that define the conflict region; also the sign of the incircle test is cached there; this uses the Face_data that now exists in TDS2;

to activate the in-place storage of the faces of conflict regions define the macros: CGAL_TDS2_DATA and CGAL_SDG_NO_FACE_MAP

the file Triangulation_face_base_with_in_place_edge_list_2.h implements an in-place edge list for the boundary of the conflict region
2010-03-16 14:42:27 +00:00
Menelaos Karavelas 017b047b06 when computing the Voronoi vertex in the point() method, we first check if
we are in the special case where the Voronoi vertex is degenerate (which happens
when the Voronoi vertex is defined by two segments and a point, where the point
is the common endpoint of the two segments)
2010-03-16 14:26:15 +00:00
Menelaos Karavelas 63b5291b04 added public that returns the Voronoi vertex as a point. 2010-03-16 14:14:48 +00:00
Menelaos Karavelas 0d94090199 renamed Incircle_operator_sqrt_field_C2.h to Voronoi_vertex_sqrt_field_new_C2.h;
removed file Incircle_sqrt_field_C2.h: the code in there is superseeded by the
code in Voronoi_vertex_sqrt_field_new_C2.h;
the code used now by default for computing the incircle test is that in the file
Voronoi_vertex_sqrt_field_new_C2.h; the old code can be activated by defining
the macro CGAL_SDG_USE_OLD_INCIRCLE; also by defining the macro
CGAL_SDG_CHECK_INCIRCLE_CONSISTENCY the incircle test is evaluated by both codes
and if they are different an error is shown in std::cerr
2010-03-08 19:59:01 +00:00
Menelaos Karavelas 2fecbfe72e lots of changes to increase the performance. this will be the new vertex conflict code 2010-03-08 19:26:34 +00:00
Menelaos Karavelas d672394d1a within a macro block called CGAL_SDG_CHECK_INCIRCLE_CONSISTENCY,
we check if the results of the old and new incircle tests are the same
2010-03-08 19:24:42 +00:00
Menelaos Karavelas d781e8698a removed static stuff; some stylistic changes 2010-03-08 19:23:09 +00:00
Menelaos Karavelas d938466a5b added code that dumps to a file quadruples of sites for which the
incircle test is called; the code is surrounded by the macro
CGAL_PROFILE_SDG_DUMP_INCIRCLE
2010-03-05 09:25:41 +00:00
Menelaos Karavelas 7f78f9946e now using the algebraic structure traits; this is the first step towards
automatizing the method the traits are evaluated
2010-03-04 19:00:46 +00:00
Menelaos Karavelas c80efd7f05 two more ways for computing the incircle test for segments 2010-03-04 18:59:20 +00:00
Menelaos Karavelas 9bbfaf3cce modified the exactness check again so as not to use the deprecated check_tag function 2010-03-01 09:53:07 +00:00
Menelaos Karavelas 172714f57a removed Check_exact.h and related calls; now using existing CGAL functionality 2010-03-01 09:49:13 +00:00
Menelaos Karavelas 1a00096bb7 replaced unnecessary "else if" by else, thus removing compiler warning;
bug supplied by Andreas on 1/3/2010 (email)
2010-03-01 09:21:49 +00:00
Menelaos Karavelas c73424e9a0 this file contains a functor checking if the number type used is exact 2010-03-01 09:15:16 +00:00
Menelaos Karavelas 1ea01fc2a3 added code for dumping sites producing a filter failure when CGAL_PROFILE is defined 2010-03-01 09:14:03 +00:00
Menelaos Karavelas 1d1d38ee0e modified compute_vertex so as to do fewer tests on whether objects are semgents
or points;
added a special case check for a PPS Voronoi vertex computation,
namely whether two points are aligned with the x or y-axis and at the same time 
the segment
is parallel to the supporting line of the two points.
2010-03-01 09:12:21 +00:00
Andreas Fabri 4a41a07234 better invert the ifdef 2010-02-25 16:59:21 +00:00
Andreas Fabri fef21871b7 Added #ifdefs so that we can more easily bench geometric filtering 2010-02-25 16:33:45 +00:00
Menelaos Karavelas de0a95f1a2 added one more test for the PSS case that reduces the number of filter failures 2010-02-08 23:48:21 +00:00
Menelaos Karavelas cb8976b1f7 added comments to indicate code added by Andreas and Monique 2010-02-08 19:26:20 +00:00
Sylvain Pion 85dc12f2a7 Remove empty lines at beginning and end of files
(apply Scripts/developer_scripts/remove_empty_lines.pl).
2010-02-01 12:55:28 +00:00
Andreas Fabri 2cf92ce4fd Default constructed boost::rand48 is good enough 2010-01-29 08:22:03 +00:00
Andreas Fabri f01d168155 Change rng and use rng in random_shuffle 2010-01-27 16:44:13 +00:00
Sébastien Loriot d61390d4c6 case ==ZERO was forgotten 2010-01-15 06:46:31 +00:00
Andreas Fabri a0aea7ac85 Add a geometric filter that avoids many filter failures in case of segments that touch in the endpoint which is the case for polygonal input 2009-11-23 09:11:19 +00:00
Sylvain Pion 8573fe26ce Rename CGALi to internal. 2009-08-24 17:10:04 +00:00
Sylvain Pion b9a9f208dd Rename DS to D_S to avoid clashes with macros defined by <sys/reg.h>. 2009-04-26 14:03:12 +00:00
Sylvain Pion 93f5a5b9fe Remove short name macros. See PR 1551. 2009-04-21 18:19:46 +00:00
Andreas Fabri d920792e49 Protection is outside the try block as VC8 has the CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG 2008-10-23 12:23:18 +00:00
Andreas Fabri d0361b02b0 get rid of warning for VC++ 2008-10-13 11:52:58 +00:00
Andreas Fabri 067ce547d1 get rid of warning for VC++ 2008-10-13 09:56:02 +00:00
Michael Hemmer 28575ad723 rename Real_embeddable_traits::Sign -> Sgn 2008-09-18 16:32:35 +00:00
Sylvain Pion 4c79d1d5cf Rename Bool_type to Boolean. 2008-08-26 13:40:26 +00:00
Sylvain Pion cdab39708e Propagate Uncertain-ty.
For the Norway data set, this changes the number of thrown exceptions
from >4000 to just a few.
2008-08-22 16:10:06 +00:00
Sylvain Pion a8e8ecfdcf Replace Interval_nt_advanced::unsafe_comparison by Uncertain_conversion_exception.
(it was alrady the same type, but now the filtering code can be independent on Interval_nt_advanced
(think other interval types, or other types of filters).
2008-07-31 13:31:26 +00:00
Sylvain Pion 5f2771ce2d Add missing CGAL/utility.h header 2008-07-27 11:58:54 +00:00
Michael Hoffmann e57386244b Remove dependency on CGAL/functional -> replace Unary_function
and Binary_function by std:: counterparts.
2008-07-23 15:18:27 +00:00
Sylvain Pion 79864c0c8e Remove Arity_tag. 2008-07-22 12:29:01 +00:00
Sylvain Pion b1c1c2b7fd Propagate uncertain-ty with Kernel::Bool_type. 2008-07-17 09:01:11 +00:00
Sylvain Pion 1ab17e2186 Disable the remaining short names macros (to be removed after 3.4). 2008-07-16 07:21:40 +00:00
Sylvain Pion 1d8779b171 Rename the following functions:
det2x2_by_formula
  det3x3_by_formula
  det4x4_by_formula
  det5x5_by_formula
  det6x6_by_formula
to:
  determinant

How cute...  a name independent of the dimension, and even readable !
2008-04-09 13:35:34 +00:00
Sylvain Pion af5ffdecae Remove useless <CGAL/Segment_Delaunay_graph_2/config.h>,
now that I removed the need for the only one macro it provided.
2008-04-09 13:11:21 +00:00
Sylvain Pion ebb5e40b14 Remove casts to Sign.
They are useless since we merged the various enum types.
2008-04-09 13:09:17 +00:00
Sylvain Pion b740e90de0 Rename the following functions:
sign_of_determinant2x2
  sign_of_determinant3x3
  sign_of_determinant4x4
  sign_of_determinant5x5
  sign_of_determinant6x6
to:
  sign_of_determinant

So that we have less dimension-dependent namings, at least internally...
2008-04-09 12:20:25 +00:00
Sylvain Pion 6a9740d043 Remove obsolete workarounds for __sgi. 2008-01-20 23:09:58 +00:00
Sylvain Pion e76a7d1ac2 SUNPRO workaround not needed anymore 2008-01-20 21:11:57 +00:00
Sylvain Pion 7b114599ad Get rid of CGAL_REP_CLASS_DEFINED 2008-01-03 19:02:00 +00:00
Andreas Meyer c1d1609af1 replaced CGAL_assertion( false* and CGAL_assertion( 0*
with CGAL_error/CGAL_error_msg
2007-11-08 00:27:20 +00:00
Sylvain Pion 1c189779b6 Update following renaming EK -> Exact_kernel and FK -> Approximate_kernel. 2007-09-07 09:52:51 +00:00
Sylvain Pion a3def1c3eb Remove obsolete config flag CGAL_CFG_USING_BASE_MEMBER_BUG. 2007-08-09 09:55:09 +00:00
Sylvain Pion 93c81dd125 comment out unused argument 2007-03-23 19:14:27 +00:00
Sylvain Pion 249732051f Fix "uninitialized base class in copy ctor" warning/bug (by removing useless code). 2007-03-23 19:02:35 +00:00
Andreas Fabri 42f0da8ee0 removed unused parameters 2007-03-20 08:39:43 +00:00
Andreas Fabri e01f3b7b8b removed unused parameters 2007-03-20 08:23:06 +00:00
Andreas Fabri e1fd28e66d remove unused parameter 2007-03-19 07:47:35 +00:00
Andreas Fabri ca86d2bb37 remove unused parameter 2007-03-16 10:49:14 +00:00
Michael Hemmer 854ea80b4b rm use of CGALi::Is_field etc
replaced by use of Algebraic_category tag
2007-03-12 17:34:47 +00:00
Sébastien Loriot 54d6b1f926 Remove unused parameter names of functions involving warnings while compiling 2007-02-08 07:47:54 +00:00
Michael Hemmer f95d200030 rm Number_type_traits
replace:
 Ring_tag -> Integral_domain_without_division_tag
 Sqrt_field_tag -> Field_with_sqrt_tag
2006-11-16 12:42:59 +00:00
Michael Hemmer 0401e53a34 added preliminary NTS for Sqrt_extension_1/2
TODO: try to use Sqrt_extenison from package Number_type / Algebraic_foundations
2006-10-30 12:14:32 +00:00
Menelaos Karavelas 465743288b more name changes for variables called "small" 2006-08-25 07:49:50 +00:00
Menelaos Karavelas 8a694d7df0 renamed variable small to sdg_small; created conflict with
a macro defined when including windows.h
2006-08-24 07:17:08 +00:00
Menelaos Karavelas e5f4020b97 - added config.h file which defines the macro
CGAL_CFG_NO_OPERATOR_TIMES_FOR_SIGN; this macro is used for
  compatibility with CGAL 3.2.1
- added compatibility of svn head with CGAL 3.2.1
2006-08-09 16:44:12 +00:00
Menelaos Karavelas 9458e7423b removed default template parameters from storage traits with info 2006-08-02 10:20:33 +00:00
Menelaos Karavelas af5d902d96 added one more operator() in info converter; modified code to use
this new converter
2006-08-02 10:09:37 +00:00
Menelaos Karavelas 03c549b341 fixed problem created by deletion of files 2006-08-02 08:47:20 +00:00
Menelaos Karavelas 5732954651 - removed Point_container.h and Simple_container_wrapper.h; these
files are either unused or no longer needed
- modified storage traits to define const_Point_handle as well;
  modified Segment_Delaunay_graph_2 class to take all point handles
  from storage traits
2006-08-01 13:13:36 +00:00
Menelaos Karavelas 91c2227d19 changed some file names to match the names of the classes they contain 2006-08-01 12:38:07 +00:00
Menelaos Karavelas 3e41bec983 switched the order of the 2nd and 3rd template parameter in hierarchy 2006-07-31 20:53:51 +00:00
Menelaos Karavelas a292e6f268 - changed storage traits with info to take as first template parameter
the geometric traits instead of the base class
2006-07-31 14:32:06 +00:00
Menelaos Karavelas 6f67048440 - renamed storage traits related file names and classes; modified test
suite and demo according to changes
- added a couple more test data in test suites
- added example which demonstrates how to add info to sites
- added copyright headers when missing; modified year list in some
  copyright headers
2006-07-31 13:25:07 +00:00
Menelaos Karavelas 8e658f4fbd the bug fix for SunPro CC was missing a CGAL:: qualification 2006-07-29 05:36:00 +00:00
Menelaos Karavelas 15c409607d bug fixes due to recent changes and further rearrangement of code 2006-07-28 00:57:06 +00:00
Menelaos Karavelas 7714bf1d06 file restored; removed by mistake 2006-07-28 00:08:08 +00:00
Menelaos Karavelas 1ff30091db forgot to remove a file 2006-07-27 17:45:49 +00:00
Menelaos Karavelas 5540405767 - moved predicate code to SegmentDelaunayGraph_2 namespace
- removed unused code and corresponding files
2006-07-27 17:45:00 +00:00
Menelaos Karavelas eb95ceac81 minor changes and one more bug fix 2006-07-26 14:28:53 +00:00
Menelaos Karavelas 6996001e07 removed a legacy comment 2006-07-26 14:10:52 +00:00
Menelaos Karavelas ebc3c7554a fixed a couple minor bugs 2006-07-26 01:41:44 +00:00
Menelaos Karavelas a1a1bcd9d1 fixed a bug in info propagation; removed debugging print out 2006-07-26 01:15:37 +00:00
Menelaos Karavelas 79bc0c4e9f - fixed bug in hierarchy: the bug appeared in cases where the
hierarchy was inserting segments at higher levels and there were
  overlapping segments
- added support in hierarchy for info.
2006-07-26 00:54:29 +00:00
Menelaos Karavelas 1189ef4a86 removed unnecessary code 2006-07-26 00:32:47 +00:00
Menelaos Karavelas 9a2a6d51e8 removed copyright info for now 2006-07-25 13:00:32 +00:00
Menelaos Karavelas bdea5eed88 added/modified files according to new design; the hierarchy does not
work with info yet; some file names need to be changed
2006-07-25 12:52:16 +00:00
Menelaos Karavelas 27742008f8 - fixed errors created by the move of *.C files to *_impl.h 2006-05-27 10:56:12 +00:00
Menelaos Karavelas 7e55974218 - moved *.C files to Segment_Delaunay_graph_2/*_impl.h
- removed the check for automatic template inclusion
2006-05-25 10:40:20 +00:00
Menelaos Karavelas d08ee5cbe9 - fixed bug in undocumented insert method that takes two vertex
handles: the inserted segment was not registered in the input sites
  container.
  NOTE THAT THIS METHOD DOES NOT BEHAVE CORRECTLY WHEN SEGMENTS ARE
  ALLOWED IN UPPER LEVELS OF THE HIERARCHY: THE CURRENT VERSION OF
  THIS METHOD FOR THE HIERARCHY ONLY INSERTS AT THE LOWER LEVEL.
2006-05-14 21:49:19 +00:00
Menelaos Karavelas 1eb2798900 - put the Arrangement_type output operator inside a #ifdef-#endif
block to avoid the warning. The macro that enables the output
  operator is called:
  CGAL_SEGMENT_DELAUNAY_GRAPH_2_ARRANGEMENT_TYPE_OUTPUT_OPERATOR
2006-05-02 08:41:44 +00:00
Menelaos Karavelas 10b4b3b1a2 fixed bug in CGAL/Segment_Delaunay_graph_2/Arrangement_type_C2.h
reported by: Bernhard Kornberger <bkorn@ist.tugraz.at> and related to the
definition of operator<< for Sdg_arrangement_enum::Arrangement_type.
2006-04-18 14:18:05 +00:00
Menelaos Karavelas 7a672dec6f - "fixed" code/testsuite when run with a number type that does not
support / and sqrt ("fixed" here means that the code still runs but
  operations are no longer exact; the operations that are not exact
  are only used for constructions, not for predicates)
2006-03-09 18:19:15 +00:00
Menelaos Karavelas 70ae2964dd attempt to fix warnings in examples for g++ 3.3.x 2006-03-09 16:49:25 +00:00
Laurent Saboret db6a8f948c Change CVS keywords to SVN style 2006-02-16 14:30:13 +00:00
Menelaos Karavelas 49e6d0bec1 added insert method that takes two vertex handles.
the method is not supposed to be used with the hierarchy that
has segments on the upper levels (not yet at least)
2006-02-15 12:27:44 +00:00
Laurent Saboret 1aad55d4cb Change CVS keywords to SVN style 2006-02-14 10:08:15 +00:00
Laurent Saboret 66a5a7d140 Move packages to trunk root 2006-02-14 08:58:19 +00:00