summaryrefslogtreecommitdiff
path: root/ot/smooth.py
diff options
context:
space:
mode:
authorRémi Flamary <remi.flamary@gmail.com>2018-05-31 13:05:37 +0200
committerRémi Flamary <remi.flamary@gmail.com>2018-05-31 13:05:37 +0200
commit724984d3e13aa9390ef17a389fbd6ccf1f277d69 (patch)
tree086a67daf8050f38ffdf96a9a7d821d0ea82c7f5 /ot/smooth.py
parented0d4171c6291a15360bdb8a955b0783585da749 (diff)
pep8
Diffstat (limited to 'ot/smooth.py')
-rw-r--r--ot/smooth.py6
1 files changed, 2 insertions, 4 deletions
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)