Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiparameter simplextree, C++ part. #976

Open
wants to merge 123 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
60b7325
CPP part only
DavidLapous Sep 28, 2023
1fa3aa9
some tests
DavidLapous Sep 28, 2023
04d8d8c
Update src/Simplex_tree/test/simplex_tree_multi_unit_test.cpp
DavidLapous Sep 29, 2023
2cab388
Rename box.h to Box.h
DavidLapous Sep 29, 2023
cba6c6f
Rename line.h to Line.h
DavidLapous Sep 29, 2023
ddd26fe
Rename finitely_critical_filtrations.h to Finitely_critical_filtratio…
DavidLapous Sep 29, 2023
9d3b51b
copyrights
DavidLapous Sep 29, 2023
685ae13
format
DavidLapous Sep 29, 2023
1164e28
example
DavidLapous Sep 29, 2023
38c6064
typo
DavidLapous Sep 29, 2023
40fe370
Copyrights
DavidLapous Sep 29, 2023
f7965a8
include fix
DavidLapous Sep 29, 2023
c79fec6
some documentation
DavidLapous Sep 29, 2023
aab5c34
fix
DavidLapous Sep 29, 2023
6046f8d
Update src/Simplex_tree/include/gudhi/Simplex_tree/Simplex_tree_multi.h
DavidLapous Sep 29, 2023
b1e7b99
doc
DavidLapous Sep 29, 2023
fd0a492
Merge branch 'Multiparameter-Simplextree-C++-part' of github.com:Davi…
DavidLapous Sep 29, 2023
3498a8c
indentation
DavidLapous Sep 29, 2023
ebdbfda
Filtration_value concept
DavidLapous Sep 29, 2023
1433e8e
static assert setter for 1parameter sts
DavidLapous Sep 29, 2023
f4cc240
Update src/Simplex_tree/include/gudhi/Simplex_tree/multi_filtrations/…
DavidLapous Sep 29, 2023
e9668e5
find coord fix
DavidLapous Sep 29, 2023
e4bc012
doc formatting
DavidLapous Oct 3, 2023
c832b5f
typo (Thanks Vincent)
DavidLapous Oct 3, 2023
e0ae582
inf and nan limits fix part 1
DavidLapous Oct 3, 2023
37fda79
part 2 nan + inf limits for multi-filtrations
DavidLapous Oct 3, 2023
10f990d
missing import
DavidLapous Oct 3, 2023
dc2f912
Fix the auto-breakline breakages + remove python ptr interface
DavidLapous Oct 3, 2023
d61ad0b
fix numeric_limits with multi filtrations
DavidLapous Oct 3, 2023
267dd43
test fix
DavidLapous Oct 3, 2023
b85205f
.
DavidLapous Oct 3, 2023
114327f
answer to some comments
DavidLapous Oct 3, 2023
04ce9e2
doc improvements
DavidLapous Oct 4, 2023
3f4dc40
doc improvements
DavidLapous Oct 4, 2023
d070bf1
set number of parameter in multify
DavidLapous Oct 4, 2023
96056a3
more tests
DavidLapous Oct 4, 2023
6d5ad8b
Optional num_parameters, vincent's tests of simplextree multi
DavidLapous Oct 5, 2023
a89ff98
fix make_filtration_non_decreasing
DavidLapous Oct 5, 2023
a6d756a
edge cases comparison fix
DavidLapous Oct 11, 2023
6fa20cf
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Oct 11, 2023
f90cce7
doc update
DavidLapous Oct 13, 2023
f03df17
merge
DavidLapous Oct 13, 2023
bc58007
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Oct 19, 2023
dcdd710
missing is_multi_parameter in options
DavidLapous Oct 19, 2023
e5123d6
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Nov 15, 2023
26d78ab
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Nov 17, 2023
1c0e1df
Merge branch 'master' into Multiparameter-Simplextree-C++-part
DavidLapous Nov 21, 2023
0ef649f
multiparameter flag
DavidLapous Nov 21, 2023
b448c05
multiparameter python flag
DavidLapous Nov 21, 2023
89dfd6b
multiparameter flags
DavidLapous Nov 21, 2023
cf41588
example fix
DavidLapous Nov 21, 2023
4ecdd32
fix test
DavidLapous Nov 21, 2023
49ee642
Merge branch 'Multiparameter-Simplextree-C++-part' of github.com:Davi…
DavidLapous Nov 21, 2023
9de0252
merge
DavidLapous Jun 23, 2024
5b7e276
update
DavidLapous Jun 23, 2024
8c797f2
fix: test & tbb
DavidLapous Jun 24, 2024
8b303c2
fix: include missing in stmulti exemple
DavidLapous Jun 25, 2024
27ebaf6
fix: unnecessary tbb include
DavidLapous Jun 25, 2024
c7cd3d3
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Jun 26, 2024
214ebc6
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Jun 29, 2024
afde822
Update src/Simplex_tree/include/gudhi/Simplex_tree/multi_filtrations/…
DavidLapous Jul 1, 2024
039415d
fix: remove unnecessary multiparameter flag
DavidLapous Jul 1, 2024
6c27892
fix: inf_ simplextree static member should be const
DavidLapous Jul 1, 2024
882bf8c
feat: Assert in the line constructor that the arguments are correct.
DavidLapous Jul 1, 2024
a15d72c
fix: doc missing and not correct infinite values.
DavidLapous Jul 1, 2024
460e1a0
doc: added some doc for the box class
DavidLapous Jul 1, 2024
9b7612e
doc: added a bit of doc in the multi-filtrations file
DavidLapous Jul 1, 2024
e5eead4
fix: typo in doc
DavidLapous Jul 1, 2024
3344c17
revert: remove the const to inf_ (conflicts with filtration_mutable)
DavidLapous Jul 2, 2024
1e8fc4f
doc: small update
DavidLapous Jul 2, 2024
03cf667
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Jul 6, 2024
6be37e7
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Jul 12, 2024
21d95cb
Update src/Simplex_tree/example/simplex_tree_multi.cpp
DavidLapous Jul 16, 2024
6338fc7
doc
DavidLapous Jul 16, 2024
3d480b6
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Jul 18, 2024
8eac4b9
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Jul 31, 2024
ac575db
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Aug 2, 2024
065a8b9
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Aug 12, 2024
959a3d3
Move and rename in 2 new modules Multi_filtration and Multi_persistence
VincentRouvreau Aug 19, 2024
a42608e
Bad copy/paste from editor
VincentRouvreau Aug 20, 2024
893fbf6
Move Line and Box in a Multi_persistence folder to enhance inclusion …
VincentRouvreau Aug 20, 2024
ffaf004
Add example in doc
VincentRouvreau Aug 20, 2024
be3ba48
clang-format moved files
VincentRouvreau Aug 20, 2024
30397ba
Failed clang-format
VincentRouvreau Aug 20, 2024
01d4a30
Merge pull request #1 from VincentRouvreau/multi_parameter_module
DavidLapous Aug 22, 2024
62bd472
one_critical_filtration
hschreiber Aug 23, 2024
4d6dbbf
Merge pull request #2 from DavidLapous/multiparam_st_schreib_clean
DavidLapous Aug 26, 2024
6d7d5f6
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Aug 27, 2024
a882194
multi_critical_filtration
hschreiber Aug 27, 2024
777a766
Merge branch 'GUDHI:master' into multiparam_st_schreib_clean
hschreiber Aug 27, 2024
3ae5312
removal of get_copy
hschreiber Aug 27, 2024
92ce37c
removal of get-content and renaming of fil
hschreiber Aug 29, 2024
ff4d970
Merge pull request #3 from DavidLapous/multiparam_st_schreib_clean
DavidLapous Aug 29, 2024
9258390
doc + renaming
hschreiber Aug 29, 2024
7d66c00
re-format
hschreiber Aug 29, 2024
5a80760
add enum class for _get_domination_relation
hschreiber Aug 29, 2024
59f99b0
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Aug 30, 2024
15324a3
windows fix
hschreiber Aug 30, 2024
d3625c4
correction doc + no empty values for multicritical
hschreiber Sep 2, 2024
ebafc31
Merge pull request #4 from DavidLapous/multiparam_st_schreib_clean
DavidLapous Sep 3, 2024
bac48dc
unit test fix
hschreiber Sep 3, 2024
bc64d15
Merge remote-tracking branch 'origin/multiparam_st_schreib_clean' int…
hschreiber Sep 3, 2024
8385ac4
windows fix
hschreiber Sep 3, 2024
00ad5a5
Merge remote-tracking branch 'origin/multiparam_st_schreib_clean' int…
hschreiber Sep 3, 2024
361134a
windows fix
hschreiber Sep 3, 2024
76390f4
Merge remote-tracking branch 'origin/multiparam_st_schreib_clean' int…
hschreiber Sep 3, 2024
4190ed7
doc line and box
hschreiber Sep 4, 2024
19aba94
unit tests for box and line
hschreiber Sep 4, 2024
69986c3
Merge pull request #5 from DavidLapous/multiparam_st_schreib_clean
DavidLapous Sep 5, 2024
7925e87
add sort in multicritical + other small fixes
hschreiber Sep 5, 2024
c5263dc
doc
hschreiber Sep 5, 2024
732c2c3
co fix
hschreiber Sep 5, 2024
1e856ec
Merge pull request #6 from DavidLapous/multiparam_st_schreib_clean
DavidLapous Sep 6, 2024
0dd084c
minor fixes
hschreiber Sep 6, 2024
d2a2168
Merge branch 'GUDHI:master' into multiparam_st_schreib_clean
hschreiber Sep 6, 2024
9ec506a
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Sep 12, 2024
02cb463
small fixes
hschreiber Sep 24, 2024
f6d5b7e
merge upstream
hschreiber Nov 15, 2024
17d1caa
Merge branch 'Multiparameter-Simplextree-C++-part' into multiparam_st…
hschreiber Nov 15, 2024
b752394
merge fix
hschreiber Nov 15, 2024
1b24266
Merge pull request #7 from DavidLapous/multiparam_st_schreib_clean
DavidLapous Nov 21, 2024
bf9ecf6
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Nov 21, 2024
d4b4e19
Merge branch 'GUDHI:master' into Multiparameter-Simplextree-C++-part
DavidLapous Dec 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ add_gudhi_module(Witness_complex)
add_gudhi_module(Nerve_GIC)
add_gudhi_module(Persistence_matrix)
add_gudhi_module(Zigzag_persistence)
add_gudhi_module(Multi_persistence)
add_gudhi_module(Multi_filtration)

# Include module CMake subdirectories
# GUDHI_SUB_DIRECTORIES is managed in CMAKE_MODULE_PATH/GUDHI_modules.cmake
Expand Down
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ add_gudhi_module(Witness_complex)
add_gudhi_module(Nerve_GIC)
add_gudhi_module(Persistence_matrix)
add_gudhi_module(Zigzag_persistence)
add_gudhi_module(Multi_persistence)
add_gudhi_module(Multi_filtration)

set(GUDHI_BIBLIO_DIR ${CMAKE_SOURCE_DIR})
# For "make doxygen" - Requires GUDHI_USER_VERSION_DIR to be set
Expand Down
12 changes: 12 additions & 0 deletions src/Multi_filtration/doc/COPYRIGHT
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
The files of this directory are part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.

Author(s): Hannah Schreiber, David Loiseaux

Copyright (C) 2024 Inria

This gives everyone the freedoms to use openFrameworks in any context:
commercial or non-commercial, public or private, open or closed source.

You should have received a copy of the MIT License along with this program.
If not, see https://opensource.org/licenses/MIT.
36 changes: 36 additions & 0 deletions src/Multi_filtration/doc/Intro_multi_filtration_values.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/* This file is part of the Gudhi Library - https://gudhi.inria.fr/ - which is released under MIT.
* See file LICENSE or go to https://gudhi.inria.fr/licensing/ for full license details.
* Author(s): Hannah Schreiber
*
* Copyright (C) 2024 Inria
*
* Modification(s):
* - YYYY/MM Author: Description of the modification
*/

#ifndef DOC_MULTI_FILTRATION_INTRO_H_
#define DOC_MULTI_FILTRATION_INTRO_H_

// needs namespace for Doxygen to link on classes
namespace Gudhi {
namespace multi_filtration {

/** \defgroup multi_filtration Multi-parameter Filtration Values
* @{
* \author David Loiseaux
*
* \section multifiltrationintro Multi-parameter Filtration Values
*
* TODO: introduction to @ref One_critical_filtration and @ref Multi_critical_filtration
*
* \subsection multifiltrationexamples Examples
*
* Here is a list of examples using the module:
* \li TODO?.
*
* @}
*/
} // namespace persistence_fields
} // namespace Gudhi

#endif // DOC_MULTI_FILTRATION_INTRO_H_
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading