c09ec2beaa
Merge branch 'Kernel-replace_object-pmoeller'
...
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager
Conflicts:
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_d/doc/Kernel_d/Kernel_d.txt
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-06-14 14:26:05 +02:00
716f87d2d7
rename Hidden_type to unspecified_type and update its description
2013-06-13 18:48:58 +02:00
fd0a2b46f4
Merge branch 'Documentation-remove-dxyassist-pmoeller'
2013-06-03 20:37:20 +02:00
6c4357eb2f
doc bug fix (following a question by a user on cgal-discuss)
...
same as 2d8f2caf54
2013-06-03 09:06:08 +02:00
4d9caf3763
Added names that were missing into the Doxyfile.in entries.
...
Also modified Installation/CMakeLists.txt to push the version number variable to the parent level
so that it can be accessed by the documentation
2013-05-30 17:55:43 +02:00
4d469821f7
Generated Doxyfile.in and dependencies
2013-05-30 14:13:47 +02:00
2d8f2caf54
doc bug fix (following a question by a user on cgal-discuss)
2013-05-28 16:50:54 +02:00
c67ba90514
Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller
...
Conflicts:
Circular_kernel_2/include/CGAL/Circular_kernel_2/Circular_arc_2.h
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_circle_2.h
Installation/changes.html
Kernel_d/doc/Kernel_d/CGAL/intersections_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Center_of_sphere_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Compare_lexicographically_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Component_accessor_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Compute_coordinate_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Contained_in_affine_hull_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Contained_in_linear_hull_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Contained_in_simplex_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Equal_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Has_on_positive_side_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Intersect_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Less_coordinate_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Less_lexicographically_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Less_or_equal_lexicographically_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Lift_to_paraboloid_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Linear_base_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Linear_rank_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Linearly_independent_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Midpoint_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Orientation_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Oriented_side_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Orthogonal_vector_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Point_dimension_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Point_of_sphere_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Point_to_vector_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Project_along_d_axis_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Side_of_bounded_sphere_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Side_of_oriented_sphere_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Squared_distance_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Value_at_d.h
Kernel_d/doc/Kernel_d/Concepts/Kernel--Vector_to_point_d.h
2013-05-23 13:13:08 +02:00
918c111113
make Circular_kernel_2 and Spherical_kernel_3 work with a Lazy Linear Kernel
...
for some reason one should not inherit from the linear
intersection predicate
2013-03-22 15:04:38 +01:00
dc8cb1af5c
fix result_of for Get_equation_3
2013-03-21 14:06:05 +01:00
83d8a9578b
avoid compilation loop when using a decltype based implementation of result_of
...
same fix as CK2
As expected the Spherical_kernel with Lazy_kernel no longer
compiles. I'll fix it.
2013-03-15 18:35:50 +01:00
14429d2b8e
fix compilation errors
2013-03-14 18:32:14 +01:00
f97d6b8bd9
s/boost::result_of/cpp11::result_of/g
2013-03-14 10:38:13 +01:00
d6905c61be
Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller
...
Conflicts:
AABB_tree/include/CGAL/AABB_tree.h
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-03-14 10:29:31 +01:00
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
7e59c14580
add a header to classified reference pages using a doxygen macro
2013-03-12 14:33:49 +01:00
75beac0dca
remove unused typedefs
2013-03-05 11:46:25 +01:00
3f7f9c432e
remove unused typedefs
2013-03-04 16:11:35 +01:00
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
f0f34d45fa
workaround to force the usage of the tr1 implementation of result_of from boost
...
see http://www.boost.org/doc/libs/1_52_0/libs/utility/utility.htm#result_of
2013-02-04 11:30:28 +01:00
6e63d3cfa8
adding missing () in see also for functions
2013-01-09 19:48:42 +01:00
7ecf2981af
rename kernel global function groups
2013-01-09 19:48:39 +01:00
ac8efbe017
fix CK3 \sa function links
2013-01-08 17:50:32 +01:00
5a641325e2
fix function references in CK2 and CK3
2013-01-08 17:50:32 +01:00
0aaa77de4a
fix linking to intersection and do_intersect overloads
2013-01-08 17:50:29 +01:00
5ec28b1cf4
replacing the usage of section in user man by \cgalHeading macro call
2013-01-07 18:04:37 +01:00
df08193e00
using \link command instead of \ref command to have the tt font
2013-01-07 16:21:46 +01:00
5f3c8826d1
h2 is the first header in classified reference manuals
2013-01-07 09:00:48 +01:00
42d15a11d0
using uniform markups in classified reference pages
2013-01-04 15:16:40 +01:00
6eb1574871
add classifed reference manual for Spherical Kernel
2013-01-03 10:07:54 +01:00
aacbe40faa
correct reference to figure
2013-01-03 10:07:29 +01:00
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
03151d7bb7
intersection_return now also uses result_of
2012-12-10 17:20:36 +01:00
05115c91ce
fixup move
2012-12-10 17:20:15 +01:00
81b8604c76
Move Circular intersection results from the traits to result_of
2012-12-10 15:56:09 +01:00
9d4d5e6e7d
Replace Intersection_traits with result_of
2012-12-07 18:00:47 +01:00
542b0df6cf
Actually call SK::Linear_intersect and enable_if the most general case
2012-12-07 18:00:47 +01:00
72f1df9aa0
Fix the result struct of SK::Intersect_3
...
Also don't use inheritance to get functionality from the linear kernel
but forward.
2012-12-07 18:00:47 +01:00
c4583082d2
Add missing typedefs
2012-12-07 18:00:46 +01:00
d198458ca7
Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller
...
Conflicts:
.gitattributes
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
AABB_tree/include/CGAL/AABB_traits.h
AABB_tree/include/CGAL/AABB_tree.h
AABB_tree/test/AABB_tree/AABB_test_util.h
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2/arr_queries.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/Arr_trapezoid_ric_point_location.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/intro.tex
Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
Filtered_kernel/include/CGAL/Lazy.h
Filtered_kernel/include/CGAL/Lazy_kernel.h
Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h
Intersections_2/test/Intersections_2/test_intersections_2.cpp
Intersections_3/test/Intersections_3/test_intersections_3.cpp
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_23/include/CGAL/Kernel/Type_mapper.h
Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
2012-12-04 17:57:53 +01:00
1adf441b18
Convert all CRLF files to LF
2012-12-03 18:44:24 +01:00
9576be3c3b
add doc in dont_submit
2012-11-27 08:42:02 +01:00
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
bfa239158d
polish
2012-11-20 12:30:55 +01:00
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
974621b58f
start using new figure macros.
...
For Combinatorial maps, I reintroduced the original anchor names as they
were still in use in the reference manual.
2012-11-08 10:55:09 +00:00
ae159cbdf3
replace markup #, ##, ### by \section, \subsection and \subsubsection
...
(script replacement)
2012-11-06 22:02:15 +00:00
31a3c07418
Turn \refines :: into \refines `X` globally
2012-10-25 09:48:39 +00:00
31e9eadf8b
Fix all PackageDescriptions to a newer layout
2012-10-19 15:52:31 +00:00
aac4570936
typo
2012-10-11 08:36:55 +00:00
a484b9ba7d
remove todo
2012-10-10 21:00:18 +00:00
bda23e7f3a
Spherical Kernel is finished
2012-10-10 18:07:27 +00:00
bc48dfe5a0
Be consistent about author/authors
2012-10-03 16:40:16 +00:00
272a52ee44
Do a global pass over Doxygen warnings/errors.
2012-10-02 15:12:54 +00:00
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
37778547bf
Fix example to point to paths similar to a flat layout
2012-10-01 18:02:44 +00:00
b64ba48134
The changes to move the package overview labels into the
...
PackageDescription.
2012-09-25 17:17:49 +00:00
0aa7cd1c3b
Global heading reduction. Rename some Parameter section to Template
...
Parameters. Fix dependencies.
2012-09-21 09:42:24 +00:00
e54098fb57
Throw out left over Classified files and move their content if
...
necessary.
2012-09-20 16:29:19 +00:00
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
d2e5e73fa6
add grouping and fix links
2012-09-20 12:08:26 +00:00
013c73d54e
Add Circular_kernel_3 doc.
2012-09-18 10:05:37 +00:00
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
4c3e1c3138
Fix mixed eol styles
2012-08-02 13:35:03 +00:00
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
745685fed6
fixed bug in 2 functors names
2012-07-25 09:18:26 +00:00
17797b7271
Merge next into this branch. There have been conflicts in the
...
AABB_tree documentation, Intersections_3 and Arrangement_on_surface_2.
The merge also introduced a regression for a bug fixed in R68387 which
fixed a bug in Triangle_3 Segment_3 intersections. The relevant
testcase is in triangle_other_intersection_test.cpp.
2012-04-24 15:06:19 +00:00
542f5d9c51
Merged ^/branches/next here
2012-04-16 08:53:21 +00:00
c2ccc19c55
Remove unused variable (warnings)
2012-01-31 14:36:20 +00:00
29d617e712
Cosmetic change: add a space after the license, to be compatible
...
with the output of licensecheck
2012-01-16 15:56:10 +00:00
a37c74d534
Add license files, per package
2012-01-16 15:54:22 +00:00
2af2160942
Turn \ccLicenseQPL into \ccLicenseGPL
2012-01-13 17:13:55 +00:00
8f59fd9592
Turn QPL into LGPLv3+
2012-01-13 16:33:35 +00:00
5b5dd33848
merge changes from next
2012-01-09 12:33:39 +00:00
b8a96e9114
Merged next to this branch.
2011-12-06 17:11:01 +00:00
5b5827839b
* removed cruft from lazy
...
* Circular_kernel_3 fixed by removing inheritance
2011-11-25 11:20:34 +00:00
0e0a200646
* Using result_of instead of Qualified_result_of
...
* limited refactoring in the lazy kernel
* still bugs in circular_3
* still specialization problem with iso_rectangle
2011-11-23 17:52:38 +00:00
1de3384634
Remove links to http://acs.cs.rug.nl/
...
The ACS web site is down for a long time (reported
2011/06/28). Unfortunately that site seems dead. So I remove the links to
it in the user manuals of Circular_kernel_[23]. :-(
2011-11-22 22:01:20 +00:00
93486787c3
The inside of ccPkgDescription must not contain black lines between macros
...
Otherwise that inserts a buggy "<p>" tag in the package overview where the
doctype does not allow it.
2011-11-15 19:16:23 +00:00
94affd589d
Moved the Intersection_result concept into the functors and adapted code in the lazy kernel to that change.
2011-11-15 15:40:22 +00:00
9051768cea
Introduced Intersection_results as a Kernel concept for use in public APIs in favor over Intersection_traits.
2011-11-15 13:41:14 +00:00
450f438518
IT shortcut not circumvents specifying a kernel making it an actual shortcut and nicer for exposure in APIs
2011-11-10 11:06:26 +00:00
a4e6d57cff
Circular_kernel_2 and Circular_kernel_3 now use CGAL_INTERSECTION_VERSION for backwards compatability
2011-11-09 14:29:46 +00:00
c7ca93c07e
Include <CGAL/glu.h> before any use of GLU
2011-11-09 14:24:17 +00:00
875bde1083
Added support to Lazy kernel for constructions that return Object, fixed a bug in Line_arc_3 - Line_arc_3 intersections
2011-11-07 15:38:49 +00:00
91a5327fa8
change LGPLv2 -> LGPLv3
2011-10-10 13:48:25 +00:00
554f62d411
remove executable property from copyright files
2011-10-03 08:18:16 +00:00
d10a333947
Add a file with the copyright holder(s) to the package_info
2011-09-29 20:45:16 +00:00
ddd9ae7615
put file removed in r65566 that are actually needed
2011-09-29 13:06:59 +00:00
fdb7ea6c6b
prepare ccPkgHowToCiteCgal for CGAL-3.10 (in 2012)
2011-09-28 16:15:05 +00:00
dad46fe794
remove not need CMakeLists.txt's
2011-09-27 08:51:49 +00:00
dff6dda8b3
Remove from copyright holder
...
Freie Universitaet Berlin (Germany), Martin-Luther-University Halle-Wittenberg
(Germany) and RISC Linz (Austria) as they transfer the copyright to other
sites.
2011-09-21 19:46:31 +00:00
b07e2df018
* Circular_kernel is now Object free, doesn't compile with Lazy yet,
...
* hack for ternary function
2011-08-25 21:40:12 +00:00
369498d1e5
Cancel revision 64607. There had been a problem with the branch.
...
| ------------------------------------------------------------------------
| r64607 | efif | 2011-07-05 17:27:04 +0200 (Tue, 05 Jul 2011) | 1 line
|
| Merged feature-branch Aos_2-new_functors-tau into next
| ------------------------------------------------------------------------
2011-07-06 11:11:58 +00:00
ac9877372d
Update all PkgDescription files to CGAL-3.9
2011-06-27 14:31:45 +00:00
83875b9cc1
use make_sqrt instead of make_root_of_2
2011-05-05 14:34:36 +00:00
b0072b556f
The constructor of Sqrt_extension from 3 parameters does not allow the root to be
...
0. Update Circular_kernel_3 testsuite to this precondition.
Raffine the fix of r63323 of operator== of Sqrt_extension. The original
behavior is used if ACDE_TAG is Tag_false and the one of r63323 otherwise
(selected at compile time).
2011-05-05 08:17:39 +00:00
81f8f69ffe
merge from next
2011-04-28 18:44:10 +00:00
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
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
Sébastien Loriot
Philipp Möller
Monique Teillaud
Ross Hemsley
Alexandros Konstantinakis-Karmis
Andreas Fabri
Laurent Rineau
Sébastien Loriot
Philipp Möller
Laurent Rineau
Marc Glisse
Monique Teillaud