Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/GUDHI/gudhi-devel into Ex…
Browse files Browse the repository at this point in the history
…act_SW
  • Loading branch information
MathieuCarriere committed Sep 26, 2024
2 parents 55c6edb + 7c3e328 commit ab86d93
Show file tree
Hide file tree
Showing 22 changed files with 480 additions and 493 deletions.
3 changes: 2 additions & 1 deletion .github/next_release.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Below is a list of changes:

- Installation
- CMake ≥ 3.15 is now required (was ≥ 3.8).
- Python ≥ 3.8 is now required (was ≥ 3.5), because of `importlib.metadata`.

- Miscellaneous
- The [list of bugs that were solved](https://github.com/GUDHI/gudhi-devel/issues?q=label%3A3.11.0+is%3Aclosed) is available on GitHub.
Expand All @@ -29,7 +30,7 @@ However, there are still GPL dependencies for many modules. We invite you to che

We kindly ask users to cite the GUDHI library as appropriately as possible in their papers, and to mention the use of the GUDHI library on the web pages of their projects using GUDHI and provide us with links to these web pages.

We provide [bibtex entries](https://gudhi.inria.fr/doc/latest/_citation.html) for the modules of the User and Reference Manual, as well as for publications directly related to the GUDHI library.
We provide [bibtex entries](https://gudhi.inria.fr/doc/latest/_citation.html) for the modules of the User and Reference Manual, as well as for publications directly related to the GUDHI library.

Feel free to [contact us](https://gudhi.inria.fr/contact/) in case you have any questions or remarks.

Expand Down
4 changes: 2 additions & 2 deletions src/Persistence_matrix/concept/PersistenceMatrixColumn.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class PersistenceMatrixColumn :
PersistenceMatrixColumn(Column_settings* colSettings = nullptr);
/**
* @brief Constructs a column from the given range of @ref Matrix::Entry_representative. If the dimension is stored,
* the face is assumed to be simplicial and its dimension to be `nonZeroRowIndices length - 1` or `0`.
* the cell is assumed to be simplicial and its dimension to be `nonZeroRowIndices length - 1` or `0`.
* Otherwise, the dimension should be specified with another constructor.
*
* @tparam Container Range of @ref Matrix::Entry_representative. Assumed to have a %begin(), %end() and %size()
Expand All @@ -102,7 +102,7 @@ class PersistenceMatrixColumn :
/**
* @brief Constructs a column from the given range of @ref Matrix::Entry_representative such that the rows can be
* accessed. Each new entry in the column is also inserted in a row using @ref Row_access::insert_entry.
* If the dimension is stored, the face is assumed to be simplicial and its dimension to be
* If the dimension is stored, the cell is assumed to be simplicial and its dimension to be
* `nonZeroRowIndices length - 1` or `0`. Otherwise, the dimension should be specified with another constructor.
*
* @tparam Container Range of @ref Matrix::Entry_representative. Assumed to have a %begin(), %end() and %size()
Expand Down
8 changes: 4 additions & 4 deletions src/Persistence_matrix/concept/PersistenceMatrixOptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,14 +93,14 @@ struct PersistenceMatrixOptions
* If set to false, the container is a std::vector. By default, it is recommended to set it to false, but some
* methods require it to be true to be enabled:
* - @ref Matrix::remove_column(Index) "remove_column(Index)" for @ref basematrix "base matrices",
* - @ref Matrix::remove_maximal_face(Index) "remove_maximal_face(Index)" for @ref chainmatrix "chain matrices",
* - @ref Matrix::remove_maximal_face(Index, const std::vector<Index>&)
* "remove_maximal_face(ID_index, const std::vector<ID_index>&)" for @ref chainmatrix "chain matrices",
* - @ref Matrix::remove_maximal_cell(Index) "remove_maximal_cell(Index)" for @ref chainmatrix "chain matrices",
* - @ref Matrix::remove_maximal_cell(Index, const std::vector<Index>&)
* "remove_maximal_cell(ID_index, const std::vector<ID_index>&)" for @ref chainmatrix "chain matrices",
* - @ref Matrix::remove_last "remove_last()" for @ref chainmatrix "chain matrices" if @ref has_vine_update is true.
*/
static const bool has_map_column_container;
/**
* @brief If set to true, enables the methods @ref Matrix::remove_maximal_face and @ref Matrix::remove_last,
* @brief If set to true, enables the methods @ref Matrix::remove_maximal_cell and @ref Matrix::remove_last,
* except for @ref basematrix "base matrices" when @ref has_column_compression is true.
*/
static const bool has_removable_columns;
Expand Down
4 changes: 2 additions & 2 deletions src/Persistence_matrix/doc/Intro_persistence_matrix.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ namespace persistence_matrix {
* The main functionalities are:
* @li column and row access,
* @li column addition and scalar multiplication,
* @li removal of maximal faces while maintaining a valid reduced boundary matrix or compatible chain complex base
* @li removal of maximal cells while maintaining a valid reduced boundary matrix or compatible chain complex base
* and a valid barcode with respect to the new filtration,
* @li computation of persistent homology (but note that if the barcode is your only necessity, using the
* @ref persistent_cohomology module is often more performant),
* @li computation of representative cycles for the cycle classes,
* @li swapping of two consecutive faces in a filtration (cf. vineyards @cite vineyards) while maintaining a valid
* @li swapping of two consecutive cells in a filtration (cf. vineyards @cite vineyards) while maintaining a valid
* reduced boundary matrix or compatible chain complex base and a valid barcode with respect to the new filtration,
*
* \note Matrix API is in a beta version and may change in incompatible ways in the near future.
Expand Down
Loading

0 comments on commit ab86d93

Please sign in to comment.