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

197 Commits

Author SHA1 Message Date
Laurent Rineau 9e586da1e6 Revert two commits. 
Revert "Add longer tests, with other data"
Revert "Verbose testsuite. Should be reverted later."

This reverts commit 0f592d8e0a.
This reverts commit a8e6764c97.
 2014-10-03 17:13:49 +02:00
Laurent Rineau 0f592d8e0a Verbose testsuite. Should be reverted later. 2014-10-03 16:41:06 +02:00
Laurent Rineau a8e6764c97 Add longer tests, with other data 
So far, that shows bugs.
 2014-10-03 16:39:04 +02:00
Sébastien Loriot 024bd2724f add output_facets_in_complex_to_off and update test and demo 2014-09-24 12:05:02 +02:00
Sébastien Loriot 9f3151c9f1 add test for C3T3::output_boundary_to_off 2014-09-24 09:12:21 +02:00
Laurent Rineau 8571477f92 Merge branch 'Mesh_3-fix_a_warning-GF' 
Fix a warning.

Tested in CGAL-4.5-Ic-100.
Approved by the Release Manager.
 2014-07-21 12:00:53 +02:00
Laurent Rineau 8ac225efa5 Trivial fix of a warning 
Trivial bug-fix for master
 2014-07-21 11:52:10 +02:00
Laurent Rineau f83486c5e3 Fix a warning when TBB is not used 
test/Mesh_3/test_meshing_utilities.h:379:44: warning: typedef 'Concurrency_tag' locally defined but not used [-Wunused-local-typedefs]
     typedef typename C3t3::Concurrency_tag Concurrency_tag;
 2014-07-18 17:29:27 +02:00
Laurent Rineau 3deb8e7910 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Create an integration branch for 'Mesh_3-compare_index-GF': a new branch
created from 'master', where I merged the previous version of
'Mesh_3-compare_index-GF'.

There was a conflict with two features recently merged into 'master' for
CGAL-4.5:

- the move of two files from include/CGAL/Mesh_3/ to include/CGAL/. See
  the small feature:
    http://cgal.org/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper

- parallelism for Triangulation_3 and Mesh_3:
    http://cgal.org/wiki/Features/Parallel_Mesh_3

Conflicts:
	Combinatorial_map/include/CGAL/Cell_attribute.h
	Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
	Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
	Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
	Mesh_3/test/Mesh_3/test_meshing_3D_image.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
	Mesh_3/test/Mesh_3/test_meshing_polyhedron_with_features.cpp
	Polyhedron/demo/Polyhedron/Polyhedron_type.h
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp

I also modified the following files during the conflict resolution:

	Linear_cell_complex/include/CGAL/Cell_attribute_with_point.h
	Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
	Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
 2014-07-18 15:47:14 +02:00
Clement Jamin c8c7ed03a6 Relax the "number of facets/vertices" criteria 2014-07-17 17:46:37 +02:00
Clement Jamin a7a654e207 Temporarily change Haussdorf distance threshold 2014-07-16 18:02:00 +02:00
Clement Jamin 32616470c7 Add parallelism to test_meshing_unit_tetrahedron.cpp 2014-07-15 20:04:35 +02:00
Clement Jamin 2d35c204fb Remove VERBOSE macro 2014-07-15 19:28:19 +02:00
Clement Jamin d299aa2202 Use different checking intervals for the sequential and the parallel version 2014-07-15 16:30:56 +02:00
Clement Jamin 1351dcbb7d Relax test 2014-07-08 19:04:23 +02:00
Clement Jamin 01b81c5bcb Fix GCC compilation 2014-07-08 16:17:51 +02:00
Clement Jamin 078e89f55f Add the possibility to remove the far points 
The far points are added by the parallel version to reduce the contention
on the infinite vertex
 2014-07-08 15:37:59 +02:00
Clement Jamin c2084d96c2 Add header 2014-07-07 20:36:31 +02:00
Clement Jamin dff670f4e3 Remove VERBOSE options 2014-07-07 11:00:41 +02:00
Clement Jamin 3a31722f37 Missing typenames 2014-07-02 16:48:49 +02:00
Clement Jamin 9932e97c7c Add missing typename + remove useless template parameter 2014-07-02 10:29:40 +02:00
Clement Jamin 6971ae4b72 The Mesh_3 tests now test both sequential and parallel version. 2014-07-01 18:53:37 +02:00
Clement Jamin 60df1d6d4a The type Tr and C3t3 are not used here. 2014-07-01 18:27:46 +02:00
Clement Jamin a0948a9dac Remove the "domain" parameter of the exuder 
It had been added for the parallel version, but it's not needed anymore
 2014-07-01 11:34:40 +02:00
Clement Jamin e3abf7fc40 Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-07-01 10:38:14 +02:00
Clement Jamin 15272293a8 Fix compilation with GCC 2014-06-30 21:29:12 +02:00
Clement Jamin 54774c78e1 Core is not needed 2014-06-30 19:56:53 +02:00
Laurent Rineau 61f0501ebb Do not use an OPTION in the testsuite 2014-06-25 15:24:38 +02:00
Laurent Rineau 35165e222d Test test_meshing_polyhedron with TBB 
One wants to compile and test the TBB and the non-TBB version of Mesh_3
in a single test.
 2014-06-25 14:32:11 +02:00
Clement Jamin 9eb766b039 CONCURRENT_MESH_3 => CGAL_CONCURRENT_MESH_3 2014-06-25 12:53:15 +02:00
Clement Jamin 4499a6abff Remove this old test completely 2014-06-04 18:03:47 +02:00
Sébastien Loriot 3fa09693a3 Merge branch 'Mesh_3-compare_index-GF-old' into Mesh_3-compare_index-GF 
Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Detect_features_in_polyhedra.h
	Mesh_3/include/CGAL/Mesh_domain_with_polyline_features_3.h
	Mesh_3/include/CGAL/Mesh_polyhedron_3.h
	Mesh_3/test/Mesh_3/test_meshing_polylines_only.cpp
	STL_Extension/include/CGAL/Compact_container.h
	STL_Extension/test/STL_Extension/test_Compact_container.cpp
 2014-05-21 18:24:17 +02:00
Aymeric PELLE 9f11f46077 Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov' 
This small feature adds a new constructor in Labeled_mesh_domain_3 and
a new function wrapper. A Labeled_mesh_domain_3 can be built from an
Iso_cuboid_3 now.
(cf. https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/New_constructor_in_Label_mesh_domain_3_and_new_function_wrapper)
The new wrapper, Implicit_multi_domain_to_labeling_function_wrapper, is a
helping class to get a function with integer values labeling the
components of a multi-domain. This small feature was successfully tested in
the internal release CGAL-4.5-Ic-45.
Approved by the Release Manager.

Conflicts:
	Installation/changes.html
 2014-05-21 18:01:42 +02:00
Clement Jamin 00a3e3691b /wd4503 and /bigobj are now already added by CGAL => useless here 2014-05-20 19:50:39 +02:00
Aymeric PELLE 566ad109eb Use CGAL macros for indicating deprecated headers. 2014-05-16 13:40:49 +02:00
Aymeric PELLE b899f9f346 Fix in the CMakeLists.txt file of Mesh_3 tests. 2014-05-15 13:55:54 +02:00
Clement Jamin f3c00442fd Merge branch 'Mesh_3-parallel-cjamin-old' into Mesh_3-parallel-cjamin 2014-05-14 19:05:40 +02:00
Aymeric PELLE 78261fcdc2 Function are wrapped into struct in two tests of Mesh_3. 
Some compilers seems to not manage function reference.
 2014-05-13 19:49:32 +02:00
Laurent Rineau 80ec1ff80b Merge branch 'Mesh_3-fix_Mesh_3_CGAL_4.3-lrineau' 
Fix bugs introduced in CGAL-4.3.

Tested in CGAL-4.5-Ic-35

Approved by the release manager
 2014-05-12 14:42:40 +02:00
Laurent Rineau 3c3b0a013a Fix expected number of cells 2014-05-12 14:41:36 +02:00
Laurent Rineau 3224c40861 Fix the number of inserted balls 
With CGAL_MESH_3_NO_PROTECTION_NON_LINEAR==1, the number of protecting
balls is higher.
 2014-05-09 10:49:19 +02:00
Laurent Rineau cd94d98168 Revert "Revert an incorrect push I did" 
This reverts commit 33cb60cc29.
 2014-05-07 15:24:25 +02:00
Laurent Rineau 33cb60cc29 Revert an incorrect push I did 2014-05-07 15:18:53 +02:00
Laurent Rineau bcefbcb8bd Merge remote-tracking branch 'origin/Periodic_3_mesh_3-Extended_mesh_3-MBogdanov' into Periodic_3_mesh_3-Extended_mesh_3-MBogdanov 2014-05-07 13:56:27 +02:00
Laurent Rineau 68c367a2df Revert "Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'"" 
This reverts commit 2e58135751.
 2014-05-07 13:56:20 +02:00
Aymeric PELLE acc69fc3af Fix : modify the CMakeLists.txt file for tests of Mesh_3. 2014-04-29 21:14:57 +02:00
Aymeric PELLE 869223f06e Add an old example as a test for testing the retro-compatibility of Implicit_vector_to_labeled_function_wrapper. 2014-04-29 20:07:47 +02:00
Aymeric PELLE 0264e0a14c Add tests for old versions of Labeled_mesh_domain_3 and Implicit_vector_to_labeled_function_wrapper. 2014-04-29 19:44:09 +02:00
Aymeric PELLE a12fe7b728 Some classes are moved from the namespace CGAL::Mesh_3 to the namespace CGAL. 
Labeled_mesh_domain_3.
Implicit_to_labeling_function_wrapper.
Implicit_vector_to_labeling_function_wrapper.
Implicit_multi_domain_to_labeling_function_wrapper.
 2014-04-16 19:57:21 +02:00
Laurent Rineau 2e58135751 Revert "Merge branch 'Periodic_3_mesh_3-Extended_mesh_3-MBogdanov'" 
This reverts commit 2ec2fb3c8e, reversing
changes made to 2ed7784521.
 2014-04-16 17:37:04 +02:00