songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
59,293 Commits 3 Branches 156 Tags 963 MiB
Commit Graph

729 Commits

Author SHA1 Message Date
Laurent Rineau b6ffa7c425 Merge branch 'CGAL-fix_warnings-GF' 
That branch was successfully tested in CGAL-4.2-Ic-205.
 2013-03-27 12:23:31 +01:00
Andreas Fabri 8a45fcea5a Merge branch 'OLD' into Triangulation_2-NewPolylineConstraint-GF 
Conflicts:
	Triangulation_2/doc/Triangulation_2/Triangulation_2.txt
 2013-03-21 13:41:53 +01:00
Sébastien Loriot 9fcf46e11a replace CGAL_[kernel/qpe/triangulation/]_assertion by assert in tests 
this should be the case, following our guidelines.

using:
find */test/* -name '*.[hc]*' | xargs sed -i 's/CGAL_assertion/assert/g'
 2013-03-21 10:50:55 +01:00
Laurent Rineau 6026df138a Fix mis-compilations of Triangulation_2 with -O3 -DCGAL_NDEBUG 
With recent g++ versions, when -DCGAL_NDEBUG and -O3 was in the compilation
flags, my patch using 'CGAL_assume' triggered mis-compilation of cases
where the dimension() was 1, for all uses of the following pattern:

  CGAL_assume(i>=0 && i<= 1);
  [...] 1-i [...]

The fix is to use "(i==0)?1:0" instead.
 2013-03-19 14:29:18 +01:00
Andreas Fabri 67226de083 use CGAL::compare instead of compare to avoid Koenig lookup 2013-03-15 16:25:05 +01:00
Alexandros Konstantinakis-Karmis 3b1d281efb Abbreviations trigger end of \brief description 
Fixes bug #15482:
https://gforge.inria.fr/tracker/index.php?func=detail&aid=15482&group_id=52&atid=13845
 2013-03-13 11:58:56 +01:00
Sébastien Loriot e991fe72ad really add last missing classified reference manual pages 2013-03-13 10:57:01 +01:00
Andreas Fabri 950e858555 remove unused parameters 2013-03-12 09:50:46 +01:00
Laurent Rineau 7ce5bd0a10 Fix a typo in the doxygen doc of Triangulation_2::is_edge 
Fixed bug #15472:

https://gforge.inria.fr/tracker/?func=detail&atid=13845&aid=15472&group_id=52
 2013-03-11 10:47:03 +01:00
Andreas Fabri b3dafd588a Merge branch 'master' of ssh://scm.cgal.org/var/git/cgal 2013-03-08 11:50:42 +01:00
Andreas Fabri 770256c3ef fix doc of enum 2013-03-07 14:30:41 +01:00
Laurent Rineau ef37a934a6 Fix warning "_ri may be used uninitialized" 2013-02-27 19:35:56 +01:00
Laurent Rineau 403031ce7f Fix warnings 2013-02-27 18:21:24 +01:00
Andreas Fabri c7e68385be remove unused variables and #if 0 buggy non used code 2013-02-26 16:52:55 +01:00
Laurent Rineau 2d8da664a3 Merge branch 'CGAL-fix_warnings-gdamiand' 
Conflicts:
	.gitignore
	Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt
 2013-02-22 13:02:37 +01:00
Laurent Rineau 66c5d23154 Use CGAL_assume to remove warnings 2013-02-20 18:55:43 +01:00
Laurent Rineau 26a7e70785 New license.txt files (eol changes) 
The new version 2.13.0 of licensecheck has changed the spaces at eol.
 2013-02-19 16:46:39 +01:00
Sébastien Loriot e9e31dc6f3 remove unused file 2013-02-19 13:57:41 +01:00
Andreas Fabri 2740aa9c05 use size_type instead of int 2013-02-07 15:16:03 +01:00
Andreas Fabri c6dd56cf0f suppress a warning. The hypothetical problem cannot occur 2013-02-07 15:15:27 +01:00
Andreas Fabri 462ad57712 Remove a declaration without definition 2013-02-07 15:13:48 +01:00
Andreas Fabri 61bb99e2f1 use types 2013-02-04 22:39:00 +01:00
Andreas Fabri 13bac84716 less warnings in various packages 2013-02-01 10:27:07 +01:00
Andreas Fabri 93e7fe275b less warnings in Triangulation_3 2013-01-31 15:50:13 +01:00
Andreas Fabri 53200a4dfb explain example 2013-01-28 13:56:34 +01:00
Sébastien Loriot d34b150e36 using cgalFigureRef instead of ref fig__ 2013-01-24 11:26:16 +01:00
Sébastien Loriot f2d0cc34cd add implementation note in template alias declaration 2013-01-24 11:24:40 +01:00
Sébastien Loriot 6f60be121b fix wrong figure ref 2013-01-24 08:56:09 +01:00
Sébastien Loriot 2444c08a86 move TDS_2::Vertex and TDS_2::Face concepts outside of the class 
this allows to define the nested typedefs of the same name.
 2013-01-24 08:51:57 +01:00
Sébastien Loriot d4f5f4569b using template alias declaration to inline the rebind classes 2013-01-24 08:37:55 +01:00
Andreas Fabri 8700a37c43 improve example 2013-01-23 15:46:44 +01:00
Andreas Fabri f83ed94229 A first pass over the user manual 2013-01-22 17:53:43 +01:00
Andreas Fabri e23c0d32b2 Add doxygen version of Polyline_constrained_triangulation_2.h 2013-01-21 16:43:07 +01:00
Andreas Fabri f9cd5ec08a Merge remote-tracking branch 'origin/Triangulation_2-NewPolylineConstraint-GF' into Triangulation_2-NewPolylineConstraint-GF 
Conflicts:
	.gitattributes
 2013-01-21 14:33:33 +01:00
Andreas Fabri b307771892 bug fix for natural_neighbor_coordinates_2 using a small feature in the conflict zone functions of Delaunay_triangulation_2 2013-01-08 12:34:37 +01:00
Sébastien Loriot 5ec28b1cf4 replacing the usage of section in user man by \cgalHeading macro call 2013-01-07 18:04:37 +01:00
Sébastien Loriot 9631c3444c name link to chapters 2013-01-02 23:00:56 +01:00
Andreas Fabri 610de5e0ea polish TDS_2 2012-12-28 21:46:44 +01:00
Andreas Fabri 073bc9794f polish TDS_2 2012-12-28 21:28:58 +01:00
Claudia Werner ef3648433f fix typo in user manual in constrained Delaunay Triangulations. 2012-12-21 11:16:56 +01:00
Philipp Möller 0f34f2a89e Merge branch 'Maintenance-include-less-boost-pmoeller' 2012-12-21 09:44:18 +01:00
Sébastien Loriot 41362b6b57 Merge branch 'triangulation_2-cstr_using_ranges' 2012-12-21 08:42:25 +01:00
Sébastien Loriot c53825f4a3 Merge branch 'Triangulation_2-correct_filtered_traits_selection' 2012-12-21 08:37:57 +01:00
Sébastien Loriot 4c8c87f241 Merge branch 'remove_cpp0x' 2012-12-21 08:36:26 +01:00
Sébastien Loriot 84caad7137 using the regular triangulation filtered traits using flags in the kernel 2012-12-20 16:12:38 +01:00
Sébastien Loriot 59f9e8a778 add constructor from range for 2D Delaunay and Regular triangulation 2012-12-19 17:10:57 +01:00
Marc Glisse 4cc6c7a76d Typo in the doc. 2012-12-19 15:55:23 +01:00
Sébastien Loriot 82b2ebc865 apply the cpp0x namespace renaming in all files 2012-12-19 11:33:17 +01:00
Sébastien Loriot 652dbdf040 add an example to copy 2D triangulations with different traits types 2012-12-19 10:55:57 +01:00
Sébastien Loriot 09e42c760e fix source vertex and face types 2012-12-19 10:52:56 +01:00
Sébastien Loriot d0f1090611 add documentation for tds2 copy_tds 2012-12-19 10:43:48 +01:00
Sébastien Loriot 853c658a18 add copy_tds with converter in TDS2 2012-12-19 10:15:03 +01:00
Philipp Möller 71ea8e6e22 Minimal boost includes 
Replace type_traits.hpp and utility.hpp with the respective
fine-grained includes.
 2012-12-14 18:13:59 +01:00
Philipp Möller 75f69570dc Change the titles of mainpages to "User Manual" 
This leads to a slightly odd result in the search for "User Manual",
but makes the pages themselves more consistent.
 2012-12-13 14:47:09 +01:00
Sébastien Loriot 4ec9529581 Merge branch 'doxy-port-pmoeller' 
Conflicts:
	.gitattributes
	Surface_reconstruction_points_3/include/CGAL/Poisson_reconstruction_function.h
	Surface_reconstruction_points_3/include/CGAL/Reconstruction_triangulation_3.h
	Surface_reconstruction_points_3/include/CGAL/k_nearest_neighbor.h
 2012-11-27 10:05:41 +01:00
Sébastien Loriot 9576be3c3b add doc in dont_submit 2012-11-27 08:42:02 +01:00
Sébastien Loriot 920eb63882 backporting documentation changes of master@9fcc5b57 into doxy-port-pmoeller 
Conflicts:
	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/CGAL/Arr_linear_traits_2.h
	Installation/doc_tex/Installation/usage.tex
	Kernel_23/doc/Kernel_23/CGAL/Projection_traits_xy_3.h
	Mesh_2/doc/Mesh_2/Concepts/ConformingDelaunayTriangulationTraits_2.h
	Spatial_searching/doc/Spatial_searching/CGAL/Incremental_neighbor_search.h
	Spatial_searching/doc/Spatial_searching/CGAL/K_neighbor_search.h
	Spatial_searching/doc/Spatial_searching/CGAL/Orthogonal_incremental_neighbor_search.h
 2012-11-23 22:54:31 +01:00
Sébastien Loriot 6cc7d66415 Revert "Replace tex-style quotes with quotes that you would expect, as there" 
This reverts commit e65a8028ea.

Conflicts:
	Approximate_min_ellipsoid_d/doc_tex/Bounding_volumes_ref/Approximate_min_ellipsoid_d.tex
	Approximate_min_ellipsoid_d/documentation/mel.tex
	Documentation/doxyassist.xml
	Installation/doc_tex/Installation/usage.tex
	Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/MinSphereOfSpheresTraits.tex
	Optimisation_doc/doc_tex/Bounding_volumes/user_part.tex
	Optimisation_doc/doc_tex/Inscribed_areas/user_part.tex
	Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex
 2012-11-23 18:08:13 +01:00
Sébastien Loriot 7cd0e93fa9 Revert "Merge the changes to ccPrecond and ccPostcond that have been in" 
This reverts commit b529971917.

Conflicts:
	Approximate_min_ellipsoid_d/doc_tex/Bounding_volumes_ref/Approximate_min_ellipsoid_d.tex
	Matrix_search/doc_tex/Polytope_distance_d_ref/spec_all_furthest_neighbors.tex
	Min_annulus_d/doc_tex/Bounding_volumes_ref/Min_annulus_d.tex
	Min_circle_2/doc_tex/Bounding_volumes_ref/Min_circle_2.tex
	Min_ellipse_2/doc_tex/Bounding_volumes_ref/Min_ellipse_2.tex
	Min_quadrilateral_2/doc_tex/Bounding_volumes_ref/spec_oops.tex
	Min_sphere_d/doc_tex/Bounding_volumes_ref/Min_sphere_d.tex
	Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/MinSphereOfSpheresTraits.tex
	Min_sphere_of_spheres_d/doc_tex/Bounding_volumes_ref/Min_sphere_of_spheres_d.tex
	Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Taucs_matrix.tex
	Surface_mesh_parameterization/doc_tex/Surface_mesh_parameterization_ref/Taucs_symmetric_matrix.tex
	Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_triangulation_2.tex
	Width_3/doc_tex/Polytope_distance_d_ref/Width_3.tex
 2012-11-23 18:04:33 +01:00
Sébastien Loriot ae8362b7d6 replace \cgalModels ::FOO by \cgalModels `FOO` 
using:
 perl  -pi -e 's/\\cgalModels\s+::([A-Za-z0-9_:]+)\s*$/\\cgalModels `$1`\n/'
 2012-11-23 09:37:53 +01:00
Andreas Fabri eb41ac1765 typo 2012-11-22 09:54:22 +01:00
Andreas Fabri d8ab8d3181 typo 2012-11-21 14:10:08 +01:00
Andreas Fabri c7dc4a8bcd Switch to \tparam 2012-11-21 14:04:46 +01:00
Andreas Fabri b14cfce8cd polish T2 2012-11-21 11:18:36 +01:00
Andreas Fabri 3914ad9042 fix linking 2012-11-21 10:01:47 +01:00
Andreas Fabri 733699d0ed Improve \brief descriptions of all methods 2012-11-20 22:39:57 +01:00
Sébastien Loriot 37049cab1b incomplete macro 2012-11-19 15:41:43 +01:00
Sébastien Loriot 8d741d504d remove % in section name 2012-11-14 16:10:15 +01:00
Sébastien Loriot 128b02abb8 update CGAL custom doxygen macros 
corresponds to a run of the script Documentation/conversion_tools/rename_macros.sh
+manual edit of doxyassist.xml and pkglist_filter.py
 2012-11-14 00:31:05 +01:00
Sébastien Loriot 5ee1081f92 using cgal macros for all figures 2012-11-08 17:17:29 +00:00
Laurent Rineau 96319a1365 reintegrate '^/branches/features/Triangulation_2_UseTraitsInHierarchy-GF' 2012-11-07 14:59:00 +00:00
Sébastien Loriot ae159cbdf3 replace markup #, ##, ### by \section, \subsection and \subsubsection 
(script replacement)
 2012-11-06 22:02:15 +00:00
Sébastien Loriot ef81760b85 macro renaming 2012-11-02 08:58:21 +00:00
Laurent Rineau ef5b895a93 merge from next 2012-11-02 08:49:12 +00:00
Sébastien Loriot 6ff851e791 macro renaming 2012-11-02 08:44:08 +00:00
Andreas Fabri 7a6634b5a7 No need for CGAL:: in user manuals 2012-10-31 20:11:16 +00:00
Sébastien Loriot 6da5e9e84d unrecursive version of propagating_flip and propagate_conflicts 
for CDT2 and DT2 using 100 recursive calls before switching to
a local stack in a function.
 2012-10-30 13:16:52 +00:00
Philipp Möller 31a3c07418 Turn \refines :: into \refines `X` globally 2012-10-25 09:48:39 +00:00
Sébastien Loriot 9f14f937ab update benchmark 2012-10-24 22:14:21 +00:00
Sébastien Loriot 720244f8f8 apply the same choice as the one made in r73262 for CDT_2 2012-10-24 21:39:38 +00:00
Sébastien Loriot cd165546fc Remove all alternatives to propagating_flip to keep one that allow to use the call 
stack for at most 100 recursive calls and switch to a non-recursive function
that uses a local std::stack to emulate the call stack.

Benchmarks show the following results:

7 runs on 10,000,000 random in unit circle points

43.67074 : Old implementation
43.91474 : use stack for 100 first call then non-recursive with stack
44.07075 : use stack for 100 first call then non-recursive with vector
44.57079 : Local vector
45.0068 : Local stack
45.87886 : Local fixed size array
46.3829 : Local "home-made" small vector
53.41534 : Thread-local vector
 2012-10-24 21:35:17 +00:00
Andreas Fabri 4486d2f912 \refines must be backquoted in order to be typeset as code 2012-10-24 19:36:25 +00:00
Sébastien Loriot a7b02bd716 merge experimental-packages/Triangulation_2-unrecursive 2012-10-24 09:26:32 +00:00
Andreas Fabri dc36e89e17 improve doc of rebind; cleanup 2012-10-24 08:31:40 +00:00
Philipp Möller 31e9eadf8b Fix all PackageDescriptions to a newer layout 2012-10-19 15:52:31 +00:00
Andreas Fabri 03ea3409ca pretty much finished, but let package owner have another pass 2012-10-15 15:22:22 +00:00
Andreas Fabri 1f7df8213f pretty much finished, but let package owner have another pass 2012-10-15 15:03:02 +00:00
Laurent Rineau 373e963d2a Fix refs. The label were wrong. 2012-10-04 08:42:36 +00:00
Andreas Fabri b8b7a5dad3 get rid of spurious XX 2012-10-03 17:02:54 +00:00
Philipp Möller bc48dfe5a0 Be consistent about author/authors 2012-10-03 16:40:16 +00:00
Andreas Fabri 16992d9713 change link for \ccDepends 2012-10-03 11:00:43 +00:00
Andreas Fabri 65185d5049 linking 2012-10-03 07:51:01 +00:00
Andreas Fabri df29524d6e polish 2012-10-03 07:42:25 +00:00
Philipp Möller 272a52ee44 Do a global pass over Doxygen warnings/errors. 2012-10-02 15:12:54 +00:00
Philipp Möller c9fdbf3edb Add an anchor to each level one heading, so we get a nice tree in the 
user manuals.
 2012-10-02 11:53:01 +00:00
Philipp Möller 37778547bf Fix example to point to paths similar to a flat layout 2012-10-01 18:02:44 +00:00
Philipp Möller 9d96057636 Add PkgDependsOn to the package summary 2012-09-27 11:13:37 +00:00
Philipp Möller b64ba48134 The changes to move the package overview labels into the 
PackageDescription.
 2012-09-25 17:17:49 +00:00
Philipp Möller 128c228b4a Remove some glitches in Arrangement_2. 
Exclude some symbols to end up with a nicer index.
 2012-09-21 14:56:17 +00:00
Philipp Möller 0aa7cd1c3b Global heading reduction. Rename some Parameter section to Template 
Parameters. Fix dependencies.
 2012-09-21 09:42:24 +00:00
Philipp Möller 1954eff3d6 * build normalized mainpage anchors 
* better naming for Pkg commands
* User and Reference Manual links from the PackageOverview
 2012-09-20 15:30:03 +00:00
Philipp Möller 1b3a78a08f Salvage the demo information from the old package description. 2012-09-20 13:30:49 +00:00
Andreas Fabri 6f61e2b2ee Downsize headings 2012-09-17 14:53:05 +00:00
Philipp Möller 864aebe2e5 Merge next. 
This commit also updates the respective mock-headers when the
corresponding .tex documentation has changed. This has been the case for:

AABB_tree/doc_tex/AABB_tree_ref/AABBGeomTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABBTraits.tex
AABB_tree/doc_tex/AABB_tree_ref/AABB_traits.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_features.tex
Mesh_3/doc_tex/Mesh_3_ref/parameters_no_features.tex
Number_types/doc_tex/NumberTypeSupport_ref/Interval_nt.tex
Number_types/doc_tex/NumberTypeSupport_ref/Lazy_exact_nt.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_2.tex
Spatial_searching/doc_tex/Spatial_searching_ref/Search_traits_3.tex
Triangulation_2/doc_tex/Triangulation_2_ref/Constrained_Delaunay_triangulation_2.tex
 2012-09-12 14:14:22 +00:00
Philipp Möller 2d8931167f autoexamples 2012-08-29 16:20:55 +00:00
Philipp Möller 5a0a5403c4 Enable autotoc on mainpages 2012-08-29 15:45:17 +00:00
Andreas Fabri 416ffceb9a Subgroup so that the reference manual page becomes better structured 2012-08-29 14:56:48 +00:00
Philipp Möller b153ceb50c Proper documentation for Rebind_* 2012-08-29 08:55:26 +00:00
Philipp Möller e2616dafb1 Rebuild the how_to_cite structure 2012-08-28 17:33:45 +00:00
Andreas Fabri 1e513efc75 fix link 2012-08-27 12:47:22 +00:00
Andreas Fabri 9415b2b1c2 fix of class name 2012-08-27 12:11:51 +00:00
Andreas Fabri fe8dba062d fix linking in \hasModel by backquoting 2012-08-27 12:09:11 +00:00
Andreas Fabri df377c5631 fix linking in \hasModel by backquoting 2012-08-27 12:08:15 +00:00
Andreas Fabri 74d761fe19 fix linking in \has Models by backquoting and prefixing with CGAL namespace 2012-08-27 09:09:57 +00:00
Philipp Möller 76aacb1add Change created package names to be the pretty printed version instead 
of the readable, short, easy-to-remember SVN version.
 2012-08-23 17:00:30 +00:00
Andreas Fabri b6ed6e766f combine images; wording, whitespace 2012-08-23 09:49:10 +00:00
Andreas Fabri d34b0143e0 combine two images in one so that we can use \image 2012-08-23 09:42:20 +00:00
Andreas Fabri 36636cc264 typos 2012-08-22 19:46:43 +00:00
Philipp Möller b85624f7fb Add Triangulation_2 2012-08-22 16:14:22 +00:00
Andreas Fabri 5592ddea60 more wording 2012-08-22 15:26:14 +00:00
Andreas Fabri 160f02de02 images, wording,.. 2012-08-22 15:15:38 +00:00
Philipp Möller 907d497eab Add TDS_2 2012-08-22 13:28:48 +00:00
Laurent Rineau 2db4effa7e CMake: Fix the handling of cmake_policy 
That is a followup-to my commit last year:
  | ------------------------------------------------------------------------
  | r63198 | lrineau | 2011-04-28 19:45:22 +0200 (Thu, 28 Apr 2011) | 5 lines
  | 
  | 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.
  | 
  | ------------------------------------------------------------------------

The following check:
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6)
is useless just after a call to:
 cmake_minimum_required(VERSION 2.6.2)



The script used to fix that was:


#!/usr/bin/env perl

$replacement=<<'END';
if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER 2.8.3)
  cmake_policy(VERSION 2.8.4)
else()
  cmake_policy(VERSION 2.6)
endif()
END

while(<>) {
    if(/if\("\${CMAKE_MAJOR_VERSION}.\${CMAKE_MINOR_VERSION}" VERSION_GREATER 2.6\)/) {
        while(<>) {
            if(/^endif\(\)/) {
                print "$replacement";
                while(<>) {
                    print;
                }
                exit 0
            }
        }
    }
    print;
}
 2012-08-22 12:35:03 +00:00
Sébastien Loriot 5c4ae5d477 windows mixes up Fb template parameter with nested Fb type from base class 2012-08-22 06:48:49 +00:00
Laurent Rineau 60b0d8cc51 Typo in the documentation: add a line break 2012-08-10 10:54:54 +00:00
Eric Berberich 357d6258f5 cmake's link_libraries is deprecated 
removed almost all occurenced (missing UseFiles). While
doing so, some CMakeLists.txt could also be simplified. In fact
many more CMakeLists.txt can be simplified, in one of two ways:
1) add external libs to CGAL_3RD_PARTY_LIBRARIES and
2) call cgal_create_single_source_program
 2012-08-03 22:32:39 +00:00
Philipp Möller e65a8028ea Replace tex-style quotes with quotes that you would expect, as there 
is no way to handle them in the converter.

Needs to be revert before this is being merged into next.
 2012-08-02 12:55:15 +00:00
Laurent Rineau db194534c7 First big patch to fix -Wunused-local-typedefs 
-Wunused-local-typedefs is a new warning flag of gcc-4.7, and it will enabled
 by -Wall since gcc-4.8 (not yet released).

The fix is a big set of removals of unused typedefs (or comments, or moves,
depending on the context).
 2012-08-01 13:29:16 +00:00
Marc Glisse a758751485 Remove / comment out unused local typedefs. Fix one place where FT was used instead of RT (homogeneous coordinates, probably never compiled). 2012-07-28 06:21:06 +00:00
Philipp Möller 495fac8ea1 Merge from next 2012-07-27 17:58:52 +00:00
Sébastien Loriot 3e750c6fd7 temporary hack to work around assertion 2012-07-17 12:08:49 +00:00
Laurent Rineau 61ff95f149 Add a test of CDT_plus_2 with the Projection_traits_xy_3 2012-06-28 09:56:06 +00:00
Laurent Rineau 49404f75f5 Improved patch 
The Constraint_hierarchy is now templated by T, an anonymous type (that is
a Vertex_handle when the constraint hierarchy is used in Ct_plus_2), and a
Compare operator, that have a comparison member function:
  bool operator()(T, T);

In Ct_plus_2, the Compare operator passed to the Constraint_hierarchy
compares the vertices with a Less_xy_2, implemented by Less_x_2, and
Less_y_2.

The test test/Triangulation_2/include/CGAL/_test_cls_hierarchy_2.h has been
tweaked, to check that the type T passed in the hierarchy no longer needs
to have a point() member function, as it was before May 2010 (when GF has
determinized the Cdt_plus_2 using too simple patch).
 2012-06-28 09:16:23 +00:00
Andreas Fabri c72a3769d0 Put variables in \ccc{} 2012-06-26 17:10:52 +00:00
Andreas Fabri e3c9837be9 fix typo in ref man page 2012-06-26 14:45:46 +00:00
Andreas Fabri 7cb640d05d The Constraint_hierarchy_2 gets an additional LessXY_2 functor as template argument so that it no longer applies operator<(Point,Point) 2012-06-25 10:11:56 +00:00
Philipp Möller 67fdbf93d1 Prevent spurious warning in the test-suite. Leave the one that is 
actually suspicious.
 2012-06-22 11:52:14 +00:00
Philipp Möller b529971917 Merge the changes to ccPrecond and ccPostcond that have been in 
features/doxy-pmoeller and add changes for ccRequires on top of it.

ATTN: This changeset should be unmerged before the whole branch goes
      back into next.
 2012-06-20 13:57:36 +00:00
Philipp Möller 5f6b09c484 Fix types of loop counters to size_t. 2012-06-20 09:15:34 +00:00
Laurent Rineau f4b3f4361f Remove a warning about deprecated header 
We test the deprecated headers on purpose, so one can define
CGAL_NO_DEPRECATION_WARNINGS.
 2012-06-18 13:21:10 +00:00
Sébastien Loriot 5c5abd05f0 make it deterministic 2012-06-14 11:24:55 +00:00
Sébastien Loriot cb0b8a628e add benchmark for cdt2 with intersecting constraints 2012-06-14 10:47:21 +00:00
Sébastien Loriot 19857458b6 deprecation warnings 2012-05-28 07:28:03 +00:00
Menelaos Karavelas 9201c1f2c3 implementation and documentation for the Rebind_vertex and Rebind_face small 
feature of the TDS_2 concept.
The release manager has approved the commit directly into the next branch.
 2012-05-24 14:07:56 +00:00
Philipp Möller 8529612009 Drop some never implemented members from the hierarchy. 
Remove keep_points from PCT and PHierarchy.
Document the effect of the fixed member in simplify.
 2012-05-14 13:09:03 +00:00
Philipp Möller a3ae98b371 Add a range overload for insert_constraint and document it. 
Fix the return types in the documentation. 
Add both overloads of push_back to be more similar to C_t_plus
 2012-05-14 12:10:16 +00:00
Philipp Möller bd81c4fe68 Minor copy&paste fix 2012-05-11 15:14:02 +00:00
Philipp Möller af62f9848b constness, insert pair<Point, Point>, Self typedef 2012-05-11 13:27:17 +00:00
Philipp Möller 699f25b793 Missing const qualifier, typo. 2012-05-11 13:09:24 +00:00
Philipp Möller b0289c6105 Added concept and requirements for the new VertexBase. Documented the 
boilerplate vertexbase class. Removed two, now unnecessary functions
from Polyline_constrained_triangulation.
 2012-05-11 12:41:59 +00:00
Philipp Möller c72b426896 Propagated that change up through the hierarchy. (*it)-> syntax for 
Vertex_it still feels a little bit awkward but is the best we can get.
 2012-05-10 16:02:11 +00:00
Philipp Möller 918a6084ab Node is now entirely encapsulated. 2012-05-10 14:26:46 +00:00
Philipp Möller a2c0e017e3 Dropped the H_ prefix and purged some typedefs. 2012-05-10 13:53:43 +00:00
Philipp Möller cfea03d54b Dropped out-dated examples, simplify.cpp example compiles. 2012-05-10 13:35:00 +00:00
Philipp Möller 9464dccbb5 Clean up and Node conversions. 2012-05-10 09:51:09 +00:00
Philipp Möller 3c98b60509 Removed simplification from this package. 2012-05-09 15:38:28 +00:00
Philipp Möller 092f09e490 Replaces Squared_distance_cost with the version from the Triangulation_2 package. 2012-05-09 15:36:59 +00:00
Philipp Möller 57417b0050 Removed executable property. 2012-05-09 15:34:38 +00:00
Philipp Möller 38228d6982 Added conversions to Skiplist, integrated it somewhat into 
constraint_hierarchy, merged some code there and added a Default to
the triangulation.
 2012-05-09 13:39:36 +00:00
Philipp Möller 9a3b53ccd5 Remove executable properties from examples. 2012-05-09 10:30:41 +00:00
Philipp Möller 9d91dcc2ef proper naming 2012-05-04 16:24:30 +00:00
Philipp Möller f43213905b Removed unnecessary include. 2012-05-04 16:22:23 +00:00
Philipp Möller 328e59e04e A vertex base for Polyline_constraint_hierarchy 2012-05-04 15:55:02 +00:00
Philipp Möller da6f1be1d2 Typenamified constrained_triangulation, partially integrated skiplist 2012-05-04 13:39:22 +00:00
Andreas Fabri f9489d4dc5 insert_polyline ->insert_constraint 2012-05-03 15:10:34 +00:00
Andreas Fabri e2b039379b Add remove_points_from_constraints 2012-04-26 11:36:13 +00:00
Andreas Fabri 97949be7cb Add remove_points_from_constraint 2012-04-26 11:31:04 +00:00
Andreas Fabri e650998cc3 code follows doc 2012-04-26 09:41:56 +00:00
Andreas Fabri 2753f9129c cleanup 2012-04-26 09:39:34 +00:00
Andreas Fabri 64f7917691 cleanup 2012-04-26 09:31:45 +00:00
Andreas Fabri 91fb2c42ed fix return type 2012-04-24 20:49:35 +00:00
Andreas Fabri ae4fe4c98a Remove functions not needed for polyline simplification 2012-04-24 15:32:16 +00:00
Andreas Fabri b65e7dd556 Remove functions not needed for polyline simplification 2012-04-24 15:31:55 +00:00
Andreas Fabri 8307828fb4 Add a precondition 2012-04-24 15:19:15 +00:00
Andreas Fabri 766c9a3e00 clean API 2012-04-24 15:00:58 +00:00
Laurent Rineau a8473dfe08 Document the destructor is ugly and useless 2012-04-23 18:03:14 +00:00
Andreas Fabri 75ba21c54d Add Polyline_constrained_triangulation_2 2012-04-23 15:08:43 +00:00
Andreas Fabri 99df757657 fixed typos 2012-04-23 10:46:02 +00:00
Andreas Fabri 2fa2b40950 remove simplify.cpp 2012-04-20 22:46:43 +00:00
Andreas Fabri bf657edffc Duplicate and modify functions as they are more efficient 2012-04-20 22:31:23 +00:00
Andreas Fabri 5ef4ece198 Remove text about polyline simplification again 2012-04-20 22:28:50 +00:00
Andreas Fabri ae542c172c Add example for Polyline_constrained_triangulation_2 2012-04-20 15:55:43 +00:00
Andreas Fabri 92c079ee21 example for the user manual 2012-04-20 15:45:38 +00:00
Andreas Fabri 99df55d6bf Keep a trace of how we want to implement it 2012-04-20 15:45:03 +00:00
Andreas Fabri 8707e661e2 Add platelet.png 2012-04-20 15:21:17 +00:00
Andreas Fabri 733245d65d Document the simplification API 2012-04-20 14:19:30 +00:00
Andreas Fabri c6f52eab41 Add a \section for Polyline_constrained_triangulation_2 2012-04-20 13:25:33 +00:00
Andreas Fabri b8c0aca6f5 Add PCT to the ref manual 2012-04-20 13:09:07 +00:00
Andreas Fabri 6728cca53c Add API of Polyline_constrained_triangulation 2012-04-20 13:06:16 +00:00
Andreas Fabri bb90f43b61 Fix typo 2012-04-20 13:05:39 +00:00
Andreas Fabri bbbb0cc5d0 Add ref man page of Polyline_constrained_triangulation_2 2012-04-20 11:01:37 +00:00
Andreas Fabri 2f06819c2e Fix typo 2012-04-20 10:52:33 +00:00
Andreas Fabri 271f52dbd4 Add an error function for polyline simplification 2012-04-20 10:33:46 +00:00
Andreas Fabri 4f268bfcde Add an example for topologically correct polyline simplification. 
For now the priority queue, and the whole algorithm are in the example
code, but this code will later become a member function of the
class Polyline_constrained_triangulation_2
 2012-04-20 10:14:42 +00:00
Andreas Fabri c19ff964b2 Add files for Polyline_constrained_triangulation_2 2012-04-20 10:11:18 +00:00
Andreas Fabri c8c67ab24c Add insert_constraint(Vertex_handle vaa, Vertex_handle vbb, OutputIterator out) 2012-04-20 10:10:08 +00:00
Philipp Möller cdf47795ba Fixed a small memory leak in one of the testcases. 2012-04-17 12:17:23 +00:00
Andreas Fabri dcfe23867b Add some \ccHtmlNoLinksFrom 2012-04-13 13:01:32 +00:00
Laurent Rineau 95bec3999c Use Unique_has_map instead of std::map (patch from Andreas Fabri) 
The gain on copies of T2 or T3 is the following:


afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3
$ ./copy 1000000 2
36.806 sec

afabri@klimt /cygdrive/c/cgal/next/Triangulation_3/benchmark/Triangulation_3
$ ./copy 1000000 2
4.865 sec

The benchmarck copy.cpp is the following (not commited):

#define  CGAL_T3_HASH
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Timer.h>
#include <CGAL/point_generators_3.h>


#include <iostream>
#include <fstream>
#include <string>
#include <vector>

typedef CGAL::Exact_predicates_inexact_constructions_kernel  K;
typedef CGAL::Delaunay_triangulation_3<K> Delaunay;
typedef K::Point_3                                     Point;
typedef CGAL::Creator_uniform_3<double,Point>  Creator;



int main(int argc, char **argv)
{
  int n=1000000;
  int rep=100;
  if (argc>=2)
    n=atoi(argv[1]);
  if (argc>=3)
    rep=atoi(argv[2]);
  std::vector<Point> points;
  points.reserve(n);  
  CGAL::Random_points_in_sphere_3<Point,Creator> g(1);
  CGAL::copy_n( g, n, std::back_inserter(points));
  Delaunay original;
  original.insert(points.begin(),points.end());
  
  double res = 0;
  for (int r=0;r<rep;++r){
    CGAL::Timer t;    t.start();
    Delaunay delaunay=original;
    t.stop();
    res+=t.time();
  }

  std::cout << res << std::endl;
            
  return 0;
}
 2012-03-30 12:37:19 +00:00
Sébastien Loriot 498c0a6e1e Make the insert-by-range function more permissive 
The condition is now to be convertible to the point type, pair<point,info>,...
This was the behavior before the insert-by-range-with-info methods were
introduced.
 2012-01-24 17:25:20 +00:00