Andreas Fabri
67d72675fe
split packages
2015-08-17 23:46:59 +02:00
Laurent Rineau
08666dce25
Merge pull request #179 from afabri/CGAL-add_hash-GF
...
Add boost::hash and std::hash
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/hash
Conflicts:
Installation/changes.html
2015-07-17 15:39:18 +02:00
Sébastien Loriot
2a7696c210
cast to size_t to avoid a warning by clang
2015-07-16 17:50:31 +02:00
Andreas Fabri
2dea6db3bb
Merge branch 'CGAL-add_hash-GF-old' into CGAL-add_hash-GF
...
Conflicts:
Surface_mesh/include/CGAL/Surface_mesh/Surface_mesh.h
2015-07-06 10:51:23 +02:00
Andreas Fabri
dadb129147
g++ needs a forward declaration for std::hash
2015-06-02 08:46:20 +02:00
Andreas Fabri
b6850d35c0
#include <functional> and suppress struct/class warning for VC10
2015-06-01 10:42:52 +02:00
Efi Fogel
39f1e22dad
Type and typename fixes
2015-05-06 00:40:52 +03:00
Efi Fogel
0f7cb5c709
Merge branch 'MS_2-of_holes-efif-old' into MS_2-of_holes-efif
...
Conflicts:
Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h
Documentation/biblio/cgal_manual.bib
Minkowski_sum_2/test/Minkowski_sum_2/test_Minkowski_sum.cpp
2015-05-03 11:41:36 +03:00
Andreas Fabri
157756f3b3
Add std::hash and boost::hash for the arrangement
2015-04-29 14:30:36 +02:00
Sebastien Loriot
faee08becd
Merge pull request #56 from efifogel/Aos-Polycurve_tests-wkhan
...
Aos polycurve tests wkhan
2015-04-22 18:00:03 +02:00
Efi Fogel
a7c602449b
Commenting out unnecessary code (which some compilers barf on)
2015-04-15 09:51:22 +03:00
Philipp Möller
76a4f0da85
Replace detail/algorithm.hpp with type_traits/is_same.hpp
...
Also remove the superfluous map include
2015-04-10 13:46:13 +02:00
Philipp Möller
ae72a9f616
Replace detail/algorithm.hpp with type_traits/is_same.hpp
...
is_same is the only part of boost used in this file
2015-04-10 13:45:47 +02:00
Efi Fogel
6cab541cdb
Removed unused var. in release mode
2015-03-21 12:50:05 +02:00
Efi Fogel
b9570fad98
Updated changes.html and minor fixes discovered by the test suite
2015-02-25 09:37:24 +02:00
Efi Fogel
8724140fd2
Added this-> to access base members
2015-02-24 21:05:48 +02:00
Efi Fogel
4b941981c1
Fixed small issues found by different platforms
2015-02-24 19:22:26 +02:00
Efi Fogel
c686aed4cb
polycurve stuff
2015-02-19 20:25:25 +02:00
Efi Fogel
0e1716a7eb
polycurve
2015-02-16 11:26:39 +02:00
Efi Fogel
e35966bac3
Pacify MSVC 10
2015-02-16 01:30:10 +02:00
Efi Fogel
d190918cb2
Enhanced polycurve
2015-02-16 00:51:21 +02:00
Efi Fogel
1097c469b2
Fixed subcurve traits name
2015-02-15 11:57:42 +02:00
Efi Fogel
0c5e0ec9cf
Improved polyline and polycurve
2015-02-03 22:23:23 +02:00
Efi Fogel
93e0711a66
cleaned up (removed unnecessary members)
2015-01-15 14:58:11 +02:00
Laurent Rineau
e965b6293e
Fix compilation errors with C++11 and Boost-1.56
...
Use *explicit* conversions to `bool`, for boost::shared_ptr and
boost::optional.
2015-01-14 14:47:29 +01:00
Laurent Rineau
be079cb5a3
Fix compilation with Boost-1.56 and later
...
In Boost-1.56 and later, with C++11, boost::optional::operator bool() is
explicit.
2015-01-13 16:21:04 +01:00
Efi Fogel
587bcd1230
Fixed Parameter_space_in_x_2 and Parameter_space_in_y_2
2015-01-12 08:52:32 +02:00
Efi Fogel
69eee76b25
Added missing cases to Compare_x_2 and Compare_xy_2
2015-01-12 00:53:12 +02:00
Waqar Khan
57c672d3cc
A huge bug in the dispatching of push_back and push_front fixed. Tested by running the test suit.
2014-12-16 16:56:24 +01:00
Waqar Khan
2a7e8ae129
Fixed make_x_monotone again.
2014-12-16 15:57:14 +01:00
Waqar Khan
40eea57ebc
Code clean up.
2014-12-16 15:24:53 +01:00
Waqar Khan
0dc764ad7b
Boundary condition in make_x_monotone fixed.
2014-12-16 15:22:17 +01:00
Efi Fogel
17e261f99c
Pacify msvc 10
2014-12-13 23:48:10 +02:00
Efi Fogel
f870a0702f
Fixed for g++
2014-11-30 20:31:59 +02:00
Efi Fogel
1186fe16a8
Cleaned up. Fiexed construction from points
2014-11-30 19:17:55 +02:00
Efi Fogel
851cc2fba9
Merge branch 'Aos-Polycurve_tests-wkhan-old' into Aos-Polycurve_tests-wkhan
...
Conflicts:
Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
2014-11-30 10:49:08 +02:00
Waqar Khan
a1e6613dab
A bug in intersect functor that cause the non-cashing polylines test to fail has been fixed and tested.
2014-11-30 04:00:58 +01:00
Waqar Khan
57f9d9fd4f
Merge branch 'Aos-Polycurve_tests-wkhan' of ssh://scm.cgal.org/var/git/cgal into Aos-Polycurve_tests-wkhan
2014-11-27 13:48:46 +01:00
Waqar Khan
aa9e2724b2
Added myself in the authors name.
2014-11-27 13:48:43 +01:00
Efi Fogel
9938daf55b
cleaned eup
2014-11-27 14:16:27 +02:00
Efi Fogel
5d28dc7e5c
Removed Has_construct_x_monotone_curve_from_two_points_category. Removed traces of Parameter_space where not needed. Cleaned up
2014-11-27 14:01:32 +02:00
Efi Fogel
2ebc9965fd
Removed Has_construct_x_monotone_curve_from_two_points_category
2014-11-27 13:59:51 +02:00
Waqar Khan
28ac7a8d94
improvement in infinity support made but there are still errors while running the test suit.
2014-11-27 01:58:34 +01:00
Waqar Khan
cf3f6ad5ac
Infinity support (Linear_traits) for push_back and push_front added
2014-11-24 01:34:35 +01:00
Efi Fogel
d0b874ace1
cleaned up
2014-11-04 10:03:09 +02:00
Efi Fogel
90c16905b1
Made all traits const. Pass traits as const reference
2014-10-25 00:37:54 +03:00
Waqar Khan
6688b4c8d7
unnecessary code from intersect functor removed. Intersect Functor fixed and tested
2014-10-15 13:21:47 +02:00
Waqar Khan
8905ee6be3
Trim functors cleaned.
2014-10-15 13:21:46 +02:00
Waqar Khan
5b9abc1473
Default instantiation of Template traits removed. As that is derived from the base class.
2014-10-15 13:21:46 +02:00
Waqar Khan
f1d1763006
Intersect functor: Bug fixed and tested.
...
*Trim_traits is no longer needed.
2014-10-15 13:21:46 +02:00
Waqar Khan
64580d17d8
Bug in trim_2 fixed.
2014-10-15 13:21:45 +02:00
Waqar Khan
77258123cb
Cleaned the trim functors.
2014-10-15 13:21:45 +02:00
Waqar Khan
6861de4fa7
Trim functionality in bezier curves fixed and tested.
2014-10-15 13:21:44 +02:00
Waqar Khan
a632fe0caa
Some more bugs with Trim fixed. (typos from the previous commit)
2014-10-15 13:21:44 +02:00
Waqar Khan
ba724acfb6
A bug in Trim functor fixed.
2014-10-15 13:21:44 +02:00
Waqar Khan
79ed86f54a
Construct_opposite functor added.
2014-10-15 13:21:44 +02:00
Waqar Khan
e76962ec96
Trim functor added and tested.
2014-10-15 13:21:43 +02:00
Waqar Khan
761d74f95a
Compare_x_near_limits_2 functor added that is required by the linear_traits Arrangment
2014-10-15 13:21:43 +02:00
Waqar Khan
a4a34cf828
Old incorrect implementation of infinity supprt removed. Also Compare_x_at_coundary_2 added as this is needed for infinity support.
2014-10-15 13:21:43 +02:00
Waqar Khan
cc7eb0b1bc
Push_back and Push_front funtors now inherites operators from the base class as well.
2014-10-15 13:21:43 +02:00
Waqar Khan
83d300c5fb
incorrect implementation of functors required for infinity support of polycurves REMOVED. (reverted back. nothing new added.)
2014-10-15 13:21:42 +02:00
Efi Fogel
16151c46ff
Enhanced operator(). Made the type of the coordinate index iterator a template parameter
...
Patch exceptionally accepted in master on a file not used by CGAL.
Approved by the interim release manager.
2014-09-29 10:53:18 +02:00
Waqar Khan
59b8d86465
push_back and front are now derived from the polycurve::push_back and push_front.
2014-08-18 16:00:13 +02:00
Waqar Khan
edd45dc2e7
necessary functors added that are used by the polycurves for infinite support.
2014-08-18 15:15:09 +02:00
Waqar Khan
1228ca4cd3
added functors to be compatible with polycurves
2014-08-17 23:52:31 +02:00
Waqar Khan
4215481fc5
functors added to these classes to make is compatible with the infinity support of the polycurve.
2014-08-17 23:44:31 +02:00
Waqar Khan
868060d1d8
option of adding a ray and the end of the polyline via push_back added.
2014-08-17 23:42:56 +02:00
Sébastien Loriot
881a5b49bb
remove warnings triggered in release mode
...
trivial bugfix for master
2014-08-10 15:57:29 +02:00
Waqar Khan
a528537c18
* Push_back and Push_front added for polyline traits.
...
* push_back and push_front operators that took point as input argument disabled in polycurve_traits.
* Documentation of polycurve traits modified.
2014-08-05 02:18:09 +02:00
Waqar Khan
4afb96fee8
Arr_polyline_traits_2 renamed to Arr_polycurve_traits_2. Also the new class Arr_polyline_traits_2 is inherited from Arr_polycurve_traits_2 for backword compatibility.
2014-07-31 15:32:09 +02:00
Efi Fogel
207f70b167
minor fix for master. traits() => geometry_traits()
2014-07-13 10:27:30 +03:00
Waqar Khan
3a2dc27eab
Some commented conditions to added to intersect functor that might help fix the functor even when the trim functor does not atomatically fix the source and target points. Check with Eric
2014-07-08 01:08:25 +02:00
Waqar Khan
b72f433a4b
Trim function user friendly source and target swapping enabled again as it was causing problem with intersect functor of Arr_polyline.
2014-07-08 01:06:42 +02:00
Sébastien Loriot
0b353bb85b
Merge remote-tracking branch 'origin/CGAL-use_leda-GF'
...
Reintroduce the possibility to use CGAL without GMP
(to use LEDA number types instead for example).
The cmake option to set to switch off GMP when building
the lib is CGAL_DISABLE_GMP.
Tested in CGAL-4.5-Ic-86
Approved by the release manager
ge is necessary,
2014-07-04 12:02:37 +02:00
Waqar Khan
a59039c37f
* dummy trim functor added to Arr_Bezier_curve_traits so that the tet framework wont fail
2014-06-23 18:46:32 +02:00
Waqar Khan
9e5ee3890e
* Has_construct_x_monotone_curve_from_two_points_category added into "Arr_bezier_curve_traits"
...
* test_bezier_polycurve is a test file for my own use
2014-06-23 17:21:22 +02:00
Sébastien Loriot
251a9d8446
fixes for tests to use leda and not gmp
2014-06-19 14:29:20 +02:00
Efi Fogel
65bfcd77a3
minor fix for master: fixed locate_gen(cv), where cv is vertical
2014-06-19 10:03:12 +03:00
Waqar Khan
42c21408f8
* Arr_Polyline_traits_2 now use trim functionality to find overlapping curves in
...
Intersect_2 functor.
2014-06-18 18:54:15 +02:00
Waqar Khan
4084abf21f
* Trim functionality added to Arr_segment_traits_2
2014-06-18 18:53:08 +02:00
Waqar Khan
b11285741f
* Trim functionality added to Arr_conic_traits_2
2014-06-18 18:52:17 +02:00
Waqar Khan
282ebee1db
* Trim functionality added for Arr_circle_segment_traits_2.
2014-06-18 18:51:06 +02:00
Laurent Rineau
bb492768b1
Merge remote-tracking branch 'origin/Arrangement_on_surface_2-remove_edge-efif'
...
Conflicts:
Installation/changes.html
2014-05-26 12:21:37 +02:00
Waqar Khan
22dfb578c8
* Trim functor now working with conic polycurves. Tested.
2014-05-25 02:55:53 +02:00
Waqar Khan
be658a222f
* trim functionality added to polyline_traits and tested with conic polycurves. Works for most cases however
...
* some cases result in failure.
2014-05-25 02:10:27 +02:00
Waqar Khan
52c6d3044d
* Permissios of the files changed
...
* Trim functionality added to conic and circular_arc traits.
* Examples for conic_polycurve and circular_arc_polycurve added.
2014-05-24 21:55:36 +02:00
Laurent Rineau
2242efe153
fix permissions
2014-05-22 14:58:17 +02:00
Efi Fogel
a7c7a842f7
Fixed removal of unbounded & added corresponding tests
2014-05-18 17:16:54 +03:00
Laurent Rineau
73f4734525
Fix permissions
2014-05-15 18:33:36 +02:00
Waqar Khan
ae79550a0d
Examples for polycurve_conics and polycurve_circular_arcs added
2014-05-11 16:56:16 +02:00
Waqar Khan
5a86e06399
Added more tests for polycurve_circular_arc traits
...
* Intersect functor still remains to be tested.
2014-05-04 21:04:38 +02:00
Efi Fogel
eb1ac16965
Fixed unbounded removal
2014-05-04 18:55:46 +03:00
Waqar Khan
f534f4eb31
More tests for conic polycurves added, Also fixed an issue with number_of_points_2 functor in 'Arr_polyline_traits_2.h'
2014-04-08 20:32:21 +02:00
Laurent Rineau
a749963859
Merge branch 'CGAL_VC12_GF'
...
Fix a compilation error of VC9, due to the merge of previous revisions
of CGAL_VC12_GF.
Tested in CGAL-4.4-Ic-161.
2014-03-28 18:16:01 +01:00
Laurent Rineau
ff8a7bbe3c
Fix a compilation error with VC9
2014-03-26 16:04:57 +01:00
Andreas Fabri
66380cca74
Merge branch 'CGAL_VC12_GF'
...
Get the testsuite compiled with VC12 ( = MSVC 2013)
Approved by the release manager
2014-03-26 12:13:01 +01:00
Efi Fogel
1936810b36
minor fix for master
2014-03-25 01:58:59 +02:00
Andreas Fabri
28ab87eb7a
Turn copy constructor into a real default constructor
2014-03-19 12:30:20 +01:00
Laurent Rineau
6330632723
Fix various warnings about unused variables/types
2014-01-10 13:25:23 +01:00
Efi Fogel
d6ef591c06
removed unused typedef
2013-12-09 08:49:37 +02:00
Efi Fogel
a1bd7bd05d
removed unnecessaty typedef
2013-12-08 11:06:35 +02:00
Efi Fogel
e6839a652c
cleaned up destructors
2013-12-06 01:57:27 +02:00
Efi Fogel
c745b67e4b
cleaned up
2013-12-06 01:26:54 +02:00
Efi Fogel
bb018b8fbe
Added is_on_y_identification functor
2013-12-06 01:25:55 +02:00
Efi Fogel
4402598ddc
Fixed is_in_face() for the case that the point is on the identification curve. Cleaned up
2013-12-03 17:29:24 +02:00
Efi Fogel
e50c32655a
Fixed typo in is_on_y_identification(), cleaned up
2013-12-03 17:27:33 +02:00
Eric Berberich
713d9227b9
need also a special handling for the right boundary
...
mimics the behavior for the top boundary, but here we only have to deal with "ARR_MAX_END"
2013-12-03 09:56:41 +01:00
Eric Berberich
bf1bcaa523
added missing include
2013-12-03 09:56:16 +01:00
Eric Berberich
b903e01224
Compare_y_on_boundary should use compare_y and not compare_x :-)
2013-12-03 09:55:40 +01:00
Eric Berberich
e7118a904d
Merge branch 'Aos_2-test_spherical_blp_vd-tau' of ssh://scm.cgal.org/var/git/cgal into Aos_2-test_spherical_blp_vd-tau
...
Conflicts:
Arrangement_on_surface_2/test/Arrangement_on_surface_2/Batched_point_location_test.h
2013-12-01 18:05:50 +01:00
Eric Berberich
debf144985
fixed typo
2013-12-01 18:03:53 +01:00
Eric Berberich
28cae3423f
bugfix: vertical curve must only be considered of the respective halfedge is LEFT TO RIGHT
2013-12-01 18:02:57 +01:00
Eric Berberich
5b20defb95
implemented after_handle_event for spherical batched point location helper
2013-12-01 18:02:21 +01:00
Efi Fogel
c3a869f61b
cleaned up
2013-12-01 18:37:51 +02:00
Efi Fogel
e429e61762
Fixed basic things
2013-12-01 14:41:32 +02:00
Efi Fogel
4001c28082
Documented triangulation point-location and fixed landmark point-location
2013-11-18 00:16:51 +02:00
Efi Fogel
affa4e71ad
Fixed triangulation point-location
2013-11-17 12:01:31 +02:00
Efi Fogel
42906f161a
fixed triangulation point-location
2013-11-17 08:55:47 +02:00
Dror Atariah
a51a9a6556
Surrounded CGAL_assertion with #if defined (CGAL_NO_ASSERTIONS)
2013-11-12 09:36:02 +01:00
Dror Atariah
4a4b00d531
Removed Efi's printouts
2013-11-12 08:36:31 +01:00
Dror Atariah
9df5801e7b
Altered a call enclosed in a CGAL::assertion
2013-11-11 13:33:31 +01:00
Efi Fogel
2de1b2ec15
Cleaned up. Added print statement for remote debugging
2013-11-10 13:01:02 +02:00
Dror Atariah
a4e1fffc99
FIXes: Applied correction according to tests results
2013-10-26 15:58:46 +02:00
Dror Atariah
fd5ad145e9
Removed unused variable and clarified Boolean statements
2013-10-25 09:46:08 +02:00
Dror Atariah
99c30184ab
Removed un-used variable
...
Caused warnings in the tests
2013-10-24 08:11:47 +02:00
Dror Atariah
7a8395895f
Warned comparison between int and std::size_t
...
Corrected
2013-10-24 08:02:01 +02:00
Dror Atariah
81deebb131
Replaced "unsigned int" with "std::size_t"
...
Avoid compilation warnings
2013-10-23 10:54:22 +02:00
Dror Atariah
082cb3b185
Corrected returning from functor
...
Added return statement
2013-10-23 10:53:31 +02:00
Efi Fogel
564a6c794d
Synchronized with a recent version of master
2013-10-22 10:00:18 +03:00
Laurent Rineau
fa7588e6e5
Restore correct permissions of files
...
File created by the Windows port of Emacs, and then commited using the
Cygwin version of Git, have incorrect permissions: they are all executable!
Andreas works using that combination of software.
2013-09-24 11:05:57 +02:00
Dror Atariah
081b46ce9b
Merge branch 'Aos_2-polyline_upgrade-fub' of ssh://scm.cgal.org/var/git/cgal into Aos_2-polyline_upgrade-fub
2013-09-23 10:21:57 +02:00
Dror Atariah
87763b59a6
Corrected const's issues in Push_back_2
...
The x-monotone curve was const and the point was not.
2013-09-23 09:50:05 +02:00
Andreas Fabri
a55e82856f
put files in dont_submit, and #ifdef so that compiles does not see this code, and add #includes
2013-09-16 15:07:03 +02:00
Andreas Fabri
6c547e5663
Mainly added includes
2013-09-13 22:24:30 +02:00
Eric Berberich
9a9e915317
added missing functors
2013-09-07 12:39:53 +02:00
Eric Berberich
39e453729f
fixed naming problem: some variables were wrongly named m_base (should be m_self)
...
minor fix for master
bug-fix for master
2013-09-07 12:39:53 +02:00
Efi Fogel
ce5360638a
Moved some assertion statements, Approved by the Release Manager
2013-09-02 18:45:26 +03:00
Efi Fogel
b234ccfae2
Pacified MSVC
2013-08-07 23:00:23 +03:00
Eric Berberich
1836ae87a7
unified signatures
2013-08-01 15:33:51 +02:00
Eric Berberich
a12ede2a2d
whitespace cleanup
2013-08-01 15:22:50 +02:00
Eric Berberich
ea0feb5553
removed warnings: unused variables from signatures
2013-08-01 15:21:40 +02:00
Efi Fogel
d51398cfdc
commented out unused variables
2013-08-01 10:39:01 +03:00
Eric Berberich
6c5ecdc3da
fixed warning: here, we indeed want to "adapt" by one
2013-07-31 17:21:35 +02:00
Efi Fogel
4b2386d70c
replaced unsigned int with size_t
2013-07-31 12:21:49 +03:00
Efi Fogel
7775a6ddc2
Added some CGAL_USE_TYPE() to suppress warnings about unused locally defined typedefs
2013-07-31 12:21:14 +03:00
Efi Fogel
794f2e9236
continue development of poly-geodesics on the sphere
2013-07-30 14:56:14 +03:00
Efi Fogel
808c5d3cd7
Added a comment regarding the defficiency of _compute_signs()---it doesn't support the cylinder case
2013-07-29 14:45:04 +03:00
Efi Fogel
d5ae8887fc
Useing a constant index-map to prvent the introduction of new entries to m_he_indices_table
2013-07-29 14:27:48 +03:00
Efi Fogel
cc7d2a6379
Dispatched _compute_signs() based on whether there are identified boundaries
2013-07-28 12:58:49 +03:00
Efi Fogel
e4e7c6e523
Merge branch 'Aos_2-polyline_upgrade-fub' of ssh://scm.cgal.org/var/git/cgal into polyline
2013-07-24 00:09:49 +03:00