Commit Graph

176 Commits

Author SHA1 Message Date
Laurent Rineau 2ff279bb99 Merge pull request #7971 from lrineau/SMDS_3-fix_read_MEDIT-GF
Mesh_3/SMDS_3: Fix reading of .mesh files
2024-01-24 16:01:46 +01:00
Laurent Rineau 885647fe4c fix for when the line is empty 2024-01-19 15:17:04 +01:00
Laurent Rineau c539c5657c fix when reading on Linux a .mesh file produced by Windows 2024-01-17 09:56:39 +01:00
Laurent Rineau 074a337e88 Mesh_3/SMDS_3: Fix reading of .mesh files
With a `.mesh` containing `Triangles` in a comment, like that one:

```
MeshVersionFormatted 1

Dimension
3

Vertices
121
-10.0402  -10.0402  -10.0402    0
-10  10  10    0
10  10  10    0
[...]
Triangles
609
     98     76     65    0
     98     81     76    0
     65     81     98    0
Tetrahedra
244
     81     65     76     98  0
     28      1     37     34  0
     69     25     70     94  0
[...]
End
```

then the code failed. It read `Triangles` as the beginning of the triangles section.

The commit use `std::getline()` to read the comments and the keywords:
- `Vertices`
- `Triangles`
- `Tetrahedra`
2024-01-11 11:35:05 +01:00
Sebastien Loriot caecbe29c7
Replace boost::mpl (#7813)
- `boost::mpl::if_` --> `std::conditional`
- `boost::enable_if` -> `std::enable_if`
- `boost::mpl::and_` -> `&&`
- `boost::mpl::or_` -> `||`
- `boost::constant::bool_` -> `std::bool_constant`
- ...
2023-12-26 17:33:36 +01:00
Laurent Rineau 0131b0e03e Merge pull request #7838 from janetournois/SMDS_3-delete_test_output-jtournois
SMDS_3 - avoid output files for testing
2023-11-15 15:44:17 +01:00
Jane Tournois d77935f496 replace ofstream by ostringstream 2023-10-31 11:50:42 +01:00
Sébastien Loriot 8700394122 boost::mpl::if_ -> std::conditional 2023-09-24 22:57:20 +02:00
Mael Rouxel-Labbé e2832dfe6d Merge remote-tracking branch 'cgal/master' into SMDS_3-Fix_stack-GF 2023-09-07 15:59:04 +02:00
Mael Rouxel-Labbé cdb0a1c154 Merge remote-tracking branch 'cgal/master' into SMDS_3-Fix_stack-GF 2023-09-05 13:51:01 +02:00
albert-github 93001308f4 Merge branch 'master' into feature/issue_7395
# Conflicts:
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementPointLocation_2.h
#	Arrangement_on_surface_2/doc/Arrangement_on_surface_2/Concepts/ArrangementVerticalRayShoot_2.h
2023-08-18 11:10:42 +02:00
Sébastien Loriot 5d87958a7c fix format
only changing the top string, not the data
2023-08-04 14:40:32 +02:00
Mael Rouxel-Labbé a935682a82 (Re-)introduce Compact_simplicial_mesh_cell_base_3
Formerly known as Simplicial_mesh_cell_base_3, this cell base
is more efficient in memory, but cannot inherit a base.
2023-07-24 11:05:47 +02:00
Mael Rouxel-Labbé 3ad1825359 Fix not being able to Rebind multiple time SMDS_3 / Tet Remesh Vb/Cb
If you have the following construct:

  class V : public Vb;

  class V_base
  {
    struct Rebind --> V;
  }

then you cannot rebind twice. More vicious, if Vb
can rebind twice multiple times (e.g. it's a T3 Vb),
then it'll silently drop V in the stack, and rebind
only up to the rebound Vb!

Rebinding multiple times happens for example in
Triangulation_hierarchy_3 (Delaunay_triangulation_3
with Fast_locate).
2023-07-21 09:55:01 +02:00
Mael Rouxel-Labbé 796baca1c5 Misc minor cleaning 2023-07-19 22:43:14 +02:00
Mael Rouxel-Labbé 4e824edf32 Improve doc of Simplicial_vertex_base_3 2023-07-19 22:35:56 +02:00
Mael Rouxel-Labbé e11bbab4f6 De-compactify Simplicial_mesh_cell_base_3
Give it a cell base instead of re-implementing everything.
2023-07-19 22:35:28 +02:00
albert-github ad41766454 issue #7395 Improvement of layout of model relations
Corrected `cgalModels` to `cgalHasModes` inside `cgalHasNodelsBegin` / `cgalHasModelsEnd`
2023-07-18 13:23:37 +02:00
albert-github 4e5578d469 issue #7395 Improvement of layout of model relations
- based on review
2023-07-15 13:12:15 +02:00
albert-github 301728a8a9 issue #7395 Improvement of layout of model relations
- Completed the cgalModels part
2023-07-09 12:43:36 +02:00
albert-github ee2a55279d issue #7395 Improvement of layout of model relations
- Completed the cgalHasModel part
- corrected spelling of `Has Model` and `Is Model Of` to `Has model` and `Is model of`
2023-07-06 17:35:34 +02:00
Sébastien Loriot 640c98f21e add utility to avoid duplicate in variant + use it in SMDS_3 2023-06-15 11:34:14 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot bbc48b2c7e more fixes
use Mesh_3::internal::get_index
std::dynamic_point_cast
std::get_if
2023-06-15 10:57:10 +02:00
Sébastien Loriot edc317d771 variant::which() => variant::index() + typos 2023-06-15 10:57:10 +02:00
Sébastien Loriot 9a0bdb5d96 boost::variant ---> std::variant 2023-06-15 10:57:10 +02:00
Laurent Rineau 08938cf326 Merge pull request #7480 from rdengate/appended_data_tag
Add missing AppendedData closing tag, so vtu binary file contains valid xml
2023-06-05 15:10:07 +02:00
Rebecca Dengate fb9f59d3a9 Adds missing AppendedData closing tag, so vtu binary file contains valid xml. 2023-05-30 16:35:10 +10:00
Mael 532b82cb9b
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-05-04 17:28:47 +02:00
Laurent Rineau d2bc415a15 Merge pull request #6950 from lrineau/CGAL-allow_Epick_with_float-GF
Simple_precision_epick: an Epick-like kernel with float as FT
2023-05-04 16:37:17 +02:00
Laurent Rineau 1dce90ee79 Merge remote-tracking branch 'cgal/master' into CGAL-allow_Epick_with_float-GF 2023-04-07 10:59:51 +02:00
Mael Rouxel-Labbé cd0c81a98a Merge remote-tracking branch 'cgal/master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-03-20 10:14:27 +01:00
albert-github 2d60f46985 issue #7231 Improvement of layout of refines relations.
- Adjusted cgalRefines according to reviews
- Implemented it in all files
2023-03-14 17:37:50 +01:00
Laurent Rineau 35a1285a12 Merge pull request #6129 from janetournois/Mesh_3-triple_line_extraction-GF
Mesh_3 - add detection of intersection lines from labeled images

# Conflicts:
#	Installation/CHANGES.md
2023-03-13 16:46:07 +01:00
Laurent Rineau 5a20fd8567 Merge pull request #7238 from albert-github/feature/bug_author_consistency
Making description of author(s)  of a package consistent
2023-02-24 16:14:43 +01:00
Jane Tournois e8e3eaa7b4 Merge remote-tracking branch 'cgal/master' into Mesh_3-triple_line_extraction-GF
# Conflicts:
#	Mesh_3/test/Mesh_3/CMakeLists.txt
2023-02-21 11:05:30 +01:00
Jane Tournois 9591cd6a94 vertices of 0 < dimension < 2 are removed as isolated
* corners and feature edges vertices are not removed (0 < dim < 2)
* far points (dim = -1) are removed as isolated vertices

the assertion
CGAL_assertion(far_vertices_.size() <= isolated.size());
started failing because of commit
3490fdd0c0
2023-02-07 11:39:53 +01:00
albert-github 57e900b47c Making description of author(s) of a package consistent
- use `\cgalPckAuthor` in case of one author
- use of `\cgalPckAuthors` in case of multiple authors
- using in case of multiple authors always `, and `
- in the 1.9.6 `BaseDoxyfile.in` let the `\cgalPckAuthors` point to `\cgalPckAuthor` to get consistent output (not done for other versions as in the past the `ALIASES` could not call one another).
2023-02-02 18:40:44 +01:00
Sébastien Loriot 9e137bca24 Merge 'cgal/master' 2023-01-31 12:26:55 +01:00
Mael 153c603209
Merge branch 'master' into CGAL-Clean_CMakeLists.txt-GF 2023-01-27 22:09:02 +01:00
Mael 8f703b54cb
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-01-27 21:48:32 +01:00
Laurent Rineau fc61b42864 Merge pull request #6858 from sloriot/Doc-exclude_internal
Ignore internal directories
2023-01-27 21:02:29 +01:00
Laurent Rineau 7255c885bd Merge pull request #7139 from janetournois/SMDS_3-verbose_mode-jtournois
Tet_soup_to_c3t3 - reduce verbosity
2023-01-27 21:02:19 +01:00
Jane Tournois b7cd0f8538 doc
we keep vertices of dimension 0 and 1,
that may have a meaning for the user
2023-01-20 16:14:49 +01:00
Jane Tournois 3490fdd0c0 do not remove vertices of features (dimension 1 and 0) even if isolated
if the user has asked to insert these vertices, they should not be removed
2023-01-20 14:17:47 +01:00
Mael 4d22c90474
Merge branch 'master' into feature/bug_documentation_spell_20221113 2023-01-04 10:06:45 +01:00
Jane Tournois 2d04633e20 add if(verbose) when needed 2022-12-22 09:35:09 +01:00
Sébastien Loriot 069e43a5da remove specific internal exclude list (covered with the general one) 2022-12-15 10:20:45 +01:00
Laurent Rineau cf04d506f3 Merge PR "Mesh_3, dump_c3t3: remove verbose flag" #7110 2022-12-14 10:28:21 +01:00
Mael 0ff7882997
Merge branch 'master' into feature/bug_documentation_spell_20221113 2022-12-06 22:21:06 +01:00