diff options
| author | tvayer <titouan.vayer@gmail.com> | 2019-05-28 17:13:21 +0200 |
|---|---|---|
| committer | tvayer <titouan.vayer@gmail.com> | 2019-05-28 17:13:21 +0200 |
| commit | cd4b98c34f885176f33db3fab16530622f29ab42 (patch) | |
| tree | a886eb333c20c964ef24fbc3958c78af9657a54a /ot/gromov.py | |
| parent | b1b514f5d9de009e63bd407dfd9c0a0cf6128876 (diff) | |
solve conlict
Diffstat (limited to 'ot/gromov.py')
| -rw-r--r-- | ot/gromov.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ot/gromov.py b/ot/gromov.py index 31bd657..ad68a1c 100644 --- a/ot/gromov.py +++ b/ot/gromov.py @@ -398,7 +398,7 @@ def fused_gromov_wasserstein(M,C1,C2,p,q,loss_fun='square_loss',alpha=0.5,amijo= log dictionary return only if log==True in parameters
References
----------
- .. [18] Vayer Titouan, Chapel Laetitia, Flamary R{\'e}mi, Tavenard Romain
+ .. [24] Vayer Titouan, Chapel Laetitia, Flamary R{\'e}mi, Tavenard Romain
and Courty Nicolas
"Optimal Transport for structured data with application on graphs"
International Conference on Machine Learning (ICML). 2019.
@@ -921,7 +921,7 @@ def fgw_barycenters(N,Ys,Cs,ps,lambdas,alpha,fixed_structure=False,fixed_feature Ms : all distance matrices between the feature of the barycenter and the other features dist(X,Ys) shape (N,ns)
References
----------
- .. [18] Vayer Titouan, Chapel Laetitia, Flamary R{\'e}mi, Tavenard Romain
+ .. [24] Vayer Titouan, Chapel Laetitia, Flamary R{\'e}mi, Tavenard Romain
and Courty Nicolas
"Optimal Transport for structured data with application on graphs"
International Conference on Machine Learning (ICML). 2019.
@@ -1077,7 +1077,7 @@ def update_feature_matrix(lambdas,Ys,Ts,p): References
----------
- .. [18] Vayer Titouan, Chapel Laetitia, Flamary R{\'e}mi, Tavenard Romain
+ .. [24] Vayer Titouan, Chapel Laetitia, Flamary R{\'e}mi, Tavenard Romain
and Courty Nicolas
"Optimal Transport for structured data with application on graphs"
International Conference on Machine Learning (ICML). 2019.
|