diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:18:41 +0200 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-08-18 10:18:41 +0200 |
commit | 1390b4c5e1207f41b66c69edc66496a5f9b63b12 (patch) | |
tree | 912a03dd3477931f5d90f20be558e3afb5ef7ebe /src/python/doc/representations_sum.inc | |
parent | 458bc2dcf5044e1d5fde5326b2be35e526abd457 (diff) | |
parent | 4737aaeb36a4ff3b27d7bcbb374911197ed09e5a (diff) |
Merge master & resolve conflicts
Diffstat (limited to 'src/python/doc/representations_sum.inc')
-rw-r--r-- | src/python/doc/representations_sum.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/doc/representations_sum.inc b/src/python/doc/representations_sum.inc index 323a0920..4298aea9 100644 --- a/src/python/doc/representations_sum.inc +++ b/src/python/doc/representations_sum.inc @@ -2,7 +2,7 @@ :widths: 30 40 30 +------------------------------------------------------------------+----------------------------------------------------------------+-------------------------------------------------------------+ - | .. figure:: | Vectorizations, distances and kernels that work on persistence | :Author: Mathieu Carrière | + | .. figure:: | Vectorizations, distances and kernels that work on persistence | :Author: Mathieu Carrière, Martin Royer | | img/sklearn-tda.png | diagrams, compatible with scikit-learn. | | | | | :Since: GUDHI 3.1.0 | | | | | |