Commit Graph

612 Commits

Author SHA1 Message Date
Andreas Fabri 527a4bc63d Add #includes 2013-09-16 19:12:28 +02:00
Andreas Fabri 6c547e5663 Mainly added includes 2013-09-13 22:24:30 +02:00
Clement Jamin 008777c8ad Added new author names 2013-09-13 16:33:48 +02:00
Clement Jamin aea046e94f Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2013-09-13 16:32:29 +02:00
Clement Jamin a5f62e9c94 Added new author names 2013-09-13 16:32:13 +02:00
Shihao Wu 6c87a6c09d use different ways to call function 2013-09-13 16:17:18 +08:00
Shihao Wu 2d55adc010 refine the wlop flow chart 2013-09-13 16:15:57 +08:00
Shihao Wu 3770bdec46 clean up the code 2013-09-13 15:58:31 +08:00
Shihao Wu 676da9c403 clean up the code 2013-09-13 15:51:42 +08:00
Shihao Wu 446c54eab8 add output parameter to wlop 2013-09-13 15:46:27 +08:00
Andreas Fabri 3d6ceb79bb Add newline at end of file 2013-09-12 14:12:12 +02:00
Shihao Wu 132f290750 parallelize one "for" circle in the iteration loop 2013-09-11 20:17:37 +08:00
Shihao Wu fe0a47377f add spaces between ">>>" 2013-09-11 00:11:05 +08:00
Shihao Wu e68679a692 *refine the codes format 2013-09-11 00:04:26 +08:00
Shihao Wu 8754fb924b change to range search 2013-09-11 00:01:22 +08:00
Shihao Wu ded3c99a9b add spaces between the ">" 2013-09-10 23:51:29 +08:00
Shihao Wu 9eec0a0e66 control debug output using #ifdef and #endif on stable version 2013-09-08 15:59:00 +08:00
Shihao Wu 0569983ad9 rule out possible Zero-divide error 2013-09-08 15:55:47 +08:00
Shihao Wu e8839230d2 stable parallel version 2013-09-08 15:49:39 +08:00
Shihao Wu 42f5240d43 refine the wlop flow chart.jpg 2013-09-07 23:27:06 +08:00
Shihao Wu c559180c01 control debug output using #ifdef and #endif
check to make sure that no "Divid Zero" will appear
2013-09-02 22:38:20 +08:00
Shihao Wu 5212ab7592 control the debug cout using #ifdef #endif 2013-09-02 20:45:17 +08:00
Shihao Wu 823fa14050 delete task_scheduler_init() 2013-09-02 10:17:00 +08:00
Shihao Wu 977b730109 parallelize another code section 2013-09-01 16:24:50 +08:00
Shihao Wu 1cd3220b81 add branch return value 2013-09-01 16:04:38 +08:00
Shihao Wu 98e7af81e2 parallelize function "compute_update_sample_point" 2013-09-01 16:01:53 +08:00
Shihao Wu 9cdebe1b23 parallelize the most time-consuming "for" circle 2013-09-01 11:35:59 +08:00
Shihao Wu 6b1abd547b add Concurrentcy_tag to wlop example 2013-08-31 23:17:13 +08:00
Shihao Wu d7bae5b864 add Concurrency_tag to wlop_simplify_and_regularize_point_set.h 2013-08-31 23:16:45 +08:00
Shihao Wu 52a07ec4cd Forgot to commit bilateral..h 2013-08-30 23:18:20 +08:00
Shihao Wu ee86560649 Improved readability of bilateral_smooth.. 2013-08-30 22:58:15 +08:00
Shihao Wu 339f7d3f51 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2013-08-30 22:18:41 +08:00
Shihao Wu 8a7de648ea comment the parallelization of code around "compute_kdtree_neighbors" 2013-08-30 22:08:01 +08:00
Shihao Wu 5f11cf141e format the file
delete unnecessary spaces at the beginning of each line
2013-08-30 19:26:51 +08:00
Clement Jamin d03d1426dc Minor doc fix 2013-08-30 12:02:21 +02:00
Clement Jamin d033fd4044 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu' of ssh://scm.cgal.org/var/git/cgal-gsoc into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2013-08-30 11:50:41 +02:00
Clement Jamin 3daa44a9df Untabify + typos 2013-08-30 11:50:17 +02:00
Shihao Wu c87d859f12 1.add Concurrency_tag judge in template file
2.add parallelization to codes around invocation of "compute_max_spacing"
2013-08-30 17:30:00 +08:00
Clement Jamin ea22837a40 Untabify 2013-08-30 10:34:12 +02:00
Shihao Wu 9028b7e8a0 updated default parameter documentation,
changed ForwardIterator to RandomAccessIterator for random_shuffle
2013-08-30 11:29:50 +08:00
Shihao Wu b757f01555 I copied the wrong version of tests, now is correct 2013-08-28 12:04:20 +08:00
Shihao Wu 4da24d2c1c added wlop default parameters, estimate default neighborhood radius 2013-08-28 10:45:42 +08:00
Clement Jamin 34b13cefc2 First pass on the user doc 2013-08-27 12:14:34 +02:00
Shihao Wu faf1e46ac3 An example of std::vector "swap" problem for Clément to try 2013-08-27 10:54:19 +08:00
Shihao Wu 6d42c0ef9c refined codes, updated documentations, added tests 2013-08-27 09:49:22 +08:00
Shihao Wu 8908fd4d85 try to fix git problem 2013-08-27 09:43:35 +08:00
Laurent Rineau bc03aaf30b Put doc/ in the global dont_submit file 2013-08-20 10:57:03 +02:00
Sébastien Loriot d282ade623 use \cgalCite instead of \cite
using perl -i -pe 's/\\cite\s*{?([a-zA-Z0-9:-]+)}?/\\cgalCite{$1}/g'
2013-08-05 18:25:26 +02:00
Shihao Wu 58d90edde9 rename example files 2013-07-31 17:43:01 +08:00
Shihao Wu f1c15e1678 refined the code for wlop_regularize_and_simplify points
mainly try to replace index with iterator
2013-07-31 17:39:07 +08:00
Shihao Wu fd81a098f8 finished large data experiment 2013-07-30 13:56:05 +08:00
Clement Jamin 5ab8c9aae2 First pass on the upsampling code 2013-07-26 19:26:45 +02:00
Clement Jamin 8d49452482 Improved example (input filename) 2013-07-26 18:26:15 +02:00
Clement Jamin f835a5f498 Fix parallel code 2013-07-26 02:06:38 +02:00
Clement Jamin 5a9249dab5 Small improvements in the code
const, smaller #ifdef #else #endif blocks, code formatting...
2013-07-26 02:02:34 +02:00
Clement Jamin 6afcc387d0 Typo 2013-07-24 20:58:13 +02:00
Clement Jamin d53a1a7a46 Bugfix related to CGAL_USE_PROPERTY_MAPS_API_V1 2013-07-24 20:22:26 +02:00
Clement Jamin 8c5c6b7ce9 Minor code corrections: variable names, template params order, etc. 2013-07-24 20:15:52 +02:00
Clement Jamin 62a4472c6c Corrections in the example so that it can be built 2013-07-24 20:13:50 +02:00
Clement Jamin 3394a8c39a Corrected the position of the TBB-related code in CMakeLists.txt 2013-07-24 20:12:51 +02:00
Clement Jamin e85f55417e Fix typo 2013-07-24 11:56:01 +02:00
Clement Jamin df18f59902 Fix charset problem 2013-07-24 11:50:04 +02:00
Clement Jamin 74264b6038 Change the name everywhere + delete old file 2013-07-24 11:47:51 +02:00
Shihao Wu dfbb89339b improved the readability of Rich_grid.h as Pierre said. 2013-07-19 22:41:50 +08:00
Shihao Wu 296f51c320 change function name to: edge_aware_upsample_point_set
Added three .h files with new names
2013-07-19 22:13:58 +08:00
Shihao Wu 894fcbe3d2 change function name to: bilateral_smooth_point_set 2013-07-19 21:59:44 +08:00
Shihao Wu 884f6306f6 change function name to: wlop_regularize_and_simplify_point_set_using_rich_grid 2013-07-19 21:51:24 +08:00
Shihao Wu 5e8d302f89 added tbb to CMakeLists.txt
tried to add Concurrency_tag but have compile error..
2013-07-17 00:47:02 +08:00
Shihao Wu 499b97e321 Added some tbb codes for denoise_Point_set.
it pass complie, but the cmakelist may have problem.
2013-07-16 00:39:02 +08:00
Shihao Wu bed181be5c added a sphere test data, the upsample codes works well on it too 2013-07-14 23:41:15 +08:00
Shihao Wu d8ea879471 added predict neighbor size and threshold size.
this version work well on the example
2013-07-14 20:24:20 +08:00
Shihao Wu c9150d9854 consistency with my original old code.
I found the result is not perfect, so I checked carefully with the old code.

I tested some data with exact parameters.

The result is almost the same, the difference is cased by numerical problem.

So I commit this version for record.
2013-07-14 13:52:24 +08:00
Shihao Wu 5b0befd9e3 I tried to make it easier for parallelization but not worked.
here just a record of this version, I will try another way out.
2013-07-13 01:49:52 +08:00
Shihao Wu 34b61f3471 finished the first version of upsample_point_set
the rest is how to speed up by estimating radius

and make it more easy for parallelization
2013-07-12 01:01:18 +08:00
Shihao Wu 43bb5bd574 now back_inserter works, the pipeline of upsample have set up 2013-07-11 00:17:24 +08:00
Shihao Wu e1e6df6575 added the key part of upsample_point_set
considering how to use back_inserter
2013-07-10 22:32:16 +08:00
Shihao Wu caf50a5233 added normal variable to Rich_point 2013-07-10 18:37:14 +08:00
Shihao Wu 9de9f54ebd Started coding for upsample_point_set.
added two new files and one new test data.
2013-07-10 00:20:52 +08:00
Shihao Wu f15ba84402 add a new test data "fin90_with_PCA_normals.xyz" 2013-07-09 22:48:42 +08:00
Shihao Wu b370deff80 added timing and sharpness_sigma parameter 2013-07-09 19:20:44 +08:00
Shihao Wu b8b2379c09 update formating for denoise_point_set 2013-07-09 18:54:20 +08:00
Shihao Wu 863462e10a modified denoise_point_set for new PROPERTY_MAPS, and fixed a bug in kd-tree
now the example can run and I added a new test data "sphere_20k_normal.xyz"
2013-07-09 18:44:17 +08:00
Shihao Wu 03e2c02484 I used get() instead of put(), and get correct result.
Maybe I used put() in a wrong way.
Or maybe put() function have bugs.
2013-07-09 17:00:19 +08:00
Shihao Wu c68f8de8f1 Try to change to PROPERTY_MAPS_API_V2, but the output is wrong.
Figuring out...
2013-07-09 16:53:54 +08:00
Shihao Wu 0f3f314b71 use Kd_tree_xxx instead of KdTree_xxx 2013-07-08 23:14:30 +08:00
Shihao Wu 0aba742b5c change some class names to obey the name convention of CGAL 2013-07-08 22:52:33 +08:00
Shihao Wu 091f17b3dd working on code formating and get some wired errors
Maybe I'm working in a wrong branch?
2013-07-08 22:39:47 +08:00
Shihao Wu 1ececf54a1 limit each line to 80 characters. 2013-07-08 17:09:50 +08:00
Shihao Wu 273eb39cd2 Added Rich_grid.h file
Modified regularize_and_simplify_point_set_using_balltree for Rich_grid

Used CGAL::Timer instead
2013-07-08 16:02:15 +08:00
Clement Jamin 6bb238d5cb Replace "<..<...>>" by "<...<...> >" (>> is correct in C++11 only) 2013-07-05 13:46:43 +02:00
Clement Jamin 130a0b4287 Use Point_3::x/y/z() functions: it's clearer and faster 2013-07-05 13:26:46 +02:00
Clement Jamin 8809c071a5 A bit of code formatting 2013-07-05 11:33:38 +02:00
Clement Jamin a8d438eece Everything should be in the CGAL namespace 2013-07-05 11:08:46 +02:00
Clement Jamin fcc02e2547 Add a typedef XXX Base and use it 2013-07-05 10:53:14 +02:00
Clement Jamin 229430f96a Clean-up some comments 2013-07-05 10:49:19 +02:00
Clement Jamin 63b67c89ad Clean-up some comments 2013-07-05 10:48:26 +02:00
Clement Jamin 14fdaa57da Separate function calls 2013-07-05 10:44:34 +02:00
Clement Jamin a54cce9d1d Fix charset problem 2013-07-05 10:36:03 +02:00
Clement Jamin 6b6c8b1d60 Using "resize" seems more meaningful here 2013-07-05 10:29:53 +02:00
Clement Jamin 6c44ab3306 Merge branch 'gsoc2013-Point_set_processing_3-point_set_consolidation-swu-old' into gsoc2013-Point_set_processing_3-point_set_consolidation-swu 2013-07-05 08:58:45 +01:00
Shihao Wu b836e36808 added denoise_point_set function/files and example
also refine the code of wlop
2013-07-05 00:28:39 +08:00
Shihao Wu eeb5350fce Added a new file/function for Grid Tree implementation
The new file/function name is "regularize_and_simplify_point_set_using_balltree"
2013-07-04 00:17:51 +08:00
Shihao Wu c4d7e2d39b Add guess KNN trick
To speed up compute_average_term
I guess the suitable KNN size to reduce the redundant visit.
2013-06-28 00:51:16 +08:00
Shihao Wu 9924c4c652 <Trying to add tbb> 2013-06-25 23:26:46 +08:00
Shihao Wu 03054d786f <Fixed the bug of density function>
<Now the linear version of WLOP is finished
,next is try parallel>
2013-06-25 21:53:15 +08:00
Shihao Wu 6f1c8567e5 <Finished density weight function> 2013-06-25 00:18:04 +08:00
Sébastien Loriot bff4e98d01 fix warnings mainly coming from the merge of the replace object feature branch 2013-06-24 08:44:47 +02:00
Shihao Wu 99c725e4e0 <add density weight> 2013-06-21 21:28:23 +08:00
Shihao Wu 93574ff377 <Fix a huge bug>
<Now is the real LOP,
Ready to add density weight>
2013-06-21 16:15:41 +08:00
Shihao Wu d36371a334 <Finished repulsion term>
<Now we can see some effect of
L2 LOP>
2013-06-20 23:16:28 +08:00
Shihao Wu 3f9a760553 <Just a bit change> 2013-06-19 22:09:01 +08:00
Shihao Wu 45b11a0b57 <Added new functions>
<Added KDD neighborhood searching
 Added compute_average_term>
2013-06-19 20:15:05 +08:00
Sébastien Loriot 607a1ac8ca re-add property map dereferencing a property_map lost during update-merge 2013-06-19 11:31:06 +02:00
Shihao Wu 01a19b3c80 Make the code more general, ready for the first push 2013-06-19 16:34:39 +08:00
Shihao Wu 0074af2b90 Add a new function regularize_and_simplify_point_set(). doing nothing but randomly copy sampled points inside the function space.
Than I want to update these sampled points position using WLOP algorithm.

At last, I will copy back the modified points to the original points as output.
2013-06-18 23:03:28 +08:00
Sébastien Loriot 829a6c0ac1 doxygen: prevent linking 2013-06-17 09:52:08 +02:00
Sébastien Loriot 716f87d2d7 rename Hidden_type to unspecified_type and update its description 2013-06-13 18:48:58 +02:00
Sébastien Loriot a7b80aa998 Merge branch 'First_of_pair_property_map-new_version-iyaz'
related to this small-feature:
  Features/Small_Features/Property_maps_change_of_key_type

Successfully tested in CGAL-4.3-Ic-59 and approved by the release manager

Conflicts:
	Installation/changes.html
2013-06-13 18:09:23 +02:00
Sébastien Loriot ffa4bf7d34 rename MACRO to enable old code 2013-06-13 17:04:50 +02:00
Sébastien Loriot 2e7f87f7e6 remove comments 2013-06-13 16:41:20 +02:00
Sébastien Loriot 275c21022e doc: use bullet list 2013-06-13 16:11:41 +02:00
Sébastien Loriot b6a332acb6 remove remaining Typed_identity_property_map_by_reference 2013-06-13 16:00:23 +02:00
Sébastien Loriot 7c16daf247 clear stream state (getline bug on MSVC9) 2013-06-12 11:58:56 +02:00
Sébastien Loriot cdab9daa57 path of boost header relative to the version of boost 2013-06-07 07:57:45 +02:00
iyaz a541518c01 use member get on tuples instead of free func get 2013-06-06 22:41:43 +03:00
iyaz 6fd237a95f include CGAL/property_map.h for avoiding boost path dif from version to version 2013-06-06 17:13:40 +03:00
Sébastien Loriot b72e31e2ae ADL does not apply to a function with an explicitly qualified template argument 2013-06-05 09:23:38 +02:00
Sébastien Loriot d8990ec5f5 ifstream are taken by reference, an lvalue is required 2013-06-05 09:03:28 +02:00
Sébastien Loriot 0e5d524577 CGAL::Typed_identity_property_map_by_reference has been renamed, update missed examples 2013-06-05 09:02:31 +02:00
Philipp Möller 895245426a Fix some errors introduced by adding the titles 2013-05-30 18:09:42 +02:00
Ross Hemsley 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
Ross Hemsley c0690f87f4 Manually inserted tags that could not be generated automatically
added in options that were in XML but were not moved across to new Doxyfile.in files.
2013-05-30 14:45:18 +02:00
Philipp Möller 4d469821f7 Generated Doxyfile.in and dependencies 2013-05-30 14:13:47 +02:00
Sébastien Loriot 677bc07a4d rename Typed_identity_property_map_by_reference to Identity_property_map
and update its documentation
2013-05-13 11:38:07 +02:00
Sébastien Loriot f91eac468e enhance documentation 2013-05-13 10:59:15 +02:00
Sébastien Loriot f28c0b042a update doc of value_type_traits 2013-05-13 10:03:20 +02:00
iyaz 93d89405f9 Add another test file for testing read functions with custom pmaps and output iterator type
(also helpful to detect compilation problems)
2013-05-08 23:24:21 +03:00
iyaz 8807ec30e1 document value_type_traits, add specializations for inserter_iterator and front_inserter_iterator
add another template parameters for OtuputIterator value type in read functions which rely on vaue_type_traits
2013-05-08 23:21:22 +03:00
iyaz cd0163b95c should be iterator_traits - fixed 2013-05-08 15:43:53 +03:00
iyaz c951a2f509 wrong parameter name - fixed 2013-05-08 10:33:32 +03:00
iyaz c9a1b71c43 do not use value_type_traits when iterator_traits suffices 2013-05-07 18:53:14 +03:00
iyaz 9cb22fdd0e InputIterator -> ForwardIterator 2013-05-06 18:08:33 +03:00
Sébastien Loriot 17dd21def5 Merge branch 'First_of_pair_property_map-new_version-iyaz-old' into First_of_pair_property_map-new_version-iyaz
Conflicts:
	Point_set_processing_3/examples/Point_set_processing_3/property_map.cpp
	Point_set_processing_3/include/CGAL/IO/read_off_points.h
	Point_set_processing_3/include/CGAL/IO/read_xyz_points.h
	Point_set_processing_3/include/CGAL/IO/write_off_points.h
	Point_set_processing_3/include/CGAL/IO/write_xyz_points.h
	Point_set_processing_3/include/CGAL/Point_with_normal_3.h
	Point_set_processing_3/include/CGAL/improved_jet_smooth_point_set.h
	Point_set_processing_3/include/CGAL/improved_laplacian_smooth_point_set.h
	Point_set_processing_3/include/CGAL/jet_estimate_normals.h
	Point_set_processing_3/include/CGAL/jet_smooth_point_set.h
	Point_set_processing_3/include/CGAL/pca_estimate_normals.h
	Point_set_processing_3/include/CGAL/pca_smooth_point_set.h
2013-05-06 15:57:36 +02:00
iyaz b97fcda8dd pca_smooth_point_set PointPMap Readable -> ReadWrite,
make it undocumented
2013-05-06 12:05:35 +03:00
iyaz 0ca7f319e0 use helper function for typed_identity pmap,
remove forgotten dereference pmap
2013-05-05 22:07:41 +03:00
iyaz cc16c15fb2 Also changed code in prev version (i.e. macro activated code) which was previously buggy (buggy in a way of using pmaps) 2013-05-05 19:33:06 +03:00
iyaz d8bd97e662 documentation related parameter name fix 2013-05-05 19:13:41 +03:00
iyaz f09426d1c5 write_off_points_and_normals NormalPMap requirement WritablePropertyMap -> ReadablePropertyMap
write_xyz_points_and_normals NormalPMap requirement WritablePropertyMap -> ReadablePropertyMap
2013-05-05 18:51:24 +03:00
iyaz 0a7322b3bc Also changed code in prev version (i.e. macro activated code) which was previously buggy (buggy in a way of using pmaps) 2013-05-05 18:15:45 +03:00
iyaz d7385a1974 Also changed code in prev version (i.e. macro activated code) which was previously buggy (buggy in a way of using pmaps) 2013-05-05 18:11:14 +03:00
iyaz fb37011c14 pmap related changes,
note that previous version has a bug, where a normal is accessed directly (should be accessed via pmap)
2013-05-05 17:08:55 +03:00
iyaz a1454a975d jet_smooth_point_set ReadablePropertyMap -> ReadWritePropertyMap 2013-05-05 16:13:28 +03:00
iyaz c67eb609b3 improved_laplacian_smooth_point_set ReadablePropertyMap -> ReadWritePropertyMap 2013-05-05 16:11:43 +03:00
iyaz f7d331ec22 changed improved_jet_smooth_point_set PointPMap requirement to ReadWritePropertyMap
which was ReadablePropertyMap (which was not OK since pmap is also subject to change inside the function)
2013-05-04 01:50:02 +03:00
iyaz db31047a13 Documentation changes in Point_set / include:
change all documentation references to boost pmaps to proxy CGAL concepts
2013-05-03 18:24:10 +03:00
iyaz fb6dafd656 Propery maps (making Lvalue) 2013-05-03 17:58:15 +03:00
Sébastien Loriot 1284566438 Bug-fix: a get is not guarantee to return a reference. put should be used ...
... for overwritting the value
2013-05-03 09:43:20 +02:00
Sébastien Loriot 47084771af remove put_get_helper_pass_key_by_reference, using friend put/get functions
it is more clear to see what is going on
2013-05-03 09:36:08 +02:00
iyaz 85899e5e27 Do not remove Dereference_property_map (previously deactivated with a macro) 2013-05-02 16:53:22 +03:00
iyaz 19098f786c List Dereference_property_map<T> in Property_map user manual (note that we do not have an example for that) 2013-05-02 16:51:41 +03:00
iyaz 8e38300002 Change of mind: to keep helper simpler I removed an extra get function added for supporting key types which are not actually key_type
( We only need that functionality inside Normal_of_point_with_normal_pmap, so made required changes in there)
2013-05-01 04:06:33 +03:00
iyaz 07bf1ef8d2 forgotten cast removed 2013-05-01 03:08:40 +03:00
iyaz 8b575f179e one more get function is added for handling key types which are not "key_type" but convertible 2013-05-01 02:40:42 +03:00
iyaz 041d702089 Fix indentation 2013-04-30 18:28:39 +03:00
iyaz 30a63a57c6 User manual updates 2013-04-30 18:28:13 +03:00
iyaz 0af0077757 Update examples: remove CGAL_USE_OLD_PAIR_PROPERTY_MAPS related parts 2013-04-30 17:14:44 +03:00
iyaz cd0c4f59f7 Documentation related changes 2013-04-30 16:59:02 +03:00
iyaz 35a83e09f8 Removed a forgotten comment 2013-04-30 16:58:01 +03:00
iyaz c3c6d435b5 IO part documentation update 2013-04-30 15:23:01 +03:00
iyaz a994cde1fa Forgotten def removed 2013-04-30 13:23:37 +03:00
iyaz 6b1a6ddab7 parameter name fixed 2013-04-30 02:28:10 +03:00
iyaz 9cf096b92e Examples updated 2013-04-30 02:27:47 +03:00
iyaz cae7026828 test cases updated 2013-04-30 02:26:55 +03:00
iyaz 9d94793f77 parameter names are corrected 2013-04-30 01:27:22 +03:00
iyaz 72a947cda4 Changes related to pm inside include
(documentation is not updated)
2013-04-30 00:32:46 +03:00
iyaz 6b5d40387f New version of pmaps, and an example of required changes in related code (for now just read_xyz_points.h and write_xyz_points.h are changed as a representative) 2013-04-22 02:59:37 +03:00
Sébastien Loriot 4860091679 doc bugfix: s/InputIterator/ForwardIterator/g (used in a multipass algorithm) 2013-03-26 10:37:35 +01:00
Sébastien Loriot 104384b40f doc bugfix: iterator is a ForwardIterator since the algorithm is multipass
the fix consists in s/InputIterator/ForwardIterator/
and update the description of the input iterator
2013-03-26 10:16:07 +01:00
Sébastien Loriot d62c514d18 remove a swap call for resizing a vector that is useless for a list 2013-03-26 09:46:55 +01:00
Sébastien Loriot a483e26dd0 skip documentation of header in dont_submit 2013-03-26 08:25:47 +01:00
Sébastien Loriot 7412cdb650 add all property maps concepts to ease linking to them. Update pages using them 2013-03-14 16:59:27 +01:00
Sébastien Loriot e991fe72ad really add last missing classified reference manual pages 2013-03-13 10:57:01 +01:00
Andreas Fabri cfd69b1490 long/int -> size_t 2013-02-27 11:44:55 +01:00
Andreas Fabri 8a309aac1b remove an unused parameter 2013-02-26 17:13:32 +01:00
Andreas Fabri 3c209bc60a remove an unused parameter 2013-02-26 17:11:08 +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 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
Laurent Rineau 61329abd7f Fix bugs in test/Point_set_processing_3/read_test.cpp
1/ A compilation bug: in C++03, the constructor of std::ifstream cannot
take a std::string as filename argument. That constructor is available only
from C++11.

2/ The paths to the data files were wrong.

3/ Remove the useless commited cgal_test_with_cmake! As a matter of fact,
read_test.cpp was never tested by the daily testsuite because that file
cgal_test_with_cmake was commited and unmaintained.
2013-02-08 16:21:19 +01:00
Andreas Fabri 5bc73b4c3f move files for read_test.cpp in a subdirectory as other test files read all xyz and off files 2013-01-17 11:23:39 +01:00
Andreas Fabri 89f9f21cc4 Avoid parsing x,y,z twice and add a testsuite 2013-01-16 16:01:29 +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
Philipp Möller 1adf441b18 Convert all CRLF files to LF 2012-12-03 18:44:24 +01:00
Andreas Fabri aa61332278 fix typos and links 2012-11-29 17:58:40 +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
Andreas Fabri 625f9f6cd7 after git merge remotes/origin/hot-fixes-for-Git 2012-11-20 13:02:17 +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
Sébastien Loriot ae159cbdf3 replace markup #, ##, ### by \section, \subsection and \subsubsection
(script replacement)
2012-11-06 22:02:15 +00:00
Andreas Fabri 7a6634b5a7 No need for CGAL:: in user manuals 2012-10-31 20:11:16 +00:00
Andreas Fabri 9dd1045208 linking unlinking 2012-10-30 13:07:40 +00:00
Philipp Möller 0b10df571d move doc into property_map.h itself 2012-10-23 14:32:10 +00:00
Sébastien Loriot 9a7f4a5876 skip property_map.h to avoid duplicate with package boost::property_map
basic documentation of members
2012-10-22 23:20:15 +00:00
Sébastien Loriot 585c3f9c62 link to boost property map concepts 2012-10-22 23:13:56 +00:00
Sébastien Loriot 42879db6e5 add groups
using tparam
using pre
2012-10-22 23:02:04 +00:00
Sébastien Loriot 3f6f20b5c5 fix user man 2012-10-22 22:52:11 +00:00
Sébastien Loriot 495e493ad9 remove taucs 2012-10-22 22:51:55 +00:00
Sébastien Loriot 81d24a0fcf remove fake .h files: the code is already documented with doxygen 2012-10-22 22:51:22 +00:00
Philipp Möller 31e9eadf8b Fix all PackageDescriptions to a newer layout 2012-10-19 15:52:31 +00:00
Sébastien Loriot ba2b7aef65 remove any reference to taucs 2012-10-18 13:46:11 +00:00
Philipp Möller 6615bcee09 Fix some minor glitches in headings 2012-10-18 12:55:17 +00:00
Philipp Möller 88a2f0d2db Fix a few warnings 2012-10-09 17:09:25 +00:00
Andreas Fabri 95a834708a finished 2012-10-05 13:25:34 +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
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
Andreas Fabri d8fca76ea1 polish 2012-09-25 11:34:40 +00:00
Andreas Fabri 26f1b6df71 polish 2012-09-24 13:38:55 +00:00
Andreas Fabri bfb3de785a unlinl 2012-09-21 13:50:51 +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 bc32209fc9 Remove globally duplicated anchors. 2012-09-20 16:14:23 +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
Andreas Fabri b67df505d9 doxygenize \tparam and \param in the free functions 2012-09-20 13:43:17 +00:00
Philipp Möller 1b3a78a08f Salvage the demo information from the old package description. 2012-09-20 13:30:49 +00:00
Philipp Möller 9c213f7604 Add Property_map and Point_set_processing doc 2012-09-17 17:27:48 +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
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
Laurent Rineau a04891ff93 WARNFIX: fix some warnings triggered by -Wconversion on g++ 2012-08-09 16:06:54 +00:00
Laurent Rineau 90414d195f Move <CGAL/Testsuite/use.h> to <CGAL/use.h> (in the Installation package)
That is a followup to the following commit:
  | ------------------------------------------------------------------------
  | r71090 | pmoeller | 2012-08-07 13:04:32 +0200 (Tue, 07 Aug 2012) | 6 lines
  | Changed paths:
  |    M /branches/next/Alpha_shapes_2/include/CGAL/Alpha_shape_2.h
  |    M /branches/next/Circulator/include/CGAL/circulator.h
  |    M /branches/next/Convex_decomposition_3/include/CGAL/Convex_decomposition_3/Reflex_vertex_searcher.h
  |    M /branches/next/Intersections_3/test/Intersections_3/bbox_other_do_intersect_test.cpp
  |    M /branches/next/Kernel_d/include/CGAL/Cartesian_d.h
  |    M /branches/next/Mesh_3/include/CGAL/IO/File_medit.h
  |    M /branches/next/Mesh_3/include/CGAL/Mesh_cell_criteria_3.h
  |    M /branches/next/Mesh_3/include/CGAL/Mesh_edge_criteria_3.h
  |    M /branches/next/Mesh_3/include/CGAL/Mesh_facet_criteria_3.h
  |    M /branches/next/Mesh_3/include/CGAL/make_mesh_3.h
  |    M /branches/next/Nef_2/include/CGAL/Bounded_kernel.h
  |    M /branches/next/Nef_2/include/CGAL/Nef_polyhedron_2.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_3/ID_support_handler.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_3/Infimaximal_box.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_3/vertex_cycle_to_nef_3.h
  |    M /branches/next/Nef_3/include/CGAL/Nef_polyhedron_3.h
  |    M /branches/next/Nef_3/test/Nef_3/nef_union_error_llvm.cpp
  |    M /branches/next/Nef_S2/include/CGAL/Nef_S2/SM_overlayer.h
  |    M /branches/next/OpenNL/include/CGAL/OpenNL/blas.h
  |    M /branches/next/Periodic_3_triangulation_3/include/CGAL/Periodic_3_triangulation_3.h
  |    M /branches/next/Point_set_processing_3/include/CGAL/mst_orient_normals.h
  |    M /branches/next/QP_solver/include/CGAL/QP_solver/QP_functions_impl.h
  |    M /branches/next/STL_Extension/include/CGAL/iterator.h
  |    M /branches/next/Segment_Delaunay_graph_2/include/CGAL/Segment_Delaunay_graph_simple_site_2.h
  |    M /branches/next/Subdivision_method_3/include/CGAL/Polyhedron_decorator_3.h
  |    M /branches/next/Subdivision_method_3/include/CGAL/Subdivision_mask_3.h
  |    M /branches/next/Surface_mesher/include/CGAL/Surface_mesh_default_criteria_3.h
  |    M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Adaptation_traits_functors.h
  |    M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_inserters.h
  |    M /branches/next/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Default_site_removers.h
  | 
  | 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.
  | 
  | ------------------------------------------------------------------------

The reason is that everything from CGAL/Testsuite/ is removed in public
releases (that was discussed at a CGAL developers meetings, long ago). That
means that r71090 introduced compilation errors undetectable by the tests
of internal releases. I hope that the minutes of that developers meeting
say that I was against the removal of headers between internal and public
releases!  -- Laurent Rineau
2012-08-09 15:34:08 +00: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
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
Sébastien Loriot 53d4d270eb remove warning 2012-07-06 09:21:13 +00:00
Sébastien Loriot 4cacb97039 remove warnings 2012-07-05 14:56:50 +00:00
Sébastien Loriot e702f20986 Eigen 3-1 is out.
Require Eigen 3.1.0 in CMake scripts.
2012-06-27 12:38:32 +00:00
Sébastien Loriot 13a3434734 merge from next 2012-01-23 16:28:28 +00:00
Andreas Fabri 37c999bf18 Switch off iterator debugging as this testsuite takes too long and gets killed 2012-01-23 12:46:23 +00:00
Sébastien Loriot f3751ab9b5 merge from next 2012-01-17 17:29:10 +00:00
Andreas Fabri dffde9612b Remove ^M at eol 2012-01-17 17:13:01 +00:00
Laurent Rineau 3239da640d merge changes from next; 2012-01-17 10:28:12 +00:00
Laurent Rineau a37c74d534 Add license files, per package 2012-01-16 15:54:22 +00:00
Sébastien Loriot 2865113c8c Point_set_processing test/example also uses lapack 2012-01-16 15:15:34 +00:00
Laurent Rineau 2af2160942 Turn \ccLicenseQPL into \ccLicenseGPL 2012-01-13 17:13:55 +00:00
Laurent Rineau 8f59fd9592 Turn QPL into LGPLv3+ 2012-01-13 16:33:35 +00:00