From 84aa3183491260b9c3dbb9f928499cc18e5341c1 Mon Sep 17 00:00:00 2001
From: Rémi Flamary <remi.flamary@gmail.com>
Date: Wed, 26 Jul 2017 12:22:00 +0200
Subject: pep8

---
 ot/__init__.py |  2 +-
 ot/bregman.py  | 16 +++++++++-------
 ot/da.py       |  4 ++--
 ot/optim.py    |  2 +-
 4 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'ot')

diff --git a/ot/__init__.py b/ot/__init__.py
index c2161e4..6d4c4c6 100644
--- a/ot/__init__.py
+++ b/ot/__init__.py
@@ -28,6 +28,6 @@ from .utils import dist, unif, tic, toc, toq
 
 __version__ = "0.3.1"
 
-__all__ = ["emd", "emd2", "sinkhorn","sinkhorn2", "utils", 'datasets',
+__all__ = ["emd", "emd2", "sinkhorn", "sinkhorn2", "utils", 'datasets',
            'bregman', 'lp', 'plot', 'tic', 'toc', 'toq',
            'dist', 'unif', 'barycenter', 'sinkhorn_lpl1_mm', 'da', 'optim']
diff --git a/ot/bregman.py b/ot/bregman.py
index 71a5548..929388e 100644
--- a/ot/bregman.py
+++ b/ot/bregman.py
@@ -108,7 +108,8 @@ def sinkhorn(a, b, M, reg, method='sinkhorn', numItermax=1000, stopThr=1e-9, ver
                                        stopThr=stopThr, verbose=verbose, log=log, **kwargs)
     elif method.lower() == 'sinkhorn_epsilon_scaling':
         def sink():
-            return sinkhorn_epsilon_scaling(a, b, M, reg, numItermax=numItermax,
+            return sinkhorn_epsilon_scaling(
+                a, b, M, reg, numItermax=numItermax,
                                             stopThr=stopThr, verbose=verbose, log=log, **kwargs)
     else:
         print('Warning : unknown method using classic Sinkhorn Knopp')
@@ -216,7 +217,8 @@ def sinkhorn2(a, b, M, reg, method='sinkhorn', numItermax=1000, stopThr=1e-9, ve
                                        stopThr=stopThr, verbose=verbose, log=log, **kwargs)
     elif method.lower() == 'sinkhorn_epsilon_scaling':
         def sink():
-            return sinkhorn_epsilon_scaling(a, b, M, reg, numItermax=numItermax,
+            return sinkhorn_epsilon_scaling(
+                a, b, M, reg, numItermax=numItermax,
                                             stopThr=stopThr, verbose=verbose, log=log, **kwargs)
     else:
         print('Warning : unknown method using classic Sinkhorn Knopp')
@@ -593,7 +595,7 @@ def sinkhorn_stabilized(a, b, M, reg, numItermax=1000, tau=1e3, stopThr=1e-9, wa
 
         cpt = cpt + 1
 
-    #print('err=',err,' cpt=',cpt)
+    # print('err=',err,' cpt=',cpt)
     if log:
         log['logu'] = alpha / reg + np.log(u)
         log['logv'] = beta / reg + np.log(v)
@@ -778,7 +780,7 @@ def sinkhorn_epsilon_scaling(a, b, M, reg, numItermax=100, epsilon0=1e4, numInne
             loop = False
 
         cpt = cpt + 1
-    #print('err=',err,' cpt=',cpt)
+    # print('err=',err,' cpt=',cpt)
     if log:
         log['alpha'] = alpha
         log['beta'] = beta
@@ -965,16 +967,16 @@ def unmix(a, D, M, M0, h0, reg, reg0, alpha, numItermax=1000, stopThr=1e-3, verb
 
     """
 
-    #M = M/np.median(M)
+    # M = M/np.median(M)
     K = np.exp(-M / reg)
 
-    #M0 = M0/np.median(M0)
+    # M0 = M0/np.median(M0)
     K0 = np.exp(-M0 / reg0)
     old = h0
 
     err = 1
     cpt = 0
-    #log = {'niter':0, 'all_err':[]}
+    # log = {'niter':0, 'all_err':[]}
     if log:
         log = {'err': []}
 
diff --git a/ot/da.py b/ot/da.py
index 977d532..4f9bce5 100644
--- a/ot/da.py
+++ b/ot/da.py
@@ -478,7 +478,7 @@ def joint_OT_mapping_kernel(xs, xt, mu=1, eta=0.001, kerneltype='gaussian', sigm
         Kp[:ns, :ns] = K
 
         # ls regu
-        #K0 = K1.T.dot(K1)+eta*I
+        # K0 = K1.T.dot(K1)+eta*I
         # Kreg=I
 
         # RKHS regul
@@ -490,7 +490,7 @@ def joint_OT_mapping_kernel(xs, xt, mu=1, eta=0.001, kerneltype='gaussian', sigm
         I = np.eye(ns)
 
         # ls regul
-        #K0 = K1.T.dot(K1)+eta*I
+        # K0 = K1.T.dot(K1)+eta*I
         # Kreg=I
 
         # proper kernel ridge
diff --git a/ot/optim.py b/ot/optim.py
index c59089c..1d09adc 100644
--- a/ot/optim.py
+++ b/ot/optim.py
@@ -304,7 +304,7 @@ def gcg(a, b, M, reg1, reg2, f, df, G0=None, numItermax=10, numInnerItermax=200,
         Mi = M + reg2 * df(G)
 
         # solve linear program with Sinkhorn
-        #Gc = sinkhorn_stabilized(a,b, Mi, reg1, numItermax = numInnerItermax)
+        # Gc = sinkhorn_stabilized(a,b, Mi, reg1, numItermax = numInnerItermax)
         Gc = sinkhorn(a, b, Mi, reg1, numItermax=numInnerItermax)
 
         deltaG = Gc - G
-- 
cgit v1.2.3