Commit Graph

296 Commits

Author SHA1 Message Date
Andreas Fabri 3e3c33bcf0 Add generic functions read_off() and write_off() 2017-06-30 18:12:13 +02:00
Laurent Rineau c5224829fc Merge branch 'master' into Polyhedron_demo-Volume_generator-GF 2017-06-30 17:27:06 +02:00
Guillaume Damiand 4c9bbc06af Merge branch 'master' into BGL-LCC-gdamiand 2017-06-30 17:18:53 +02:00
Guillaume Damiand af704704e7 Remove a wrong is_valid 2017-06-28 11:57:32 -04:00
Guillaume Damiand 4ffbe2c761 Add missing qualifier 2017-06-28 10:00:13 -04:00
Maxime Gimeno 26f44a4e34 Fix test for make_grid 2017-06-26 10:59:11 +02:00
Maxime Gimeno c8d4385e40 Add tests for new helper functions and a grid generator 2017-06-26 10:59:10 +02:00
Guillaume Damiand 013f447395 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-22 23:21:39 +02:00
Mael Rouxel-Labbé a22c090980 Re-added test of BGL/test/next.cpp
Accidentally removed in 2814af8c04e9a975f6ebf98585e5ad36e2d54bfd
2017-06-22 16:38:14 +02:00
Andreas Fabri ff14334f7d Add concept checking for Seam_mesh 2017-06-22 16:17:13 +02:00
Mael Rouxel-Labbé 8d7c23bc24 Removed a non-existing BGL test program from the CMakeLists 2017-06-22 16:15:57 +02:00
Maxime Gimeno f9f000d1e5 Clean-up
- errors still remain :Surface_mesh_parameterize/next_bug and BGL/tests
2017-06-22 16:14:55 +02:00
Andreas Fabri 869dfbb1e9 finally it works with a Seam_mesh 2017-06-22 16:11:38 +02:00
Guillaume Damiand c8250c4570 Merge branch 'master' into BGL-LCC-gdamiand 2017-06-15 10:03:53 -04:00
Guillaume Damiand 2741138035 Remove unused targed in cmake; uncomment commented code for OMesh. 2017-06-15 09:58:21 -04:00
Guillaume Damiand f5a94891bb Update examples and demo that use BGL for LCC. 2017-06-14 11:42:15 -04:00
Sébastien Loriot 1c07419cc5 fix unused variable warning 2017-06-08 10:15:30 +02:00
Maxime Gimeno c81e4444bf Fix OpenMesh link errors and add a test for OpenMesh data. 2017-06-02 14:37:51 +02:00
Sébastien Loriot ad87028699 use named parameters for index maps 2017-05-30 15:09:42 +02:00
Sébastien Loriot 6d2526499e replace iterators of face patch indices by a range 2017-05-30 15:09:42 +02:00
Maxime Gimeno 1f96262d3d Rename the graph into Face_filtered_graph and add a function to check its validity. 2017-05-30 15:09:42 +02:00
Maxime Gimeno 6aa9eabfbd Simplify Polyhedron test. 2017-05-30 15:09:42 +02:00
Maxime Gimeno 557e1a78c1 Add tests for Polyhedron and fix Property forwarding 2017-05-30 15:08:34 +02:00
Maxime Gimeno 0ab9cf974c Add property maps binders for the indices and fix remaining bugs in graph_traits. copy_face_graph doesn't crash anymore. 2017-05-30 15:08:34 +02:00
Maxime Gimeno 6e1199d56f bitsets implementation, doc fix and tests fix. 2017-05-30 15:08:34 +02:00
Maxime Gimeno 97ad4ba2b2 Rename into Connected_components_graph 2017-05-30 15:08:34 +02:00
Maxime Gimeno afd44de2e6 Changes :
- Remove copy_face_graph_patch
- Use an unordered_set instead of a single patch_id.
2017-05-30 15:08:34 +02:00
Maxime Gimeno 904b673da6 Changes for review. 2017-05-30 15:08:33 +02:00
Maxime Gimeno f7c3c48c07 Fixes 2017-05-30 15:08:33 +02:00
Maxime Gimeno 00af500498 Add a function to copy a patch and document the Connected_component_graph 2017-05-30 15:08:33 +02:00
Maxime Gimeno 5ababe9c33 Add an adapter:
- Create an adapter for FaceListGraphs that takes a patch_id and a FaceIndexMap and acts as if the specified patch was a whole graph.
2017-05-30 15:08:33 +02:00
Laurent Rineau 7aad2a560c Merge pull request #1891 from maxGimeno/PMP_named_params_macro-GF
Use macros to add parameters in PMP
2017-05-11 17:09:38 +02:00
Guillaume Damiand a22a5fbd21 Update BGL LCC examples and tests following the modification of the API (helper class) 2017-05-10 13:27:37 -04:00
Laurent Rineau a1cd3fd9d5 Merge pull request #1991 from afabri/Triangulation_2-graph_traits_for_CDT-GF
Triangulation_2: Add graph_traits for all triangulation classes
2017-04-14 18:32:14 +02:00
Laurent Rineau 7de8a1f723 Fix a warning
> test/BGL/test_graph_traits.cpp:12:40: warning: unused parameter 'g' [-Wunused-parameter]
2017-04-13 14:25:44 +02:00
Andreas Fabri 2dbb9ea454 remove debug output
(cherry-picked from `master`, from PR #1950, to solve a warning occurring
only in `integration`)
2017-04-13 14:17:07 +02:00
Laurent Rineau 6877cdbe57 Fix the removal of test_Triangulation_2.cpp in the CMakeLists.txt
`graph_concept_Triangulation_2.cpp` was removed instead, by error.

This fixes commit 89a0313f34.
2017-04-12 17:45:26 +02:00
Andreas Fabri 89a0313f34 Remove test_Triangulation_2.cpp as it needs the boost testing framework which does not work cross platform 2017-04-07 10:34:11 +02:00
Andreas Fabri 7942f04eb6 We need the word 'main' in the file so that a testsuite gets created 2017-04-04 12:11:10 +02:00
Andreas Fabri 863e06bc3f Add typename 2017-04-03 18:39:04 +02:00
Andreas Fabri dbfc3a5f77 Add runtime test that the triangulation classes are model of BidirectionalGraph 2017-04-03 11:06:17 +02:00
Guillaume Damiand 755272148a Cleanup BGL for LCC; add shortcut for item with id to simplify definition. 2017-03-31 17:11:36 -04:00
Laurent Rineau 027744f7a6 Merge pull request #1950 from afabri/Surface_mesh-fix_is_border-GF
Surface_mesh: Fix #1949
2017-03-30 18:27:20 +02:00
Andreas Fabri d9c8207317 remove debug output 2017-03-30 08:12:05 +02:00
Guillaume Damiand f3b04f786a Add test is valid 2017-03-29 12:46:01 -04:00
Guillaume Damiand 13ed16043b Update BGL for LCC and continue on examples/tests 2017-03-29 14:22:27 -04:00
Guillaume Damiand bfbee1701e Now attributes and darts in CMap/GMap/LCC can have id or not depending on a template argument. 2017-03-27 17:16:40 -04:00
Guillaume Damiand c25b6bbbee Add test for LCC 2017-03-27 12:22:29 -04:00
Laurent Rineau eb5f52869f Use the new API of target_link_libraries
... otherwise CMake warns about mixing old and new usages of that CMake
command.
2017-03-27 18:04:54 +02:00
Guillaume Damiand f95a9558b2 Update cmap to use index in attributes/darts for property maps. 2017-03-27 11:58:30 -04:00
Guillaume Damiand 04d10f13e9 Update graph traits and properties for lcc. 2017-03-23 13:33:37 -04:00
Andreas Fabri 08eacf9d02 forward the types from the template parameter 2017-03-23 15:20:57 +01:00
Andreas Fabri de805a8934 Change the template parameter name as VC++ has a problem when combining the hierarchy with CDT_plus_2 2017-03-23 15:18:53 +01:00
Guillaume Damiand 9508b8e5ba Bug fix in test_Prefix
Strange that the assert(f2 !=null_face) was always true !!
2017-03-23 08:22:48 -04:00
Guillaume Damiand ff61b85322 update after rebase 2017-03-22 17:39:33 -04:00
Guillaume Damiand acad419a9a Update after rebase with master. 2017-03-22 17:33:05 -04:00
Guillaume Damiand a232565907 Debug (nyf) 2017-03-22 16:37:24 -04:00
Guillaume Damiand f3a6a80382 Remove my previous trick to change the orientation. 2017-03-22 16:37:24 -04:00
Guillaume Damiand 245e7751da Move edge_collapse_linear_cell_complex.cpp file from BGL test to Surface_mesh_simplification examples. 2017-03-22 16:36:01 -04:00
Guillaume Damiand d23c597022 Use load v2 instead of load 2017-03-22 16:33:39 -04:00
Guillaume Damiand 8ece528538 Add test for LCC 2017-03-22 16:33:39 -04:00
Guillaume Damiand 98fe7cb77c Some progress for graph traits for linear cell complex.
* graph_concept_Linear_cell_complex compile and run correctly.
* simplification_Linear_cell_complex compile and start to run; make some Euler modifications, then segmentation fault... I am working to debug...
2017-03-22 16:33:39 -04:00
Guillaume Damiand 9609c59bfa Work on BGL for LCC; nyf. 2017-03-22 16:32:42 -04:00
Guillaume Damiand 97ad6e35ce Debug (nyf) 2017-03-22 14:08:25 -04:00
Sébastien Loriot 6d3d570239 Merge remote-tracking branch 'cgal/releases/CGAL-4.9-branch' into HEAD 2017-03-16 09:57:17 +01:00
Sébastien Loriot 731bb17827 add missing off file 2017-03-14 17:06:35 +01:00
Andreas Fabri 58b4b81ccd fix in_edges() and out_edges() 2017-03-13 17:12:37 +01:00
Sébastien Loriot 16d369dbd0 rename test file that is in conflict with another test 2017-03-13 14:04:04 +01:00
Sébastien Loriot e9395aba6f move enum for named parameters inside internal_np namespace 2017-02-13 10:25:28 +01:00
Sébastien Loriot 2068ba14ce remove non used named parameter 2017-02-10 16:45:18 +01:00
Maxime Gimeno 0f9c102516 Move the enums in a namespace parameters to clean-up the namespace CGAL. 2017-02-09 15:29:18 +01:00
Andreas Fabri fde59886ba Concept check GWdwg 2016-12-13 15:25:54 +01:00
Maxime Gimeno 719565c8a6 Fix warnings in test 2016-12-13 09:03:42 +01:00
Andreas Fabri 4a323718e3 Use CGAL_assertion; test that the assertion gets triggered 2016-12-09 17:33:25 +01:00
Andreas Fabri c058ae9bcc deacronymize header file name 2016-12-09 17:01:11 +01:00
Maxime Gimeno 5141f55efe Make doc 2016-12-06 12:59:56 +01:00
Andreas Fabri 3703683761 Add put 2016-12-06 12:59:55 +01:00
Andreas Fabri 211fcb4107 Partial support for propery maps 2016-12-06 12:59:55 +01:00
Andreas Fabri 5f18b0738c First version of a graph class that stores a pointer to the graph in the descriptor (for debugging) 2016-12-06 12:59:55 +01:00
Andreas Fabri 0c0582f016 cleanup of CMakeLists.txt 2016-11-29 10:14:18 +01:00
Andreas Fabri e0484d4988 Remove Graph_geometry.h 2016-11-28 08:39:51 +01:00
Guillaume Damiand 55f0b69fdf Remove my previous trick to change the orientation. 2016-11-01 14:33:24 -04:00
Laurent Rineau 9a0bb54922 Merge pull request #1438 from sloriot/CGAL-clean_up_projects_name_cmake
Clean up projects name in cmake scripts
2016-10-05 13:02:25 +02:00
Jane Tournois 50b05a15c7 use double parenthesis inside static assertion when expression has a comma 2016-09-22 12:10:06 +02:00
Jane Tournois 197252149e fix warnings 2016-09-22 12:10:06 +02:00
Jane Tournois 5391a66dde add test for Has_member_id 2016-09-22 12:05:51 +02:00
Sébastien Loriot 7e2ee496de update project name of cmake scripts of tests 2016-09-08 00:26:37 +02:00
Sébastien Loriot bd4a78c45a enable concept checking for Surface_mesh 2016-07-22 14:21:09 +02:00
Laurent Rineau 8e604f70f2 Merge modifications from 'releases/CGAL-4.8-branch'
Merges the following:

> dbb2be1 Merge pull request #983 from lrineau/Mesh_3-fix_test_meshing_3D_gray_image-lrineau
> 5dcd5c7 Merge pull request #958 from gdamiand/BGL-bugfix-gdamiand
> 869e65a CGAL-4.8 announcement
2016-04-05 11:24:19 +02:00
Laurent Rineau a92cbe2f77 OpenMesh-3.2 does not like comments in OFF files
We have put the comments at the end of the file and it works.
2016-04-04 11:52:02 +02:00
Andreas Fabri 18d8d97c47 CGAL::CGAL -> CGAL 2016-04-04 11:52:02 +02:00
Andreas Fabri b4c608940e Qualify generic BGL functions with CGAL:: when used outside of the CGAL namespace 2016-04-04 11:52:02 +02:00
Guillaume Damiand 790764dfa1 Replace SM by OMesh 2016-04-04 11:52:02 +02:00
Guillaume Damiand 261572f19f Move edge_collapse_linear_cell_complex.cpp file from BGL test to Surface_mesh_simplification examples. 2016-03-29 09:32:28 +02:00
Guillaume Damiand bb88d311ae Replace SM by OMesh 2016-03-28 22:11:00 +02:00
Guillaume Damiand ac9b8e36a1 Use load v2 instead of load 2016-03-25 18:50:34 +01:00
Guillaume Damiand 28b7a657b2 Add test for LCC 2016-03-25 18:39:12 +01:00
Guillaume Damiand d8c6439eb8 Some progress for graph traits for linear cell complex.
* graph_concept_Linear_cell_complex compile and run correctly.
* simplification_Linear_cell_complex compile and start to run; make some Euler modifications, then segmentation fault... I am working to debug...
2016-03-25 17:10:08 +01:00
Guillaume Damiand 8c89fd1bee Work on BGL for LCC; nyf. 2016-03-24 21:59:04 +01:00
Laurent Rineau 076c982dbf Merge pull request #676 from bo0ts/BGL-document_dual-pmoeller
BGL: document Dual
2016-03-24 17:11:27 +01:00
Philipp Möller 4211a4f01e Globally remove CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS
This is a Cmake 2.4.3 variable that isn't even documented anymore.
2016-02-16 17:02:55 +01:00
Sebastien Loriot 718eae7a00 Merge pull request #714 from sgiraudot/CGAL-Fix_boost_warning_unused_typedef-GF
Fix boost warning (unused typedef)
2016-02-05 14:59:28 +01:00
Simon Giraudot eb5ff8ddc9 Add missing CGAL_UNUSED on BOOST_CONCEPT_ASSERT. 2016-02-04 11:44:21 +01:00
Andreas Fabri de3ad814b1 Add a testcase for the g++4.4 bug 2016-02-03 15:10:46 +01:00
Philipp Möller 82d3ad5432 Remove unused typedef 2016-02-02 16:00:31 +01:00
Philipp Möller 4208d3a1aa Remove license headers from test cases 2016-02-02 16:00:31 +01:00
Philipp Möller 212200e391 Add a check for another edge_property 2016-02-02 16:00:31 +01:00
Philipp Möller 9c9256da8c Add the overloads to fix face/vertex_index_t 2016-02-02 16:00:31 +01:00
Philipp Möller bb1f3f6dcb Check the property concepts 2016-02-02 16:00:31 +01:00
Philipp Möller e6ef757af4 Add a concept check for DualS 2016-02-02 16:00:31 +01:00
Philipp Moeller e664771f50 Also add the CGAL_USE_OPENMESH define
The BGL testsuite uses the define CGAL_USE_OPENMESH to check if OpenMesh is available, but that define is not set even if it there.
2016-01-08 12:31:47 +01:00
Philipp Möller f17dd10214 Add a clear helper
This helper will use the faster clear member function, if it is
available or clear the mesh in a traditional fashion otherwise.
2016-01-08 12:31:47 +01:00
Philipp Möller 9766b8f350 Add traits class to check for member clear 2015-12-27 17:03:17 +01:00
Andreas Fabri 48f367e68b fix bug and improve testsuite 2015-11-20 09:56:55 +01:00
Andreas Fabri 6eeebfe8d0 test make-triangle() 2015-10-14 10:41:47 +02:00
Philipp Möller bda64df544 Remove unnecessary includes 2015-07-30 14:16:59 +02:00
Sébastien Loriot a220686d02 satisfies_link_condition->does_satisfy_link_condition to match naming convention 2015-07-21 10:27:27 +02:00
Sébastien Loriot 6b15ec643c Merge branch 'CGAL-Qt5_support-GF' into cgal-public-dev/Polygon_mesh_processing-GF
Conflicts:
	Mesh_3/demo/Mesh_3/include/CGAL/gl_render.h
	Polyhedron/demo/Polyhedron/CMakeLists.txt
	Polyhedron/demo/Polyhedron/GlSplat/GlSplat.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
2015-07-16 16:52:53 +02:00
Sébastien Loriot c89fa4bd53 simplify bgl named parameters handling with boost < 1.51 and make PMP compatible 2015-07-16 16:01:21 +02:00
Laurent Rineau f9917c487e CMake 2.8.11 2015-07-13 12:36:43 +02:00
Sébastien Loriot d164633493 remove REQUIRED keyword 2015-07-07 11:23:46 +02:00
Andreas Fabri 2416a8917b Do not #define CGAL_USE_OPENMESH 2015-07-02 15:26:11 +02:00
Andreas Fabri 28c631a177 fix BGL test suite 2015-07-01 14:25:20 +02:00
Andreas Fabri 20c1b1a1f6 Merge branch 'Polygon_mesh_processing-GF-old' into Polygon_mesh_processing-GF
Conflicts:
	BGL/include/CGAL/boost/graph/Euler_operations.h
	BGL/include/CGAL/boost/graph/iterator.h
	Documentation/doc/Documentation/Doxyfile.in
	Documentation/doc/Documentation/dependencies
	Polyhedron/demo/Polyhedron/Polyhedron_demo_point_inside_polyhedron_plugin.cpp
	Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
	Polyhedron/demo/Polyhedron/Selection_widget.ui
2015-07-01 13:52:44 +02:00
Andreas Fabri 307c86910b fix a -strict-ansi warning 2015-05-18 10:52:50 +02:00
Andreas Fabri 1cd6715d9b perform Euler operations tests also for OM 2015-05-15 11:23:03 +02:00
Andreas Fabri e354de8493 char* -> const char* 2015-04-20 11:14:12 +02:00
Andreas Fabri d539246011 add typename; remove unused typedefs 2015-04-20 10:48:12 +02:00
Andreas Fabri 8eb4ec93c4 fixes and cleanup 2015-04-16 11:21:19 +02:00
Andreas Fabri 6e7debb874 test helpers 2015-04-15 16:36:23 +02:00
Andreas Fabri e1c1b58415 Add a test for the make_hexahedron 2015-03-18 15:48:19 +01:00
Laurent Rineau 2a58fbda4a Merge remote-tracking branch 'origin/Surface_mesh-isolated_vertex-GF'
Bug-fix for the BGL API:

  - Remove assertion in halfedge(Polyehdron_3, vertex_descriptor) as it
    is wrong for an isolated vertex.
  - fix a warning.

Fix the documentation:

  - Document that add_vertex/edge/face(G&) do not initialize the
    connectivity

Approved by the Release Manager.
Tested in CGAL-4.6-Ic-132.
2015-02-19 17:42:23 +01:00
Andreas Fabri af0800bb45 CGAL_USE a variable 2015-02-18 11:11:11 +01:00
Andreas Fabri fb5280b2aa Remove assertion in halfedge(Polyehdron_3, vertex_descriptor)
as it is wrong for an isolated vertex.
Document that add_vertex/edge/face(G&) do not initialize the connectivity
2015-02-17 11:43:23 +01:00
Andreas Fabri dc0687dc26 Use iterator_adaptor instead derivation from transform_iterator
With transform iterator we would have to rewrite operator++
as it does not return the derived class.
This led to a compilation bug when using connected_components.
2015-02-11 17:24:08 +01:00
Andreas Fabri 6e36a853a9 Merge branch 'Surface_mesh-new_package-GF'
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/resources/how_to_cite_cgal.bib.in
	Installation/changes.html
2015-01-12 11:27:35 +01:00
Andreas Fabri dc797a7036 use numeric_cast, as abs does not change the return type 2015-01-08 09:38:41 +01:00
Andreas Fabri be632d39f5 use the size type of the graph 2014-12-29 14:47:14 +01:00
Andreas Fabri 18b5b312f9 do not use the boost testing framework 2014-12-18 20:32:50 +01:00
Sébastien Loriot 12a9027ed9 Merge remote-tracking branch 'origin/BG-split_graph_into_polylines-GF'
The extract polyhedron boundary now extract maximal polylines from
  the set of boundary edges. End point are vertices of degree != 2
  For convenience the function used to build these maximal polylines
  is put into include/CGAL/boost/graph/split_graph_into_polylines.h

Tested in 4.6-Ic-76
Approved by the release manager
2014-12-16 11:40:11 +01:00
Sébastien Loriot eaedcd3724 move file to test 2014-12-11 18:56:59 +01:00
Sébastien Loriot ad1954afc4 fix warnings and compilation issues 2014-12-10 17:34:51 +01:00
Andreas Fabri 901c3829d0 add tests 2014-11-26 11:06:31 +01:00
Andreas Fabri 4355794781 iterator_range moved the package 2014-11-12 14:40:51 +01:00
Andreas Fabri d91f2deaff safisfies_link_condition() -> satisfies_link_condition() in code/doc/test
Add doxygen for collapse_edge() with an EdgeIsConstrainedMap
2014-10-21 10:17:34 +02:00
Sébastien Loriot 0b8314e28d the notion of border for a halfedge is not encoded using a property map 2014-07-21 22:30:14 +02:00
Sébastien Loriot a158d13647 initial version of Surface_mesh package 2014-07-15 12:08:51 +02:00
Sébastien Loriot cd88dc010b remove extra include directives 2014-07-04 17:24:06 +02:00
Sébastien Loriot ec9c796552 remove exe flag 2014-07-04 17:24:06 +02:00
Sébastien Loriot 5f4813b64d properties_Polyhedron_3.h is now included by graph_traits_Polyhedron_3.h 2014-07-04 17:24:05 +02:00