Commit Graph

337 Commits

Author SHA1 Message Date
Youmu 9651cadd1d Basic call interface. Special case for torus and cylinder. 2020-06-03 11:15:59 -04:00
Guillaume Damiand 52186a04e0 Two bug fixes: (1) computation of cycle lengths, when some halfedges are flip; (2) when we use of face graph wrapper with surface mesh we can not use nullptr. 2020-05-14 11:38:15 +02:00
Guillaume Damiand 46ffea3f02 Warnings; plus remove some tests. 2020-04-27 18:55:27 +02:00
Guillaume Damiand 92b207470b Typo 2020-04-27 18:55:27 +02:00
Guillaume Damiand db411a7a05 whitespace 2020-04-27 18:55:27 +02:00
Guillaume Damiand 210cda255e More warnings; remove some tests too long. 2020-04-27 18:55:27 +02:00
Guillaume Damiand 9b5205fb99 Add missing include 2020-04-27 18:55:27 +02:00
Guillaume Damiand 3e42827f4b Bug fix in Dijkstra spanning tree computation 2020-04-27 18:55:26 +02:00
Guillaume Damiand 2d4ec04d72 Bug in assert 2020-04-27 18:55:26 +02:00
Guillaume Damiand 63d7221dc4 Add draw functions when CGAL_USE_BASIC_VIEWER is not defined. 2020-04-27 18:55:26 +02:00
Guillaume Damiand 71162b48f9 More warnings 2020-04-27 18:55:26 +02:00
Guillaume Damiand 9838b9debc Use two different names for copy, const and non const version, to avoid ambiguity on windows (internal undocumented methods) 2020-04-27 18:55:26 +02:00
Guillaume Damiand a09b8b10fc Warnings 2020-04-27 18:55:26 +02:00
Guillaume Damiand 84b157aa04 Doc after Sebastien review. 2020-04-27 18:55:26 +02:00
Guillaume Damiand 1de5666a4f Remove warnings 2020-04-27 18:55:26 +02:00
Guillaume Damiand 5e3d85ae8f Rename computeXXX methods 2020-04-27 18:55:26 +02:00
Guillaume Damiand e5fe6a50bb Rename computeXXX methods 2020-04-27 18:55:26 +02:00
Guillaume Damiand 3fb644e566 Improve basic viewer to draw consistent orientated faces for generalized maps. 2020-04-27 18:55:26 +02:00
Guillaume Damiand 584a033e61 whitespaces 2020-04-27 18:55:26 +02:00
Guillaume Damiand de6030aa78 Improve basic viewer for face graph with paths, and convertion between handle and descriptor. 2020-04-27 18:55:26 +02:00
Guillaume Damiand 44a2d4d171 Edge width is only without weight. 2020-04-27 18:55:25 +02:00
Guillaume Damiand daab96982e Bugfix 2020-04-27 18:55:25 +02:00
Guillaume Damiand f4a6f06f10 solve const problem 2020-04-27 18:55:25 +02:00
Guillaume Damiand 4b97fd572f Add mising include 2020-04-27 18:55:25 +02:00
Guillaume Damiand 1af6cfb4ae Path on surface is now generic for CMap and GMap 2020-04-27 18:55:25 +02:00
Guillaume Damiand f448027cee Add one example 2020-04-27 18:52:23 +02:00
Guillaume Damiand 7893462916 Rename examples. 2020-04-27 18:52:23 +02:00
Guillaume Damiand 19d7e197c6 Bug fix in face width 2020-04-27 18:52:23 +02:00
Guillaume Damiand 821ed7ab41 Improve face width computation, avoiding unused copy. 2020-04-27 18:52:23 +02:00
Guillaume Damiand ddc152860d bug fix 2020-04-27 18:52:23 +02:00
Guillaume Damiand 2018367261 Improve face width computation; move face graph wrapper into surface mesh topology package. 2020-04-27 18:52:23 +02:00
Guillaume Damiand d553d91eb6 Improve and simplify examples; add weight functors. 2020-04-27 18:52:23 +02:00
Guillaume Damiand 0f3e5ed362 Remove trailing whitespaces 2020-04-27 18:52:23 +02:00
Guillaume Damiand 298217e45a Add missing #include of licence file. 2020-04-27 18:52:23 +02:00
Guillaume Damiand 7b65cb0004 Const correctness for shortest non contractible cycle ok. 2020-04-27 18:52:23 +02:00
Guillaume Damiand 87306ce852 Start small improvements of Facewidth 2020-04-27 18:52:22 +02:00
Guillaume Damiand a40b1f8016 Small fixes 2020-04-27 18:52:22 +02:00
Guillaume Damiand 0c81c64c51 Generic map selector copy also perforated darts and mark them. 2020-04-27 18:52:22 +02:00
Guillaume Damiand 9bd10459a2 Bug fix; plus add a draw method taking only one path as parameter. 2020-04-27 18:52:22 +02:00
Guillaume Damiand 7e8fc7f72a Add header 2020-04-27 18:52:22 +02:00
Guillaume Damiand 88b920893b Remove wrong assert 2020-04-27 18:52:22 +02:00
Guillaume Damiand 05f33f1562 Several improvements 2020-04-27 18:52:22 +02:00
Guillaume Damiand 4933a2fbdf Update draw face graph with path 2020-04-27 18:52:22 +02:00
Guillaume Damiand a9d353fa24 Start small improvements of code. 2020-04-27 18:52:22 +02:00
Guillaume Damiand a5eb1530ff Update surface mesh topology to integrate shortest path computation. 2020-04-27 18:52:22 +02:00
Guillaume Damiand 0308d1a1bb Add forward declaration files for CMap, GMap, LCC, Polygonal_schema. Improve copy methods for CMap and GMap to deal with const and non const cases. 2020-04-27 18:52:22 +02:00
Guillaume Damiand 6e5f8ef934 align = 2020-04-27 18:52:22 +02:00
Sébastien Loriot bfecbf55a1 Update from master (done during rebasing)
Original commit:
    commit 573f9f3224939fb2cd74d9a82bd5b1c0e471edc7
    Merge: c824946ef60 16fc8d1fe2
    Author: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
    Date:   Fri Mar 27 10:38:38 2020 +0100

        Merge remote-tracking branch 'cgal/master' into gsoc2019-nccycles-thien
2020-04-27 18:42:57 +02:00
Guillaume Damiand 98d67a9e68 Comment. 2020-04-27 18:37:59 +02:00
Guillaume Damiand 03c383030e update 2020-04-27 18:37:58 +02:00
Guillaume Damiand 7a59ed1a1d Bug fix 2020-04-27 18:37:58 +02:00
Guillaume Damiand 5385d2155a Add generic map selector for polygon schema 2020-04-27 18:37:58 +02:00
Sébastien Loriot 24f684092d Update from master (while rebasing)
Original merge commit:
    commit 2e4a18e3e6f73c41d4935aed22330adf83f99f28 (HEAD)
    Merge: b91b6cab3a1 29f973a616
    Author: Guillaume Damiand <guillaume.damiand@liris.cnrs.fr>
    Date:   Thu Mar 12 18:05:22 2020 +0100

        Merge master; NYF
2020-04-27 18:34:34 +02:00
Thien Hoang 931637b65f Fix SNC not working correctly with boundary 2020-04-27 18:20:16 +02:00
Thien Hoang ed14349fa1 Make Facewidth return an alternating sequence of darts for vertices and faces 2020-04-27 18:20:16 +02:00
Thien Hoang 141e38f771 Remove redundant code 2020-04-27 18:20:16 +02:00
Thien Hoang 28c9b92a24 Fix Facewidth feature following Damiand's suggestions 2020-04-27 18:20:16 +02:00
Thien Hoang 5b001f72d8 Use unique_ptr, following Rineau's comment 2020-04-27 18:20:16 +02:00
Thien Hoang 7665677003 Fix Path_on_surface following Damiand's comments 2020-04-27 18:20:16 +02:00
Thien Hoang 9975cadefd Add Facewidth feature 2020-04-27 18:20:15 +02:00
Thien Hoang 08b2fb99e9 Modify test 2020-04-27 18:20:15 +02:00
Thien Hoang fb8956d3fa Add other functions in CST and modify examples 2020-04-27 18:20:15 +02:00
Thien Hoang fad13bb4ee Create compute_edgewidth in CST and modify an example 2020-04-27 18:20:15 +02:00
Thien Hoang 2009469413 Make Path_on_surface work with boundary 2020-04-27 18:20:15 +02:00
Thien Hoang 47e9507ea1 Change function names, use Path_on_surface now (examples not compilable though) 2020-04-27 18:20:15 +02:00
Sébastien Loriot e4d63837fd Merge remote-tracking branch 'gsoc2019-nccycles-thien' into Surface_mesh_topology-gdamiand
This is a merge done after the rebase of Surface_mesh_topology-gdamiand

  Original commit id:
    commit 5459085b7da44946a834ce155fcc4e9c83ad14b2 (HEAD)
    Merge: 8138ac72694 349759a0547
    Author: Thien Hoang <thienvhoang99@gmail.com>
    Date:   Sat Jul 13 02:46:50 2019 +0700
2020-04-27 18:07:48 +02:00
Sébastien Loriot 8bb22d5b2c extra run of the script to remove tabs and trailing whitespaces
right after the merge of the 5.0 release branch

+ manual fix of the files (indentation was changed in the meantime):
   * Spatial_sorting/include/CGAL/Multiscale_sort.h
   * Spatial_sorting/test/Spatial_sorting/test_multiscale.cpp
2020-03-26 14:26:59 +01:00
Guillaume Damiand 325b3dfade Add debug code: to remove later. 2020-01-08 09:40:16 +01:00
Thien Hoang 3c7fc6563e Remove vertex list and edge list, following Damiand's comments 2020-01-07 18:04:34 +01:00
Thien Hoang 70899a877d Rename some types and refactor code 2020-01-07 18:04:34 +01:00
Thien Hoang 49c2b5f854 Wrap the class inside namespace Surface_mesh_topology 2020-01-07 18:04:34 +01:00
Thien Hoang 0202f2eeca Improve time performance 2020-01-07 18:04:34 +01:00
Thien Hoang 5c6a44fdd0 Make it work with Polyhedron and add tests for this type 2020-01-07 18:04:33 +01:00
Thien Hoang d5717f5ef2 Add test file 2020-01-07 18:04:33 +01:00
Guillaume Damiand 345c17f2fa Copy of CMap and GMap returns now handle instead of const_handle. 2020-01-07 18:04:33 +01:00
Thien Hoang d03ae160c6 Rename Get_opposite to opposite 2020-01-07 18:04:33 +01:00
Thien Hoang 3fa7aaeaeb Make SNC work with Combinatorial_map and Surface_mesh 2020-01-07 18:04:33 +01:00
Thien Hoang b6652f0464 Fix unsew example errors 2020-01-07 18:04:33 +01:00
Thien Hoang deee186789 Remove explicit specialization for find_spanning_tree 2020-01-07 18:04:33 +01:00
Thien Hoang a97d60c254 Explicit speciliazation is not allowed in class 2020-01-07 18:04:33 +01:00
Thien Hoang 97fa397014 Add 3 examples 2020-01-07 18:04:33 +01:00
Thien Hoang 6b167860d7 Use reserve for vectors, fix some bugs 2020-01-07 18:04:33 +01:00
Thien Hoang 6330f6669a Update following Damiand and Rineau comment 2020-01-07 18:04:32 +01:00
Thien Hoang 5ba0fe47d6 Remove some comments 2020-01-07 18:04:32 +01:00
Thien Hoang 21b599dcdd Improve general performance, set up 1-attribute, fix correspondence issue between original and copied map 2020-01-07 18:04:32 +01:00
Thien Hoang 55e2026867 Fix some bugs, change find_cycle params, add edge_width function, revert vertex_visited 2020-01-07 18:04:32 +01:00
Thien Hoang 0ca0b68fdc Update spanning tree and trace index after updating distance 2020-01-07 18:04:32 +01:00
Thien Hoang 252ccbaf4c Add Dijkstra algorithm 2020-01-07 18:04:32 +01:00
Thien Hoang d81d6ca6ec Set up 2-attribute 2020-01-07 18:04:32 +01:00
Thien Hoang 3e39318941 Change Path type 2020-01-07 18:04:32 +01:00
Thien Hoang 0171659bcf Use attributes for vertices, remove boolean marks 2020-01-07 18:04:32 +01:00
Thien Hoang e4dcdec00c Update following Damiand's comments 2020-01-07 18:04:32 +01:00
Thien Hoang 007d3da058 Fix important bug: m_gmap type must be a reference. 2020-01-07 18:04:32 +01:00
Thien Hoang 7a6bc55b62 Fix path tracing 2020-01-07 18:04:32 +01:00
Thien Hoang ea4c8a4a50 Initializing value for ind should be done once 2020-01-07 18:04:32 +01:00
Thien Hoang 7907a48bac Fix typo in function name: indices instead of indicies 2020-01-07 18:04:32 +01:00
Thien Hoang 8cbe859992 Free index marks 2020-01-07 18:04:31 +01:00
Thien Hoang 99cb89e63f Add BFS trace, index marks for vertices, and construct the cycle 2020-01-07 18:04:31 +01:00
Thien Hoang ce77577040 Remove some private variables 2020-01-07 18:04:31 +01:00
Thien Hoang 8698ac032b Change darts_of_cell to one_dart_per_incident_cell 2020-01-07 18:04:31 +01:00
Thien Hoang 1fb4f9cabe Find BFS spanning tree and find E_noncon 2020-01-07 18:04:31 +01:00
Guillaume Damiand 2c76e00d65 Replace char* by std::string for polygonal schema. 2019-12-18 11:33:23 +01:00
Guillaume Damiand faca9d7804 Bug fix with list iterators; update tests. 2019-12-18 10:03:07 +01:00
Guillaume Damiand 076cd0cc61 Warning on windows with strncpy 2019-12-18 08:55:30 +01:00
Guillaume Damiand 8ba6f2e3ca More warning with random get_int. 2019-12-18 08:47:17 +01:00
Guillaume Damiand 2c7ded8c63 Replace --end() by std::prev(end()) for std lists (even if --end() is supposed to work...) 2019-12-17 15:59:54 +01:00
Guillaume Damiand 633ea3e9cf Cannot swap in vector<bool> 2019-12-17 15:58:47 +01:00
Guillaume Damiand 937c334802 Remove warnings. 2019-12-17 11:05:38 +01:00
Guillaume Damiand 1ab90bc27e Remove warnings. 2019-12-11 15:28:11 +01:00
Guillaume Damiand 4da4ffe77e More warnings 2019-12-10 14:24:32 +01:00
Guillaume Damiand b81d694353 Update draw to test also environement variable. 2019-12-03 16:22:23 +01:00
Guillaume Damiand ca753748a3 is_border -> is_perforated 2019-12-03 15:17:29 +01:00
Guillaume Damiand 8be7c183b4 Remove warnings (thanks @sloriot) 2019-11-29 15:51:34 +01:00
Guillaume Damiand 023ec9c23c Wrong percentage 2019-11-29 12:24:27 +01:00
Guillaume Damiand 13dc3f75db Remove some debug code; merge two steps in one. 2019-11-28 14:00:23 +01:00
Guillaume Damiand 90457b38c7 Update licences 2019-11-26 14:21:39 +01:00
Guillaume Damiand 6f24898d67 Remove some warnings 2019-11-26 13:10:44 +01:00
Guillaume Damiand fa7e93b03b Update tests; bug fix; method with borders seems ok now. 2019-11-26 11:35:18 +01:00
Guillaume Damiand a5240b4477 Case with boundaries. 2019-11-25 16:57:19 +01:00
Guillaume Damiand 7d6b31e670 Add test for surface mesh topology 2019-11-24 20:49:15 +01:00
Guillaume Damiand 8dc0d92da5 Minor update in the doc. 2019-11-22 13:47:12 +01:00
Guillaume Damiand a05200fb52 End of cleanup. Remove debug code; rename data members; comment. 2019-11-22 13:30:20 +01:00
Guillaume Damiand 29b6ac8e86 Clean 2019-11-22 11:19:26 +01:00
Guillaume Damiand 3f86217059 Clean 2019-11-22 11:19:07 +01:00
Guillaume Damiand 7b243d41aa Clean Polygonal_schema 2019-11-22 11:18:52 +01:00
Guillaume Damiand 155372134d More cleanup; doc and renaming of some inner variables. 2019-11-22 10:45:39 +01:00
Guillaume Damiand a11e377561 Add comments; cut line > 80 car; some cleanup. 2019-11-22 09:59:55 +01:00
Guillaume Damiand 8d976c2192 Cleanup (doc + use smart pointer) 2019-11-22 09:18:18 +01:00
Guillaume Damiand f69195b869 Case with boundaries; seems to work. TODO: more tests; cleanup code. 2019-11-22 09:03:13 +01:00
Guillaume Damiand 56ae2240d2 Continue case with perforated faces. 2019-11-21 17:43:40 +01:00
Guillaume Damiand 06102c9fc8 Update is_valid for mpaths. 2019-11-21 11:18:56 +01:00
Guillaume Damiand d4c2b13da6 Continue case with boundary. 2019-11-21 11:12:48 +01:00
Guillaume Damiand 15186ce2e4 Continue case with perforated faces. 2019-11-21 09:56:42 +01:00
Guillaume Damiand c94c1a0874 Continue case with perforated faces. 2019-11-20 16:04:04 +01:00
Guillaume Damiand e950d0c592 Update 2019-11-17 16:32:20 +01:00
Guillaume Damiand 3475491552 Improve the method that update pair of darts; still a bug for perfocated faces. 2019-11-16 17:25:30 +01:00
Guillaume Damiand 19b831f9d6 Debug case with boundary (nyf) 2019-10-04 13:38:23 +02:00
Guillaume Damiand f0c4a3e5b4 Bugfix in minimal quadrangulion, nyf 2019-09-18 16:32:25 +02:00
Guillaume Damiand e44fef7d0b Update polygonal schema to allow to perforate faces; impact on face graph wrapper. 2019-09-17 16:04:38 +02:00
Guillaume Damiand bd2a504af6 Bug fixes; improve face graph wrapper 2019-09-17 11:41:45 +02:00
Guillaume Damiand 3861f153f0 Bug fixes in path on surface. 2019-09-06 14:21:56 +02:00
Guillaume Damiand bc826b81a2 Bugfix in debug code 2019-09-06 14:21:02 +02:00
Guillaume Damiand 078429ffd3 Debug path on surfaces for case of surface with boundaries. 2019-09-05 17:50:34 +02:00
Guillaume Damiand 51093763cb Update path with rle 2019-09-02 15:01:28 +02:00
Guillaume Damiand 5431b21493 Update path homotopy to deal also with surfaces with boundaries. 2019-08-28 15:39:24 +02:00
Guillaume Damiand 4d227e837e Bug fix 2019-07-12 15:12:41 +02:00
Guillaume Damiand 4ca4fc248d Remove warning 2019-06-28 14:40:24 +02:00
Guillaume Damiand dda46d4ce3 Small cleanup; NULL->nullptr. 2019-06-28 11:51:27 +02:00
Guillaume Damiand e7d75acbaf Add missing file 2019-06-27 17:09:44 +02:00
Guillaume Damiand 639ffe8afa Refactoring of class Curves_on_surface_topology to make the homotopy test lazy. 2019-06-27 17:09:15 +02:00