Commit Graph

973 Commits

Author SHA1 Message Date
Sebastien Loriot ab704be3b5 Merge pull request #473 from janetournois/Mesh_3-fix_protection_bug-GF
Mesh 3 : fix limit case in polylines protection
2015-11-13 12:36:33 +01:00
Jane Tournois a5162d86e1 bugfix : deal with the limit case
where the point to be found is almost exactly the endpoint of the polyline,
just "behind" it in terms of geodesic_distance
2015-11-10 16:35:31 +01:00
Jane Tournois f9d16f6720 this code should not be called for a triangulation of dimension < 3 2015-11-10 16:33:58 +01:00
Jane Tournois 31ebc6c472 use complete API of boost::optional 2015-10-30 16:06:31 +01:00
Jane Tournois adf5c63fb2 add meshing of segmented images 2015-10-29 15:40:43 +01:00
Jane Tournois b8ffee0f3a add typedef to be used in polyhedron demo 2015-10-29 14:09:22 +01:00
Laurent Rineau cc84605c2b Merge pull request #421 from janetournois/Mesh_3-check_weights_before_optimization-jtournois
Mesh_3 - add a precondition to global optimizers
2015-10-16 11:45:56 +02:00
Jane Tournois 5b03df377f fix compilation 2015-10-15 15:47:52 +02:00
Jane Tournois a77b066f6b add a precondition to global optimizers
this precondition checks that global optimizers are not run on a
triangulation with weights.
Protecting balls are an exception and don't prevent global optimizers
from running
2015-10-15 13:11:48 +02:00
Clement Jamin 77e6772aa7 Use Real_timer in Mesh_3 since the algorithms might be parallel
And update the doc accordingly
2015-10-08 15:26:50 +02:00
Laurent Rineau 7ddefbdcc8 Merge pull request #297 from afabri/CGAL-assert-GF
assert() should not be used in CGAL headers!
2015-09-07 10:58:20 +02:00
Laurent Rineau 0bc029c5b8 Revert "suppress performance warning concerning an assertion"
This reverts commit 580b65d8a5.

The warning was already fixed by commit
63ae26eb0f.
2015-09-04 13:52:45 +02:00
Andreas Fabri 0d18ccf09d Merge branch 'CGAL-assert-GF' of github.com:CGAL/cgal-dev into CGAL-assert-GF 2015-09-04 12:30:26 +02:00
Andreas Fabri 580b65d8a5 suppress performance warning concerning an assertion 2015-09-04 12:30:07 +02:00
Laurent Rineau 63ae26eb0f Fix MSVC warning: conversion from size_t to bool
MSVC emits that warning:

    include\CGAL/Implicit_to_labeling_function_wrapper.h(205) : warning C4800: 'unsigned int' : forcing value to bool 'true' or 'false' (performance warning)

The fix is to explicit exactly what is tested. The following:

    CGAL_assertion(funcs.size());

is replaced by the explicit:

    CGAL_assertion(funcs.size() != 0);
2015-09-04 11:14:56 +02:00
Laurent Rineau 253e0dddcf Fix issue #300
Update_c3t3::operator() does not return bool!
2015-09-03 12:59:05 +02:00
Andreas Fabri 1e2ff1131e assert -> CGAL_assertion 2015-08-27 16:51:55 +02:00
Laurent Rineau 8035aa83ac Do not initialize estimated_bbox if not required
`estimated_bbox` is used only by the parallel version, or if
`CGAL_SEQUENTIAL_MESH_3_ADD_OUTSIDE_POINTS_ON_A_FAR_SPHERE` is defined.
2015-08-20 16:23:30 +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
Jane Tournois 32f0c9b37b rename Point_inside_polygon_mesh to Side_of_triangle_mesh
and document it
2015-06-25 11:51:45 +02:00
Laurent Rineau 22242f69c7 Merge pull request #125 from lrineau/Mesh_3-fix_with_gcc44_cpp11-lrineau
Fix a compilation error with gcc44 -std=c++0x

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
2015-06-18 17:31:09 +02:00
Laurent Rineau b221fd0328 Fix an incoherent indentation 2015-06-17 12:24:01 +02:00
Laurent Rineau 21a699368d Fix a compilation error with gcc44 -std=c++0x
Should fix issue https://github.com/CGAL/cgal/issues/121

The error was that the "domain" class returns a `CGAL::Point_3<K>`, the
triangulation uses `CGAL::Weighted_point<CGAL::Point_3<K>, double>`, and
one piece of code from Mesh_3 in <CGAL/Mesh_3/Refine_facets_3.h> uses an
implicit conversion from

    tuple<something_A, something_B, CGAL::Point_3<K> >
to

    tuple<something_A, something_B, CGAL::Weighted_point<P, double> >

and plugs that into a `boost::optional`. For some reason, the g++-4.4
compiler does not like that, but recent g++ compilers accept the code.

The fix is to use an explicit conversion from `Point_3` to
`Weighted_point<Point_3, double>`.
2015-06-17 12:21:15 +02:00
Simon 7bb2046372 This should solve issue #41.
(cherry picked from commit bc125c525c)
2015-06-17 12:07:51 +02:00
Simon 195f11a98f Explicitely call the constructor of Surface_patch to prevent compilation failures with g++.
(cherry picked from commit f9e4a9faff)
2015-06-17 12:04:13 +02:00
Laurent Rineau 40c629a3b4 Merge pull request #90 from janetournois/Mesh_2-add_optimizers-GF
Add optimizer methods in Mesh_2

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/lloyd_optimize_mesh_2
2015-06-10 11:57:53 +02:00
Sébastien Loriot ce8806b19b Merge remote-tracking branch 'cgal-dev/CGAL-Qt_no_keywords-GF' into Mesh_2-add_optimizers-GF
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
2015-05-19 09:07:08 +02:00
Sébastien Loriot 7cabb0c508 Merge branch 'rebase/Mesh_2-add_optimizers-GF-old' into rebase/Mesh_2-add_optimizers-GF
Conflicts:
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.cpp
	GraphicsView/demo/Triangulation_2/Constrained_Delaunay_triangulation_2.ui
	Triangulation_2/include/CGAL/Constrained_Delaunay_triangulation_2.h
2015-05-19 09:01:20 +02:00
Jane Tournois 83c415bca9 move Mesh_optimization_return_code from Mesh_3 to Mesh_2
Mesh_3 already depends on Mesh_2,
but not the other way around
2015-05-19 08:54:36 +02:00
Laurent Rineau 617c8de2c6 Merge pull request #51 from SLopezBRGM/master
simple fixes to use generic indexes for subdomains and surfacepatches
2015-05-18 11:03:51 +02:00
Simon 067647eebf Replacing the use of operator!= by !( operator== ) when comparing domain or surface indexes.
This is link to issue #37.
2015-04-16 10:12:50 +02:00
Simon bc125c525c This should solve issue #41. 2015-04-14 21:31:18 +02:00
Philipp Möller 49a56c5a79 Fine grained range includes 2015-04-13 17:26:36 +02:00
Philipp Möller 74e71f41e2 Remove uses of Boost.Lambda
Replace Boost.Lambda with simple loops. The library is not maintained
and no one is going to ever invest in it again. It adds to compile and
preprocessing times without providing safer or shorter code and we can
sacrifice a little bit of readability.
2015-04-13 17:24:08 +02:00
Philipp Möller 4f8e76b074 Boost.Lambda is not used here anymore 2015-04-13 16:47:00 +02:00
Simon f9e4a9faff Explicitely call the constructor of Surface_patch to prevent compilation failures with g++. 2015-04-12 22:27:44 +02:00
Jane Tournois 6de112e4a3 move internal folder to subfolder of Polygon_mesh_processing 2015-03-16 10:04:56 +01:00
Sébastien Loriot 13296e6887 Merge branch 'old/Polygon_mesh_processing-GF' into Polygon_mesh_processing-GF 2015-02-16 11:48:29 +01:00
Sébastien Loriot 607929b069 Merge remote-tracking branch 'origin/releases/CGAL-4.5-branch'
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2015-02-16 11:45:08 +01:00
Jane Tournois 0d1087857a int -> size_t + cherrypick 2015-02-12 17:17:28 +01:00
Jane Tournois f4af27a3da reorder variables for initialization 2015-02-06 10:01:41 +01:00
Sébastien Loriot 39f9813070 add discover_connected_component 2015-02-05 14:04:43 +01:00
Jane Tournois abfc6d92c8 fix a warning caused by boost::dynamic_bitset<> 2015-02-03 11:20:01 +01:00
Jane Tournois 21082320e3 minimize changes to get warnings, but dynamic_bitset triggers a warning 2015-02-03 11:05:29 +01:00
Jane Tournois a923ae477d fix conversion warnings. meshing_info() is an int here 2015-02-03 10:25:43 +01:00
Jane Tournois b03a656246 this becomes useless because we now backup infinite cells 2015-02-02 15:55:28 +01:00
Jane Tournois c57b9b8840 backup infinite cells for revert_move of perturber
this is necessary because there can be an infinite cells
among the outdated_cells (with a finite facet f)
that does not share any finite facet with the other cells of
the conflict zone/set of outdated cells.

Therefore the surface info of f cannot be

Conflicts:
	Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
2015-02-02 15:54:34 +01:00
Laurent Rineau 434766c22b Merge branch 'releases/CGAL-4.5-branch'
Approved by the Release Manager.
2015-01-30 11:30:49 +01:00
Laurent Rineau 72e0a3e677 Fix warnings about signed/unsigned
The code involved is about TBB.
2015-01-21 12:59:07 +01:00
Laurent Rineau 602383e15b Merge branch 'Mesh_3-fix_Implicit_mesh_domain_3_default_bound-lrineau'
Bug fix in Mesh_3

Approved by the Release Manager. Tested in CGAL-4.6-Ic-79.
2014-12-17 17:09:20 +01:00