79f2337237
add more to sliver_criteria to complete before_move and valid_move
2013-09-10 17:27:47 +02:00
da6870aab6
add functions to the sliver_criterion concept to check if a move should be accepted or not (not degrading criteria)
2013-09-10 15:43:49 +02:00
9e38187dd6
replace return type of Sliver_criterion's operator() from double to boost::optional<double>, and updating code consequently
...
for now we suppose that operator() always returns a valid value
2013-09-10 15:30:38 +02:00
efd97dd121
add virtual functions to Sliver_criterion and use them :
...
- get_max_value() to be able to keep the abstract class and derivatives properly
- get_perturbation_unit() to replace "delta" in Sliver_perturber (progressive version of perturber is running for bound = i*delta for i >= 1)
2013-09-10 11:52:08 +02:00
3cac42e78e
remove use of default constructor
2013-08-29 16:39:30 +02:00
5fd466cb53
fixes previous commit constness issues
2013-08-13 12:34:21 +02:00
ce80651f43
add boost parameter perturbation_vector_ to perturb_mesh_3,
...
to be able to add your own perturbation, that should be an Abstract_perturbation (see vertex_perturbation.h)
2013-08-12 15:00:58 +02:00
aefda6b8c1
use SliverCriterion in CGAL::perturb_mesh_3.
...
a boost parameter sliver_criterion is added to perturb_mesh_3, and
by default, sliver_bound is used in the min_dihedral_criterion, as before
2013-08-09 17:15:28 +02:00
7552d76c1b
Revert the following commit for that file
...
| commit 01ee3e94b6
2013-08-07 14:16:39 +02:00
30e0b2d3f3
add missing include
2013-07-25 10:05:24 +02:00
2dbf0b4bf7
the grid to do inside-test is no longer needed, a better version is now used
...
the old code can still be accessed in the file:
Operations_on_polyhedra/include/CGAL/Point_inside_polyhedron_3_old.h
2013-07-10 10:42:07 +02:00
20446fa777
Merge branch 'Mesh_3-using_new_inside_polyhedron-local'
...
Successfully tested in CGAL-4.3-Ic-85
Approved by the release manager
Conflicts:
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
2013-07-09 17:34:15 +02:00
501484f509
Merge branch 'Mesh_3-fix_documentation-cjamin'
...
Small feature: https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Documentation_fix_in_Mesh_3
Approved by the release manager
2013-07-08 16:09:53 +02:00
98cfba361c
Fix Rebind_TDS bug
...
Conflicts:
Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h
2013-07-05 10:50:17 +02:00
97bef9652a
Merge branch 'Mesh_3-fix_documentation-cjamin-old' into Mesh_3-fix_documentation-cjamin
2013-07-04 14:41:33 +02:00
e3aad4d079
Fix warnings
2013-06-26 14:49:03 +02:00
c6a57e79f1
Fix a warning about unused parameters
2013-06-25 17:43:17 +02:00
01ee3e94b6
Use 'std::istream::operator!()' twice to replace 'operator bool()' (C++11 only)
...
Fixes a compilation error from clang:
include/CGAL/IO/File_binary_mesh_3.h:39:10: error: no viable conversion from 'std::ostream' (aka 'basic_ostream<char>') to 'bool'
return os << c3t3;
^~~~~~~~~~
2013-06-25 12:53:24 +02:00
4620b38ffd
update include path
2013-06-24 17:27:41 +02:00
27f24bd350
Remove two useless functions
2013-06-24 17:00:04 +02:00
9bee0e2f6a
Fix a bug when a cycle is covered by only two balls
...
When the first point of the cycle is inserted, the radius of its ball is
limited by the third of the distance to a "midpoint" of the cycle.
2013-06-24 16:59:45 +02:00
1224038bb2
fix license issues
2013-06-24 14:13:08 +02:00
5411669c88
Integrate point inside query to Polyhedral_mesh_domain_3
2013-06-24 13:38:44 +02:00
0f116f968a
use the new return type of Intersect_3
2013-06-21 13:14:46 +02:00
1a8647a195
fix copy-paste error
2013-06-21 12:49:57 +02:00
5f43373646
use the new return type of intersection
2013-06-21 12:43:37 +02:00
02bdcc8603
Revert "remove Robust_intersection_traits_new"
...
This reverts commit 77b6b2e008
2013-06-21 12:42:12 +02:00
77b6b2e008
remove Robust_intersection_traits_new
2013-06-21 12:39:52 +02:00
483440c8f2
use new return type of intersection
2013-06-21 12:39:20 +02:00
d4d3c405fe
Exact_type_selector has been renamed Exact_field_selector
2013-06-21 12:37:33 +02:00
404f2e0e3c
merge
2013-06-21 10:01:19 +01:00
4a1f9cc831
deprecate Mesh_cell_base_3 and use Compact_mesh_cell_base_3 in Mesh_triangulation_3.h
2013-06-20 12:29:46 +02:00
62f9bfc040
Fix warnings
2013-06-19 13:08:13 +02:00
acc845ef65
promote Compact_mesh_vertex_base to Mesh_vertex_base
2013-06-18 17:49:28 +02:00
c09ec2beaa
Merge branch 'Kernel-replace_object-pmoeller'
...
Successfully tested in CGAL-4.3-Ic-59
Approved by the release manager
Conflicts:
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_d/doc/Kernel_d/Kernel_d.txt
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-06-14 14:26:05 +02:00
0f8498f3b5
Revert "use relative path in tagfiles, otherwise documentation output cannot be moved"
...
This reverts commit ea256c954a
2013-06-13 15:21:07 +02:00
ea256c954a
use relative path in tagfiles, otherwise documentation output cannot be moved
2013-06-11 12:54:25 +02:00
7b7029fdbc
Fix a warning (unused parameter) in Mesh_3
2013-06-05 14:55:22 +02:00
75ebdeaeeb
update the replacement of Object_and_primitive_id ...
...
... to be a pair< variant<XXX>, Primitive_id > rather than
pair<optional<variant<XXX> >, Primitive_id >
The rational is that the optional around the variant here is not needed
since there is one around the pair.
2013-05-21 18:39:23 +02:00
c37c3ca167
remove Mesh_vertex_base_3 and rename Compact_mesh_vertex_base_3.h to Mesh_vertex_base_3.h
2013-05-17 14:50:50 +02:00
29cc781c83
Avoir another segfault due to a const reference to an object that is modified
...
A const reference only guaranty that the code cannot modify the object
*using that reference*. There is no guaranty that the object will not be
modified using another reference!
2013-05-06 13:19:23 +02:00
4fae376de3
Avoid a segfault (const ref to a temporary)
2013-05-03 17:13:31 +02:00
ea5f79db80
Fix warnings
2013-05-03 15:13:18 +02:00
7a530ea7d8
remove just_incident_cells.
...
The bench I made did not show that it provided any computation time improvement.
2013-04-11 12:48:04 +02:00
7582f85841
fix template parameter name : should be MD for MeshDomain, not MT
2013-03-29 17:32:11 +01:00
abd099e8b6
Intrusive_list : change modificators of next_intrusive and previous_intrusive to functions set_next_intrusive and set_previous_intrusive
...
(old functions were returning a reference for modification)
2013-03-29 14:05:14 +01:00
2594644d60
fix compilation in debug mode when macro is activated, on windows
2013-03-28 16:40:53 +01:00
081c39706d
Replaced "Void" (undocumented) by Default
2013-03-25 15:18:42 +01:00
c848a6eb12
Added vertex_base and cell_base to Mesh_triangulation_3 template params
...
And a placeholder for the future Concurrency_tag (unused for now)
2013-03-25 11:45:30 +01:00
d67db385fa
Merge branch 'Mesh_3-improvements-GF-old' into Mesh_3-improvements-GF
...
Conflicts:
Mesh_3/include/CGAL/refine_mesh_3.h
2013-03-21 11:22:15 +01:00
f97d6b8bd9
s/boost::result_of/cpp11::result_of/g
2013-03-14 10:38:13 +01:00
d6905c61be
Merge branch 'Kernel-replace_object-pmoeller-old' into Kernel-replace_object-pmoeller
...
Conflicts:
AABB_tree/include/CGAL/AABB_tree.h
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Intersections_3/include/CGAL/Intersections_3/intersection_3_1_impl.h
Kernel_23/doc/Kernel_23/CGAL/intersections.h
Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h
STL_Extension/doc/STL_Extension/CGAL/iterator.h
2013-03-14 10:29:31 +01:00
22e272627b
remove unused variable
2013-03-01 16:24:47 +01:00
bc7e2a1d71
Merge remote-tracking branch 'origin/Mesh_3-improvements-GF' into Mesh_3-improvements-GF-new
...
Mesh_3-improvements-GF-new is fresh fork of master
Conflicts:
.gitattributes
AABB_tree/include/CGAL/AABB_tree.h
GraphicsView/src/CGAL_Qt4/DemosMainWindow.cpp
Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
2013-02-28 17:10:16 +01:00
220ddbf6b2
New macro CGAL_GCC_VERSION to help preprocessor conditionals on gcc version
...
And use it in <CGAL/refine_mesh_3.h>
2013-02-27 19:58:02 +01:00
892efd0a3a
Merge bug fixes into Mesh_3-improvements-GF
2013-02-08 17:39:04 +01:00
c71cc0fbba
Moved the "get_opposite_ordered_edge" call into the "if"...
...
... so that it doesn't get called for nothing.
2013-02-07 16:02:05 +01:00
dbfcb44e69
include config.h to use or not compact_mesh_cell_base using the macro
2013-02-07 16:01:19 +01:00
6c8863de89
fix the use of inexact_locate
2013-02-07 16:00:22 +01:00
354ddc85fc
Fix the case of <CGAL/Mesh_3/implicit_to_labeled_function_wrapper.h>
...
That header file contains a class named
CGAL::Mesh_3::Implicit_to_labeled_function_wrapper and the naming
guidelines are well followed but the case of the file.
That header file is internal to Mesh_3 and not documented.
2013-02-07 15:29:46 +01:00
c9cd613991
Optimized fill_modified_vertices (just call insert instead of find+insert)
2013-02-07 15:29:09 +01:00
d2a9ca727b
Forward the construction with three arguments to the base
2013-02-07 15:27:16 +01:00
0cd47271d8
Fix compilation errors on Windows
2013-02-07 15:27:15 +01:00
bc37e108ad
make end of lines consistent
2013-02-07 15:25:28 +01:00
b1ebef77d2
remove warning
2013-02-07 15:23:30 +01:00
2740aa9c05
use size_type instead of int
2013-02-07 15:16:03 +01:00
e87dad0f95
Fix all warnings in demo/Polyhedron/
...
The compilation was fix g++-4.8, and the flags:
--std=c++11 -frounding-math Wall -Wno-array-bounds -Wno-uninitialized
2013-02-06 17:03:20 +01:00
f68da3f49c
Fix a bug when a cyclic 1D-feature intersects other curves
...
There was a bug in
<CGAL/Mesh_domain_with_polyline_features_3.h>
and
<CGAL/Mesh_complex_3_in_triangulation_3.h>
when a cycle (in 1D-features of the the domain) had a cycle that intersected
at least one other curve (at it "first" point).
That first point must be marked as a corner. But the cycle remains a cycle.
2013-01-30 17:08:25 +01:00
5b17407fe5
Always initialize 'nearest_point'
2013-01-30 16:43:09 +01:00
0f34f2a89e
Merge branch 'Maintenance-include-less-boost-pmoeller'
2012-12-21 09:44:18 +01:00
82b2ebc865
apply the cpp0x namespace renaming in all files
2012-12-19 11:33:17 +01:00
71ea8e6e22
Minimal boost includes
...
Replace type_traits.hpp and utility.hpp with the respective
fine-grained includes.
2012-12-14 18:13:59 +01:00
fa16817382
Use result_of for intersections in Mesh_3
2012-12-07 18:00:46 +01:00
60f464cfcb
Fix the use of deprecated types no longer in the concept MeshDomain_3
2012-12-07 15:56:21 +01:00
d198458ca7
Merge branch 'origin-gsoc2011-boost_object-pmoeller' into Kernel-replace_object-pmoeller
...
Conflicts:
.gitattributes
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
AABB_tree/include/CGAL/AABB_traits.h
AABB_tree/include/CGAL/AABB_tree.h
AABB_tree/test/AABB_tree/AABB_test_util.h
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2/arr_queries.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/Arr_trapezoid_ric_point_location.tex
Arrangement_on_surface_2/doc_tex/Arrangement_on_surface_2_ref/intro.tex
Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_generator_base.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_lm_random_generator.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h
Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
Arrangement_on_surface_2/test/Arrangement_on_surface_2/point_location.cpp
Circular_kernel_2/include/CGAL/Circular_kernel_2/internal_functions_on_line_arc_2.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_circular_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_line_arc_3.h
Circular_kernel_3/include/CGAL/Circular_kernel_3/internal_functions_on_sphere_3.h
Filtered_kernel/include/CGAL/Lazy.h
Filtered_kernel/include/CGAL/Lazy_kernel.h
Intersections_2/include/CGAL/Triangle_2_Iso_rectangle_2_intersection.h
Intersections_2/test/Intersections_2/test_intersections_2.cpp
Intersections_3/test/Intersections_3/test_intersections_3.cpp
Kernel_23/doc_tex/Kernel_23_ref/intersection.tex
Kernel_23/include/CGAL/Kernel/Type_mapper.h
Kernel_d/doc_tex/Kernel_d_ref/Kernel.tex
2012-12-04 17:57:53 +01:00
77ee36827f
Merge branch 'Mesh_3-improvements-GF' of ssh://scm.cgal.org/var/git/cgal into Mesh_3-improvements-GF
2012-11-21 14:11:15 +01:00
3f10460e00
These lines were wrong and useless (old_vertex->XXX_intrusive() is always 0)
2012-11-21 12:33:32 +01:00
8151704af9
remove warning about initialization of tables
2012-11-21 12:13:27 +01:00
21dd336011
Add Triangulation_vertex_base_with_info_3 and
...
Triangulation_cell_base_with_info_3 in the io_signature system
2012-11-20 12:27:19 +01:00
07f1a8381a
Extend the API to be compatible with the API of Polyhedral_mesh_domain_3
2012-11-20 11:25:34 +01:00
4509b5bbe2
Merge branch 'master' into improvements
...
Conflicts:
Mesh_3/include/CGAL/Mesh_3/mesh_standard_facet_criteria.h
2012-11-14 12:17:29 +01:00
88c6856789
Make CGAL_MESH_3_PROTECTION_DEBUG work
...
even if the surface id or curve id and not streamable.
2012-11-08 16:22:21 +00:00
a9c16e922d
Allow not to define CGAL_MESH_3_NO_LONGER_CALLS_DO_INTERSECT_3
2012-11-08 10:31:50 +00:00
cd62693554
Better fix of that assertion
2012-11-08 10:31:01 +00:00
16ba507e79
Ignore silently consecutive identical points
2012-11-08 08:56:00 +00:00
3e3f3057e7
Improve the assertions where minimal_size is used.
...
Before that patch, when special balls were around, some conditions tested
by previous assertions could legitimately be false.
2012-11-07 15:51:16 +00:00
b112335034
Fix a wrong assertion.
...
If n==0, no new protecting ball will be inserted on the given curved
segment. No need to have dleft_frac>=1.
2012-11-06 14:04:55 +00:00
bd6c940f6a
Make <CGAL/Mesh_vertex_base_3.h> compile on Linux.
2012-10-22 12:45:14 +00:00
80ea1a7d33
This "CGAL_UNDOABLE_INSERT_USE_MAP" thing was not used
2012-10-19 14:27:16 +00:00
1f1c9eaa33
Cherry-pick from Clément's branch:
...
| ------------------------------------------------------------------------
| r73014 | cjamin | 2012-10-17 15:12:52 +0200 (Wed, 17 Oct 2012) | 1 line
| Changed paths:
| M /branches/features/Mesh_3-parallel-cjamin/Mesh_3/include/CGAL/Mesh_cell_base_3.h
| M /branches/features/Mesh_3-parallel-cjamin/Mesh_3/include/CGAL/Mesh_vertex_base_3.h
|
| Added support for CGAL_INTRUSIVE_LIST in Mesh_cell_base_3 and Mesh_vertex_base_3
| ------------------------------------------------------------------------
2012-10-17 13:57:43 +00:00
304834b709
reactivate macro
2012-10-16 10:23:09 +00:00
824e8060fe
fix typo when CGAL_MESH_3_NEW_ROBUST_INTERSECTION_TRAITS is not defined
2012-10-16 09:59:44 +00:00
44f4a1a5c7
fix Construct_initial_points in Polyhedral_mesh_domain_3. In some numerically degenerate cases, it can be that there is no intersection point
2012-10-16 09:53:14 +00:00
9a3998357f
svn merge --reintegrate \^/branches/features/CGAL_foundations-fix_missing_headers-lrineau
2012-10-10 12:39:36 +00:00
f435be98fb
Fix an efficiency bug, when FT is not double.
...
dihedral_angle() returns a double. So values must be converted to double
ASAP.
2012-10-10 12:24:15 +00:00
a53fd8c9c4
merge changes from next
2012-10-09 13:08:52 +00:00
8743fa847b
Rename PROTECTION_DEBUG into CGAL_MESH_3_PROTECTION_DEBUG
2012-10-09 12:45:20 +00:00
f0118a1311
Revert last commit (commited by error)
2012-10-09 09:28:37 +00:00
648472bdac
After a run of detect_packages_license
2012-10-09 09:26:23 +00:00
795c71fc9b
Fix headers of Mesh_2 and Mesh_3. All were missing #include.
...
I found out that way that <CGAL/Mesh_3/Refine_facets.h> and
<CGAL/Mesh_3/Protect_edges_sizing_field> were using global functions
instead of functors of the traits class.
Note also the funny bug that <CGAL/Regular_triangulation_cell_base_3.h> was
depending on <CGAL/Triangulation_vertex_base_3.h>!
2012-10-08 09:33:38 +00:00
6b0bf6078c
BUGFIX: backup points attributes before the call to c3t3.remove_from_complex
...
C3t3::remove_from_complex modifies the in_dimension() of the vertex
(That may have been a bug.)
It is actually a merge from r72577 of
/branches/features/Mesh_3-experimental-GF/Mesh_3
2012-10-04 14:56:03 +00:00
139b8ce637
Add and test functions to save/load a c3t3 in binary format
2012-09-21 13:12:58 +00:00
787d19d6c3
Merge changes from next
2012-09-21 12:29:27 +00:00
5db6778d2c
Add export from c3t3 to tetgen
...
+ test output_to_medit and output_to_tetgen in test/Mesh_3/test_c3t3.cpp
2012-09-20 14:24:20 +00:00
bfc2ded753
Typo: rename "vertice_index" into "vertex_index"
2012-09-14 13:53:41 +00:00
3ad4fd4d33
The bug about CGAL_MESH_3_NEW_CHECK_SURFACE_MESH is fixed
...
Use find in a map instead of a set.
2012-09-14 13:52:51 +00:00
5ee1d080ab
Commit a revert of r68384:
...
"Fix the topological check of update_mesh(..)"
The new version of update_mesh can be used by defining
CGAL_MESH_3_NEW_CHECK_SURFACE_MESH. But currently that causes a bug in the
perturber when insert/remove is used instead of remove/insert.
2012-09-14 11:11:36 +00:00
9c03104732
Use CGAL_assertion instead of assert
...
+ use CGAL_expensive_assertion for is_valid() instead of CGAL_assertion.
2012-09-13 09:21:26 +00:00
ec5218835a
fix CGAL_NEW_INCIDENT_SLIVERS
...
the bound value was lost because of too temporary Is_sliver functor
2012-09-11 14:43:25 +00:00
b14d999868
remove macro CGAL_FREEZE_VERTICES.
...
Now freezing is driven by the optimization parameter do_freeze (true by default)
2012-09-03 15:18:50 +00:00
34c8ab7866
fix global optimizers when do_freeze is false and CGAL_FREEZE_VERTICES on
2012-09-03 14:28:25 +00:00
88f6cbb360
Merge changes from next
2012-09-03 13:58:35 +00:00
48a529b92c
remove CGAL_IMPROVE_FREEZE macro. This feature has to be used since we don't have the frozen data member in vertex_bsae anymore
...
(we remove frozen vertices from the std::set, or Intrusive_list, of moving vertices)
2012-09-03 11:03:56 +00:00
a8c39c2eca
add insert(pos, val) to Intrusive_list, and fix indentation in Intrusive_list::iterator
2012-09-03 09:08:47 +00:00
67325c8f93
fix global optimizers when CGAL_INTRUSIVE_LIST is not defined, and CGAL_FREEZE_VERTICES is.
...
We would like to remove frozen vertices from the std::set of moving vertices, and need to update their value (the Vertex_handle's)
2012-08-31 14:34:35 +00:00
8c8c34efde
fix compilation when Outdated cells set is a std::set and not an Intrusive_list
2012-08-31 14:09:06 +00:00
d34dc048eb
tiny cosmetic changes
2012-08-31 14:08:31 +00:00
84b6f6a0fe
First solution to avoid infinite looping when freeze is on and a very vertices keep moving :
...
once the number of moving vertices is smaller than 1% of the total number, and has not changed since last iteration, we stop.
Optimization returns the code CANT_IMPROVE_ANYMORE (available in Mesh_optimization_return_code)
2012-08-30 15:54:32 +00:00
37eb2ec790
improve std::cerr messages at the end of global optimization
2012-08-30 15:30:49 +00:00
7553fccd9f
make verbose mode fit in one line width
2012-08-30 15:14:03 +00:00
eeafda5470
remove the macros that were introduced for codebase a long time ago
2012-08-30 14:18:48 +00:00
dce17a0021
remove CGAL_BIG_MOVES_SET macro
...
this feature is now completely activated (one can't go back to the manually sorted list)
2012-08-28 12:40:41 +00:00
3689dfb8f3
update use of macros
2012-08-28 12:09:28 +00:00
3555cf3cb2
make just_incident_cells_3 the default use of incident_cells(v)
...
replace macro CGAL_JUST_INCIDENT_CELLS with CGAL_TDS_3_NOT_JUST_INCIDENT_CELLS (and reverse use), and comment it in config.h
2012-08-28 09:01:47 +00:00
07cb25aa80
remove macro CGAL_MESH_3_USE_NEW_MOVE_POINT_TOPO_CHANGE
...
it works properly and avoids a find_conflict for almost every move
2012-08-27 13:07:35 +00:00
93957545c7
deactivate CGAL_MESH_3_NEW_ROBUST_INTERSECTION_TRAITS, it makes holes on the mesh surface (polyhedron with features input)
2012-08-23 10:02:46 +00:00
8f677f0ce7
Convert header files created by Jane to Unix style
...
Otherwise that really complicates merging operations!
2012-08-22 15:41:33 +00:00
5fdae25b13
Cherry-pick from Mesh_3-experimental-GF
...
| ------------------------------------------------------------------------
| r71473 | lrineau | 2012-08-22 16:22:51 +0200 (Wed, 22 Aug 2012) | 2 lines
|
| Fix warnings -Wreorder and and -Wunused-but-set-variable
|
| ------------------------------------------------------------------------
| r71472 | lrineau | 2012-08-22 16:18:57 +0200 (Wed, 22 Aug 2012) | 2 lines
|
| Fix wrong C++ constructions that were accepted my MSVC
|
| ------------------------------------------------------------------------
2012-08-22 14:28:28 +00:00
be658460eb
Merge changes from next
2012-08-21 09:04:51 +00:00
619a69fd75
implement commit r71355 from experimental-GF and remove useless code
2012-08-20 15:43:51 +00:00
45016ef87a
merge changes from next
2012-08-16 13:03:53 +00:00
a04891ff93
WARNFIX: fix some warnings triggered by -Wconversion on g++
2012-08-09 16:06:54 +00:00
49d5bc27fa
r71106 from Mesh_3-experimental-GF
...
Intrusive_list push_back function now performs insertion, and not erase as it used to (because it was nice to avoid some code lines, but it was too dangerous)
2012-08-07 15:28:57 +00:00
be8fe53444
fix compilation when CGAL_INTRUSIVE_LIST is not defined
2012-08-07 12:59:01 +00:00
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
4979fa8165
sync with experimental
2012-08-07 09:31:06 +00:00
b1ea20d1a8
fix indentation bug
2012-08-06 14:37:44 +00:00
84e2480855
sync indentation and stuff with experimental
2012-08-06 14:23:08 +00:00
62ae963ccf
rename point "location" to "position"
2012-08-06 14:22:25 +00:00
8449cc4e6a
revert this commit. It was a mistake
...
+ there is no frozen vertex in Moves_vector : remove useless code
New Revision: 70994
Author: jtournoi
Date: 2012-08-03 12:13:39 +0200 (Fri, 03 Aug 2012)
Log message:
move the update of moving_vertices (by erasing frozen vertices) to update_mesh, instead of compute_moves
2012-08-06 10:02:53 +00:00
be9af780a1
sync with experimental
2012-08-06 09:54:47 +00:00
a0b2493c2c
move the update of moving_vertices (by erasing frozen vertices) to update_mesh, instead of compute_moves
2012-08-03 10:13:39 +00:00
7836e18e97
fix comment
2012-08-03 10:03:30 +00:00
c13b752353
re-organize breaking conditions for global optimizers loop
2012-08-03 09:22:09 +00:00
62331f8fb6
fix (stupid) bug that prevented global optimizers from working normally
2012-08-02 15:13:51 +00:00
bd6c186cdb
add an else
2012-08-02 15:09:33 +00:00
c58bd4f8fb
Merge from next up to revision 70936
2012-08-02 12:18:09 +00:00
eaecb8c990
sync with experimental-GF
2012-08-02 09:03:23 +00:00
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
9ba03e387d
sync with Mesh_3-experimental-GF (little cosmetic)
2012-07-31 15:44:39 +00:00
89e375b8e0
sync config file with Mesh_3-experimental-GF
2012-07-31 15:19:01 +00:00
abb736ba8b
r70386 from Mesh_3-experimental-GF
...
add comment for CGAL_BIG_MOVES_SET
2012-07-31 10:47:38 +00:00
87811b0b9c
revert adding this file
...
it already exists in : STL_Extension/include/CGAL/is_streamable.h
2012-07-31 10:27:01 +00:00
f0496ee4bf
r70383 from Mesh_3-experimental-GF
...
Add a file that will be only in CGAL-4.1
2012-07-31 10:09:02 +00:00
476b2ea144
r70382 from Mesh_3-experimental-GF
...
Reduce number of arithmetic operations
2012-07-31 10:07:40 +00:00
44b5f40e0c
r70381 from Mesh_3-experimental-GF
...
Make perturb deterministic
One must not use CGAL_MESH_3_USE_RELAXED_HEAP, otherwise it is not
deterministic.
2012-07-31 09:54:44 +00:00
f13ec33c41
fix compilation when CGAL_FREEZE_VERTICES is not defined and CGAL_IMPROVE_FREEZE is defined
...
(this combination should basically not be allowed)
2012-07-31 09:53:13 +00:00
ddb06e705b
r70359 from Mesh_3-experimental-GF
2012-07-31 09:26:45 +00:00
bad7b555c5
r70354 from Mesh_3-experimental-GF
...
use CGAL_MESH_3_USE_NEW_MOVE_POINT_TOPO_CHANGE in perturber.
function move_point_topo_change_conflict_zone_known for the perturber (taking Sliver_criterion_value into account) benefits of this macro
2012-07-31 08:53:50 +00:00
c8c4305599
r70345 from Mesh_3-experimental-GF
...
angle bound 90 is enough
2012-07-31 08:12:16 +00:00
aad3b4d58f
r70315 from Mesh_3-experimental-GF
...
Use two versions of get_facets, with and without the inplace list
2012-07-31 08:07:06 +00:00
5730156edb
r70305 from Mesh_3-experimental-GF
...
Avoid construction of a very temporary tetrahedron
2012-07-31 07:38:23 +00:00
942213e102
r70299 from Mesh_3-experimental-GF
...
All overloads of get_facets now use the in-place list
2012-07-30 15:55:01 +00:00
b3f93cfc57
r70295 from Mesh_3-experimental-GF
2012-07-30 15:46:20 +00:00
4aeca8860b
fix compilation
...
and r70290 from Mesh_3-experimental-GF
add CGAL_MESH_3_NEW_GET_FACETS, and improve get_facets
2012-07-30 15:21:31 +00:00
048606b03b
r70036 from Mesh_3-experimental-GF
...
make random perturber deterministic
2012-07-30 13:48:07 +00:00
4d1544929b
r69692 from Mesh_3-experimental-GF
...
replace hand-maintained unique vector of Vertex_handle with set of Vertex_handle
2012-07-30 13:43:56 +00:00
36154515bc
r69553 from Mesh_3-experimental-GF
...
(merge from codebase)
big_moves_ should be set to be a fixed-length set<FT> instead of a fixed-length manually sorted list<FT>
define CGAL_BIG_MOVES_SET to use this set
2012-07-30 13:32:44 +00:00
d868abf8a6
r69551 from Mesh_3-experimental-GF
...
merge from codebase
CGAL_FASTER_BUILD_QUEUE can be defined.
it uses an unordered_map as temporary data structure and sorts PVertex's in the end
2012-07-30 12:19:40 +00:00
f0492d720f
r69548 from Mesh_3-experimental-GF
...
use inexact_locate
(when CGAL_MESH_3_SIZING_FIELD_INEXACT_LOCATE is defined)
to locate inside the underlying triangulation used to compute the sizing field value locally
2012-07-30 12:15:32 +00:00
fd2873cf03
add CGAL_IMPROVE_FREEZE : uses Intrusive_list<Vertex_handle> as list of moving vertices
2012-07-30 11:04:02 +00:00
bb7b804930
r69547 from Mesh_3-experimental-GF
...
merge from codebase to use
CGAL_CONSTRUCT_INTRUSIVE_LIST_RANGE_CONSTRUCTOR
in Intrusive_list.
It avoids copying things one by one : wa can use constructor
Intrusive_list mylist(begin, end);
2012-07-30 10:34:07 +00:00
7ece966f09
r69442 from Mesh_3-experimental-GF
...
add the Intrusive_list class to handle the outdated_cells list
much faster, experimented in codebase
and merged in this commit
2012-07-30 10:22:05 +00:00
12d2e5d514
r69065 from Mesh_3-experimental-GF
...
Add static checks in Mesh_edge_criteria_3.h
In case Sizing_field and Tr had not the same nested type Point_3, the
compilation error was very surprising. As it is a common error
(because Tr uses Weighted_point as nested Point_3, instead of Gt::Point_3),
I have added static checking to verify the types equality.
2012-07-30 09:15:12 +00:00
38b62f0800
missing include (see r69063 from Mesh_3-experimental-GF)
2012-07-30 09:08:05 +00:00
54a08b6627
add typedef for Polyhedron demo (see r69040 from Mesh_3-experimental-GF)
2012-07-30 09:07:15 +00:00
4100653ed4
add missing parameter
2012-07-27 15:49:45 +00:00
ccb5818ca3
r68603 and r68887 from Mesh_3-experimental-GF
...
Add a feature to dump c3t3 during the meshing process
+ missing parameter for make_mesh_3_impl
2012-07-27 15:44:16 +00:00
991932e3c3
r68585 from Mesh_3-experimental-GF
...
Fix project_on_surface
Fix that commit:
| Author: Laurent Rineau <Laurent.Rineau__CGAL@normalesup.org>
| Date: Thu Mar 29 15:51:53 2012 +0000
|
| Patch to get_least_square_surface_plane, with surface patch indices
|
| To compute the least square of a vertex of the surface, only the facets on
| the same surface are selected.
|
| git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/cgal/branches/experimental-packages/Mesh_3-protecting_balls-branch@68283 125892de-ab0c-0410-bc6c-9b621015d446
One has to record the index of the surface patch a vertex lied on, before
moving the vertex. That index is passed to get_least_square_surface_plane,
to compute a projection plane with vertices lying only on the corresponding
surface patch.
2012-07-27 15:15:34 +00:00
64b0c1babd
r68580 from Mesh_3-experimental-GF
...
fix authors lists (by LR)
2012-07-27 14:49:57 +00:00
15d1ed2a98
r58679 from Mesh_3-experimental-GF
...
Avoid a call to do_intersect: call intersection directly
2012-07-27 14:46:10 +00:00
daded09083
add assertions
2012-07-27 14:36:20 +00:00
829d704774
r68410 from Mesh_3-experimental-GF
2012-07-27 14:23:29 +00:00
a0e39436ee
r68408 from Mesh_3-experimental-GF
...
Better display in verbose mode for exuder and pertuber
Now the return code is displayed. That allows to know why the optimizers
stop.
2012-07-27 14:20:22 +00:00
c69ec10cfc
r68407 from Mesh_3-experimental-GF
...
Allow to modify a Mesh_cell_criteria_3<..> object with a add(..) member fct
2012-07-27 14:06:01 +00:00
0c85b2c831
r68392 from Mesh_3-experimental-GF
...
Cosmetic: reword "new_location" and "new_point" to "new_position"
"new_location" was used in most part of the file.
+ "old_location" to "old_position"
+ replace a dummy vector with an Emptyset_iterator
2012-07-27 13:50:41 +00:00
34cc76fcbf
r68384 from Mesh_3-experimental-GF
...
Fix the topological check of update_mesh(..)
+ tons of comments
2012-07-27 13:37:17 +00:00
055b632231
r68359 from Mesh_3-experimental-GF
...
Avoid copying to intermediate containers by using a special output iterator
Initial patch from Andreas
2012-07-27 13:14:24 +00:00
25bacf436c
r68353 from Mesh_3-experimental-GF
...
+ move function update_mesh_topo_change in C3T3_helpers so that it's public
Replace a call to update_mesh(..) by update_mesh_topo_change(..)
At the time of the call, one knows that there will be a "topological
change" (a flip in the Delaunay/regular triangulation). No need to recheck
again in a call to update_mesh(..).
2012-07-27 13:00:33 +00:00
6e31d6ff2a
deactivate the new_slivers feature for now
...
it collects no sliver (I must have made a mistake in transfering it)
2012-07-27 10:41:05 +00:00
aed7443cd3
r67845 from Mesh_3-experimental-GF
...
Corners incidences
- Now corners are really numbered correctly from 1 to n (before they all
had 0 as corner_index).
- One can retrieve the set of adjacent surface patches from a corner.
2012-07-27 10:07:34 +00:00
fdf38d4cce
r67783 from Mesh_3-experimental-GF
...
(fixed by 67792, 67943, 68242, 68257 and 68273)
Add an AABB tree of feature curves in Mesh_domain_with_polyline_features_3
2012-07-27 09:54:49 +00:00
1d788a9ae7
r67748 and r67754 from Mesh_3-experimental-GF
...
Fix a typo: mesure->measure
2012-07-27 09:00:06 +00:00
d3461617db
r67685 from Mesh_3-experimental-GF
...
Add a comment to ease the reading of the code
2012-07-27 08:53:31 +00:00
bfabc793f6
copy
2012-07-26 15:07:59 +00:00
c0c9cadc92
cancel commit 70762
...
r67022 from Mesh_3-experimental-GF
Deactivate the grid strategy for the moment
Needs more work: that fails with a single cube as input surface.
2012-07-26 15:01:23 +00:00
88fc16a1df
r67084 from Mesh_3-experimental-GF
...
(partly done already)
Circumcenter caches must be invalidated by the mesh optimizers.
2012-07-26 14:13:03 +00:00
e79d35e3fb
r66991 from Mesh_3-experimental-GF
...
Enable the use of grid of witnesses for polyhedral domain, by default.
2012-07-26 13:56:01 +00:00
607a18e291
compilation fixed
...
(missing include and missing implementation of no_topological_change)
2012-07-26 13:48:44 +00:00
28647bf7c7
Fix compilation error: missing <boost/foreach.hpp> for the macro BOOST_FOREACH
2012-07-25 15:17:16 +00:00
Jane Tournois
Laurent Rineau
Michael Hemmer
Sébastien Loriot
Clement Jamin
iyaz
Andreas Fabri
Philipp Möller
Laurent Rineau
Laurent Rineau
Jane Tournois
Philipp Möller