diff options
author | Rémi Flamary <remi.flamary@gmail.com> | 2018-05-31 13:05:37 +0200 |
---|---|---|
committer | Rémi Flamary <remi.flamary@gmail.com> | 2018-05-31 13:05:37 +0200 |
commit | 724984d3e13aa9390ef17a389fbd6ccf1f277d69 (patch) | |
tree | 086a67daf8050f38ffdf96a9a7d821d0ea82c7f5 | |
parent | ed0d4171c6291a15360bdb8a955b0783585da749 (diff) |
pep8
-rw-r--r-- | examples/plot_OT_1D_smooth.py | 2 | ||||
-rw-r--r-- | ot/smooth.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/examples/plot_OT_1D_smooth.py b/examples/plot_OT_1D_smooth.py index dec84db..ec43279 100644 --- a/examples/plot_OT_1D_smooth.py +++ b/examples/plot_OT_1D_smooth.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """ =========================== -1D smooth optimal transport +1D smooth optimal transport =========================== This example illustrates the computation of EMD, Sinkhorn and smooth OT plans diff --git a/ot/smooth.py b/ot/smooth.py index b3649e9..237b67a 100644 --- a/ot/smooth.py +++ b/ot/smooth.py @@ -22,7 +22,6 @@ #OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF #THE POSSIBILITY OF SUCH DAMAGE. - # Author: Mathieu Blondel # Remi Flamary <remi.flamary@unice.fr> @@ -33,8 +32,8 @@ Mathieu Blondel, Vivien Seguy, Antoine Rolet. In Proc. of AISTATS 2018. https://arxiv.org/abs/1710.06276 -[17] Blondel, M., Seguy, V., & Rolet, A. (2018). Smooth and Sparse Optimal -Transport. Proceedings of the Twenty-First International Conference on +[17] Blondel, M., Seguy, V., & Rolet, A. (2018). Smooth and Sparse Optimal +Transport. Proceedings of the Twenty-First International Conference on Artificial Intelligence and Statistics (AISTATS). Original code from https://github.com/mblondel/smooth-ot/ @@ -410,7 +409,6 @@ def get_plan_from_semi_dual(alpha, b, C, regul): def smooth_ot_dual(a, b, M, reg, reg_type='l2', method="L-BFGS-B", stopThr=1e-9, numItermax=500, log=False): - if reg_type.lower() in ['l2', 'squaredl2']: regul = SquaredL2(gamma=reg) |