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

Refactor regularized TI costs #553

Merged
merged 17 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
11 changes: 11 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,17 @@
"dollarmath",
]

# mathjax
mathjax3_config = {
"tex": {
"macros": {
"prox": r"\mathrm{prox}",
"min": r"\mathrm{min}",
"argmin": r"\mathrm{argmin}",
}
}
}

# bibliography
bibtex_bibfiles = ["references.bib"]
bibtex_reference_style = "author_year"
Expand Down
19 changes: 15 additions & 4 deletions docs/geometry.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,29 @@ Cost Functions
costs.SqPNorm
costs.PNormP
costs.SqEuclidean
costs.RegTICost
costs.Euclidean
costs.Cosine
costs.Arccos
costs.Bures
costs.UnbalancedBures
costs.ElasticL1
costs.ElasticL2
costs.ElasticSTVS
costs.ElasticSqKOverlap
costs.SoftDTW
distrib_costs.UnivariateWasserstein

Regularizers
------------
.. autosummary::
:toctree: _autosummary

regularizers.ProximalOperator
regularizers.Regularization
regularizers.Orthogonal
regularizers.Quadratic
regularizers.L1
regularizers.L2
regularizers.STVS
regularizers.SqKOverlap

Utilities
---------
.. autosummary::
Expand Down
31 changes: 31 additions & 0 deletions docs/references.bib
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,17 @@ @inproceedings{argyriou:12
year = {2012},
}

@article{mcdonald:16,
author = {McDonald, Andrew M. and Pontil, Massimiliano and Stamos, Dimitris},
url = {http://jmlr.org/papers/v17/15-151.html},
journal = {Journal of Machine Learning Research},
number = {155},
pages = {1--38},
title = {New Perspectives on k-Support and Cluster Norms},
volume = {17},
year = {2016},
}

@article{zou:05,
author = {Zou, Hui and Hastie, Trevor},
publisher = {[Royal Statistical Society, Wiley]},
Expand Down Expand Up @@ -933,3 +944,23 @@ @misc{vesseron:24
title = {On a Neural Implementation of Brenier's Polar Factorization},
year = {2024},
}

@book{bauschke:17,
author = {Bauschke, Heinz H. and Combettes, Patrick Louis},
publisher = {Springer},
url = {https://hal.sorbonne-universite.fr/hal-01517477},
title = {Convex analysis and monotone operator theory in Hilbert spaces},
year = {2017},
}

@article{combettes:07,
author = {Combettes, Patrick L. and Pesquet, Jean-Christophe},
doi = {10.1109/JSTSP.2007.910264},
journal = {IEEE Journal of Selected Topics in Signal Processing},
keywords = {Signal processing algorithms;Hilbert space;Signal processing;Signal analysis;Convergence;Image denoising;Noise reduction;Projection algorithms;Mathematical model;Convex optimization;denoising;Douglas–Rachford;frame;nondifferentiable optimization;Poisson noise;proximal algorithm;wavelets},
number = {4},
pages = {564--574},
title = {A Douglas–Rachford Splitting Approach to Nonsmooth Convex Variational Signal Recovery},
volume = {1},
year = {2007},
}
74 changes: 30 additions & 44 deletions docs/tutorials/sparse_monge_displacements.ipynb

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/ott/geometry/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
graph,
grid,
pointcloud,
regularizers,
segment,
)
Loading
Loading