Commit Graph

243 Commits

Author SHA1 Message Date
Sébastien Loriot 81f8f69ffe merge from next 2011-04-28 18:44:10 +00:00
Laurent Rineau 3c02e07b23 Try to fix my last revision about cmake_policy, with CMake-2.6.x
CMake gives an error if one tries to use cmake_policy(VERSION x.y.z) if
x.y.z is greater than the current CMake version.
2011-04-28 17:45:22 +00:00
Laurent Rineau c97205f085 Global handling of CMake policies (second part)
We declare 
  cmake_minimum_required(VERSION 2.6.2)
but we also use
  cmake_policy(VERSION 2.8.4)
to declare that our CMake scripts are OK with all the defaults of CMake policies
as of CMake-2.8.4. That shuts down the warnings of CMake-2.8.4.

That way, we no longer need any declaration of specific policies.

Those two lines must be present and maintained in all our CMakeLists.txt
files (the one for the libraries, and also the one for examples and demos,
and maybe tests).
2011-04-28 10:55:56 +00:00
Laurent Rineau 0631943153 Uniform capitalization in our CMake script: use lowercase for commands 2011-04-28 10:36:18 +00:00
Sébastien Loriot b365ee3416 merge next into branch 2011-04-28 09:01:01 +00:00
Laurent Rineau 6f05e72cef Global maintenance of CMakeLists.txt: CMake minimal version is -2.6.2
The documentation of CGAL says that the minimal version of CMake must be
CMake-2.6.2.
  - change cmake_minimum_required to VERSION 2.6.2
  - no longer any need for the policy CMP0003 (was for 2.4.x)
  - no longer any need for CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS (was for 2.4)
2011-04-27 18:06:32 +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
Andreas Fabri 87abd89944 No need for #include <CGAL/basic.h> 2011-03-14 13:10:01 +00:00
Andreas Fabri b7892ade1f undo previous commit 2011-03-14 13:07:25 +00:00
Andreas Fabri 49b29bf6c8 No need to #include <CGAL/basic.h> 2011-03-13 17:03:43 +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
Laurent Rineau da95064578 Update the \ccPkgHowToCiteCgal tag for CGAL-3.8 (2011). 2011-02-24 15:21:10 +00:00
Laurent Rineau d3f278494f Add a README.txt that explains where is the demo for this package. 2010-07-12 13:01:25 +00:00
Laurent Rineau 9479c2605e Remove the demo/ sub-directory from CGAL tarball: a new demo is in GraphicsView/demo/Segment_Delaunay_graph 2010-07-12 13:00:17 +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 b4fcf0472d removed experimental part of the code from the trunk 2010-05-12 11:13:45 +00:00
Menelaos Karavelas 17463fae28 removed experimental code from branch 2010-05-12 10:46:05 +00:00
Sébastien Loriot 47a76e1cca correct leda include filename 2010-05-10 09:04:07 +00:00
Menelaos Karavelas ff0d2411be updated double.cpp to be able to use the new traits with static filters 2010-04-22 07:54:54 +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 5283d51ab0 modifications that have to do with the addition of the in-place edge list in tds data (face data) 2010-03-29 20:06:19 +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 f241949810 now using an in-place edge list for the boundary of the conflict region; 2010-03-16 14:43:07 +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
Andreas Fabri ac3c4b70fd Towards a benchmark without filtering 2010-03-15 08:09:08 +00:00
Menelaos Karavelas 91ac62a576 commented CGAL_PROFILE 2010-03-08 20:25:33 +00:00
Menelaos Karavelas 2c5e23bfca added some macros for controlling the behavior of bechmarking;
added option to use Gmpq if leda::real is not present
2010-03-08 20:12:37 +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