diff options
-rw-r--r-- | examples/demo_OTDA_classes.py | 1 | ||||
-rw-r--r-- | examples/demo_barycenter_1D.py | 3 | ||||
-rw-r--r-- | ot/optim.py | 3 |
3 files changed, 2 insertions, 5 deletions
diff --git a/examples/demo_OTDA_classes.py b/examples/demo_OTDA_classes.py index 4111ace..b2da7de 100644 --- a/examples/demo_OTDA_classes.py +++ b/examples/demo_OTDA_classes.py @@ -3,7 +3,6 @@ demo of Optimal transport for domain adaptation """ -import numpy as np import matplotlib.pylab as pl import ot diff --git a/examples/demo_barycenter_1D.py b/examples/demo_barycenter_1D.py index 7e478c2..297b872 100644 --- a/examples/demo_barycenter_1D.py +++ b/examples/demo_barycenter_1D.py @@ -9,9 +9,8 @@ import numpy as np import matplotlib.pylab as pl import ot -from mpl_toolkits.mplot3d import Axes3D from matplotlib.collections import PolyCollection -from matplotlib.colors import colorConverter + #%% parameters diff --git a/ot/optim.py b/ot/optim.py index 760b3c6..79f4f66 100644 --- a/ot/optim.py +++ b/ot/optim.py @@ -6,7 +6,6 @@ Optimization algorithms for OT import numpy as np from scipy.optimize.linesearch import scalar_search_armijo from .lp import emd -from .bregman import sinkhorn_stabilized from .bregman import sinkhorn # The corresponding scipy function does not work for matrices @@ -261,7 +260,7 @@ def gcg(a,b,M,reg1,reg2,f,df,G0=None,numItermax = 10,numInnerItermax = 200,stopT See Also -------- - ot.optim.cg : conditional gradient + ot.optim.cg : conditional gradient """ |