Skip to content

[MRG] Update documentation and add quick start guide #88

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.

Sign up for GitHub

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

Merged
rflamary merged 32 commits into from
Jul 3, 2019
Merged

[MRG] Update documentation and add quick start guide #88

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0fc6938
update conf + readme
rflamary Jun 6, 2019
1171f7e
start documentation ot
rflamary Jun 6, 2019
4ae7e98
debut doc
rflamary Jun 7, 2019
8c93520
debut doc
rflamary Jun 7, 2019
4e2f6b4
first shot part OT Wass
rflamary Jun 24, 2019
7f0739f
first shot part OT Wass
rflamary Jun 25, 2019
1e0977f
cleaunup gromov + stat guide
rflamary Jun 25, 2019
c112190
cleanup documentation gromov
rflamary Jun 25, 2019
042b52d
pep8
rflamary Jun 25, 2019
c4b0aeb
add fgw examples in doc
rflamary Jun 25, 2019
830d4eb
update fgw example + add notebook
rflamary Jun 25, 2019
c9775bd
Merge branch 'master' into doc_modules
rflamary Jun 25, 2019
5e7c6ab
doc add examples unbalanced
rflamary Jun 25, 2019
dea6d8a
add notebooks unbalanced
rflamary Jun 25, 2019
8ae85fd
alpha for documentation
rflamary Jun 25, 2019
d20d471
update part 1
rflamary Jun 27, 2019
b8ac460
Merge branch 'master' into doc_modules
rflamary Jun 27, 2019
2d7db0e
update readme
rflamary Jun 27, 2019
982ee83
start section entropic
rflamary Jun 27, 2019
7dcfebb
entropic mostly done, starting general regularization
rflamary Jun 28, 2019
56deee6
update reg OT
rflamary Jun 28, 2019
bed7559
regularized OT done
rflamary Jul 2, 2019
82d10f7
wasserstein barycenetr with fixed support
rflamary Jul 2, 2019
b250212
wasserstein barycenetr with fixed support
rflamary Jul 2, 2019
64693f9
quickstart wasserstein barycenter done
rflamary Jul 2, 2019
6fdce8f
quickstart wda + start unbalanced
rflamary Jul 2, 2019
85cc12b
quickstart gfirst shot done!
rflamary Jul 2, 2019
ef00ce4
quickstart proof reading
rflamary Jul 2, 2019
4053866
Merge branch 'master' into doc_modules
rflamary Jul 2, 2019
e26aa8e
typo exmaples
rflamary Jul 2, 2019
d3236cf
test raise with pytets in test_emd_1d_emd2_1d
rflamary Jul 3, 2019
7402d34
doc in modules
rflamary Jul 3, 2019
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
Prev Previous commit
Next Next commit
alpha for documentation
  • Loading branch information
@rflamary
rflamary committed Jun 25, 2019
commit 8ae85fd6b3649058da07b16c9ea139864c7f94a1
4 changes: 2 additions & 2 deletions ot/gromov.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ def fused_gromov_wasserstein(M, C1, C2, p, q, loss_fun='square_loss', alpha=0.5,
Computes the FGW transport between two graphs see [24]

.. math::
\gamma = arg\min_\gamma (1-\alpha)*<\gamma,M>_F + \alpha* \sum_{i,j,k,l}
\gamma = arg\min_\gamma (1-\\alpha)*<\gamma,M>_F + \\alpha* \sum_{i,j,k,l}
L(C1_{i,k},C2_{j,l})*T_{i,j}*T_{k,l}

s.t. \gamma 1 = p
Expand Down Expand Up @@ -440,7 +440,7 @@ def fused_gromov_wasserstein2(M, C1, C2, p, q, loss_fun='square_loss', alpha=0.5
Computes the FGW distance between two graphs see [24]

.. math::
\min_\gamma (1-\alpha)*<\gamma,M>_F + \alpha* \sum_{i,j,k,l}
\min_\gamma (1-\\alpha)*<\gamma,M>_F + \\alpha* \sum_{i,j,k,l}
L(C1_{i,k},C2_{j,l})*T_{i,j}*T_{k,l}


Expand Down
6 changes: 3 additions & 3 deletions ot/unbalanced.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def sinkhorn_unbalanced(a, b, M, reg, alpha, method='sinkhorn', numItermax=1000,
The function solves the following optimization problem:

.. math::
W = \min_\gamma <\gamma,M>_F + reg\cdot\Omega(\gamma) + \alpha KL(\gamma 1, a) + \alpha KL(\gamma^T 1, b)
W = \min_\gamma <\gamma,M>_F + reg\cdot\Omega(\gamma) + \\alpha KL(\gamma 1, a) + \\alpha KL(\gamma^T 1, b)

s.t.
\gamma\geq 0
Expand Down Expand Up @@ -128,7 +128,7 @@ def sinkhorn_unbalanced2(a, b, M, reg, alpha, method='sinkhorn',
The function solves the following optimization problem:

.. math::
W = \min_\gamma <\gamma,M>_F + reg\cdot\Omega(\gamma) + \alpha KL(\gamma 1, a) + \alpha KL(\gamma^T 1, b)
W = \min_\gamma <\gamma,M>_F + reg\cdot\Omega(\gamma) + \\alpha KL(\gamma 1, a) + \\alpha KL(\gamma^T 1, b)

s.t.
\gamma\geq 0
Expand Down Expand Up @@ -239,7 +239,7 @@ def sinkhorn_knopp_unbalanced(a, b, M, reg, alpha, numItermax=1000,
The function solves the following optimization problem:

.. math::
W = \min_\gamma <\gamma,M>_F + reg\cdot\Omega(\gamma) + \alpha KL(\gamma 1, a) + \alpha KL(\gamma^T 1, b)
W = \min_\gamma <\gamma,M>_F + reg\cdot\Omega(\gamma) + \\alpha KL(\gamma 1, a) + \\alpha KL(\gamma^T 1, b)

s.t.
\gamma\geq 0
Expand Down