diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:32:03 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-01-27 10:32:03 +0100 |
commit | 0ce82cdc262fe9c09a1df1f559e1c17abfbbea3d (patch) | |
tree | 56fcdcce7544a32899d0707c2274274df2c37d30 /src/python/doc/representations_sum.inc | |
parent | 7cd38c50d3843fd222d4210507bad948afe63912 (diff) | |
parent | 5d5f40493ce60f2a606793645bf713c60fb5284d (diff) |
Merge upstream and resolve conflict
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 7b167a17..700828f1 100644 --- a/src/python/doc/representations_sum.inc +++ b/src/python/doc/representations_sum.inc @@ -3,7 +3,7 @@ +------------------------------------------------------------------+----------------------------------------------------------------+-----------------------------------------------+ | .. figure:: | Vectorizations, distances and kernels that work on persistence | :Author: Mathieu Carrière | - | ../../doc/Persistence_representations/average_landscape.png | diagrams, compatible with scikit-learn. | | + | img/sklearn-tda.png | diagrams, compatible with scikit-learn. | | | | | :Introduced in: GUDHI 3.1.0 | | | | | | | | :Copyright: MIT | |