Commit Graph

368 Commits

Author SHA1 Message Date
Sébastien Loriot 7cc6c1b101 fix typo 2014-05-23 17:28:52 +02:00
Sébastien Loriot ecc86d3bd7 add code for backward compatibility
Note that the result is still the same without the patch.
Indeed, the uniqueness of link vertices is guaranteed if the
collapse of the edge is topologically valid.
This patch is just to avoid users having cost/placement
relying on the former behavior even for non-topologically
valid collapse (which seems unlikely to happen)
2014-05-23 17:13:27 +02:00
Andreas Fabri e9edf5efac bug fix 2014-04-11 09:46:42 +02:00
Andreas Fabri ce2ead8a20 document that EdgeProfile::link() may have duplicates 2014-04-10 16:20:30 +02:00
Sébastien Loriot 720e3d3578 make the order of vertices in the link similar as bcb7cc03 2014-04-10 15:54:01 +02:00
Sébastien Loriot 97b5300a66 clean up 2014-04-10 15:32:27 +02:00
Sébastien Loriot c867c1d2e2 remove unused variable 2014-04-10 15:22:20 +02:00
Andreas Fabri d4f88fd138 bugfix. endleft and endright were not initialized if the surface has a border 2014-04-10 15:09:09 +02:00
Andreas Fabri 0ca4d8de85 Use the border property map (not the top level provided one, but the one obtained with get(edge_border...) 2014-04-10 10:44:26 +02:00
Andreas Fabri bcb7cc0332 Rewrite of Extract_triangles_and_link() using no map 2014-04-10 10:11:33 +02:00
Andreas Fabri e986d53df6 typo 2014-04-10 09:17:01 +02:00
Andreas Fabri c45eb40191 Check initially if the surface has borders 2014-04-09 17:18:45 +02:00
Andreas Fabri 6f278a3837 Rewrite of Extract_borders()
Don't use a map, but start from the edge that we want to contract
and turn around the two vertices by looking at each edge exactly once
2014-04-09 15:34:25 +02:00
Andreas Fabri cf28acb826 Use less index maps 2014-04-09 15:04:33 +02:00
Andreas Fabri 0b63624b1e Move the reserve to the right spot
Don't use a vertex index map
2014-04-09 13:51:15 +02:00
Andreas Fabri 3558831f22 reserve 2014-04-09 13:43:37 +02:00
Panagiotis Cheilaris 0edd0e2943 put a field access in assertion code
This fix removes a warning in compilation of mesh_simplification_plugin
in demos (in some environments).
2014-03-07 15:42:54 +01:00
Panagiotis Cheilaris 6812889b8f use a value from insert in Edge_profile_impl
This fix removes a warning in compilation of mesh_simplification_plugin
in demos (in some environments).
2014-03-06 19:20:09 +01:00
Sébastien Loriot ab06b99ce4 fix typo in variable name 2014-02-18 19:43:37 +01:00
Sébastien Loriot 9482381828 Merge branch 'Surface_mesh_simplification-uniform_renaming_surface_mesh-sloriot'
documentation bug-fix: uniformly use "surface mesh" instead of "surface" and "mesh"

  Tested in CGAL-4.4-Ic-119 and CGAL-4.4-Ic-120
2014-02-14 08:09:04 +01:00
Sébastien Loriot 1a777d017b Merge branch 'Surface_mesh_simplification-remove_extra_edges_bugfix-sloriot'
bug-fix: some edges that have been removed from the priority queue because
           there were not removable at some point can be removable later. They
           need to be reinserted in the queue

  Tested in CGAL-4.4-Ic-119 and CGAL-4.4-Ic-120
2014-02-14 08:05:54 +01:00
Sébastien Loriot d45d1a1070 Merge branch 'Surface_mesh_simplification-preserve_constrained_edges_bug_fix-sloriot'
bug-fix: preserve edges marked as non-removable
 See Features/Small_Features/SMS_with_constrained

 Tested in CGAL-4.4-Ic-119 and CGAL-4.4-Ic-120

Conflicts:
	Installation/changes.html
2014-02-14 08:02:15 +01:00
Sébastien Loriot 5786041a31 uniformly use surface mesh in the documentation, the API and the examples
This induces a renaming of the Concept EdgeCollapsableMesh to
  EdgeCollapsableSurfaceMesh and the same for the constrained version.
2014-02-13 16:33:45 +01:00
Sébastien Loriot 9b79c9a842 make sure all edges removable are removed
After the collapse of an edge the 2-ring of edges incident
  to the remaining vertex are reinserted in PQ when no longer in PQ.
  An exemple is also updated to show the issue if we remove the fix.
2014-02-13 16:32:47 +01:00
Sébastien Loriot 407efd5685 rename example and update examples.txt 2014-02-13 16:26:41 +01:00
Sébastien Loriot 9114db9085 restore figure source files removed in 0fa2cacb
| commit 0fa2cacb60
  | Author: Sébastien Loriot <sebastien.loriot@cgal.org>
  | Date:   Tue Dec 3 17:27:02 2013 +0100
  |
  |     remove doc_tex documentation (including developer manual) and old manual tools
2014-02-10 14:54:23 +01:00
Sébastien Loriot 8384c6be3c fix warnings in the testsuite 2014-01-31 12:02:17 +01:00
Sébastien Loriot 0906fb8e87 fix refinement relation 2014-01-30 19:43:41 +01:00
Sébastien Loriot 9dcd94d753 do not use a halfedge after it has been removed 2014-01-30 15:28:19 +01:00
Sébastien Loriot c5b7ccef71 remove warning 2014-01-30 15:27:57 +01:00
Sébastien Loriot 9311883c97 rename Constrained_placement_wrapper to Constrained_placement 2014-01-30 14:39:30 +01:00
Sébastien Loriot b28fadc2c3 handle zero-length edges and constrained correctly
Handle constrained edges of length 0
Remove from the queue edges removed (not related to constraints)
Avoid calling Collapse directly to avoid updating neighbors
2014-01-30 14:08:29 +01:00
Sébastien Loriot e2ad879473 update debug print function to use pmap instead of assuming id() is available 2014-01-30 13:23:37 +01:00
Sébastien Loriot 9958d23406 remove No_stop_predicate that can be emulated by Count_stop_predicate(0) 2014-01-30 10:19:38 +01:00
Sébastien Loriot 324f5b8d12 update doc after review of Andreas 2014-01-30 09:23:53 +01:00
Sébastien Loriot 6c45be2931 fix typo 2014-01-30 08:40:17 +01:00
Sébastien Loriot 44b3a9daf1 add missing namespace 2014-01-30 08:15:28 +01:00
Sébastien Loriot 235c1cc3a6 update example and add new one using the constrained edge map 2014-01-29 19:05:11 +01:00
Sébastien Loriot cf04e556c6 update documentation to mention the constrained edge map 2014-01-29 19:05:10 +01:00
Sébastien Loriot 8bfe694d4e document the fact that we can access the surface from the profile 2014-01-29 19:05:10 +01:00
Sébastien Loriot 95c7baf280 improve documentation 2014-01-29 19:05:10 +01:00
Sébastien Loriot a5c75e732c take into account the constrained edges and ensure they will not disappear
The code is fully backward compatible and is written to not
penalize the runtime when no edge is constrained
2014-01-29 19:05:10 +01:00
Sébastien Loriot 8135ef739c add some debug code to get intermediate mesh during simplification 2014-01-29 19:05:09 +01:00
Sébastien Loriot a79e9e7c56 the placement does not need to be default constructible
Only the default one need to be.
2014-01-29 19:05:09 +01:00
Sébastien Loriot 0c14664977 Add a is-constrained edge map without using it for now 2014-01-29 19:04:55 +01:00
Sébastien Loriot 0ac413267a fix function name not updated after the 1st review round
doc bugfix
2014-01-27 12:31:17 +01:00
Sébastien Loriot 3af2add868 Merge branch 'BGL-fix_doc-sloriot'
Clean-up and fix the documentation of the specialization of boost::graph_traits

Approved by the release manager
Tested in CGAL-4.4-Ic-48
2013-12-04 08:53:15 +01:00
Sébastien Loriot 0fa2cacb60 remove doc_tex documentation (including developer manual) and old manual tools 2013-12-03 17:27:02 +01:00
Sébastien Loriot ee3ce8985f fix the way the specialization of graph_traits are documentated 2013-12-03 12:03:00 +01:00
Sébastien Loriot 0db9bf6f19 doc fix (avoid a More...) 2013-11-14 16:59:13 +01:00