From 5318d92f2d3dd1003772ba394a268dd671b457d2 Mon Sep 17 00:00:00 2001 From: Erin Wild Date: Mon, 18 Feb 2019 20:04:10 -0500 Subject: [PATCH] Sort and remove unused mports --- sompy/__init__.py | 5 +---- sompy/codebook.py | 4 ++-- sompy/neighborhood.py | 3 ++- sompy/normalization.py | 5 +++-- sompy/sompy.py | 16 +++++++--------- sompy/visualization/bmuhits.py | 4 +--- sompy/visualization/dotmap.py | 5 +++-- sompy/visualization/histogram.py | 8 ++++---- sompy/visualization/hitmap.py | 6 ++---- sompy/visualization/mapview.py | 9 +++------ sompy/visualization/umatrix.py | 16 +++++++++------- 11 files changed, 37 insertions(+), 44 deletions(-) diff --git a/sompy/__init__.py b/sompy/__init__.py index 3b1e899..6abcd49 100644 --- a/sompy/__init__.py +++ b/sompy/__init__.py @@ -1,7 +1,6 @@ - from logging.config import dictConfig -import matplotlib +import matplotlib #matplotlib.use('Agg') # Use whatever backend is available dictConfig({ @@ -25,7 +24,5 @@ } }) - - from .sompy import SOMFactory from .visualization import * diff --git a/sompy/codebook.py b/sompy/codebook.py index f343da0..7c8b340 100644 --- a/sompy/codebook.py +++ b/sompy/codebook.py @@ -1,8 +1,7 @@ import numpy as np import scipy as sp - from sklearn.decomposition import PCA -#from sklearn.decomposition import RandomizedPCA# (randomizedpca is deprecated) + from .decorators import timeit @@ -13,6 +12,7 @@ class InvalidNodeIndexError(Exception): class InvalidMapsizeError(Exception): pass + def generate_hex_lattice(n_rows, n_columns): x_coord = [] y_coord = [] diff --git a/sompy/neighborhood.py b/sompy/neighborhood.py index 08d35e2..fc35407 100644 --- a/sompy/neighborhood.py +++ b/sompy/neighborhood.py @@ -1,7 +1,8 @@ -import numpy as np import inspect import sys +import numpy as np + small = .000000000001 diff --git a/sompy/normalization.py b/sompy/normalization.py index 1a6f3d4..78f5ab9 100644 --- a/sompy/normalization.py +++ b/sompy/normalization.py @@ -1,6 +1,7 @@ -import numpy as np -import sys import inspect +import sys + +import numpy as np class NormalizerFactory(object): diff --git a/sompy/sompy.py b/sompy/sompy.py index 54b3547..6f4bf1e 100644 --- a/sompy/sompy.py +++ b/sompy/sompy.py @@ -8,23 +8,21 @@ # Contributor: Sebastian Packmann (sebastian.packmann@gmail.com) -import tempfile -import os import itertools import logging +import os +import tempfile +from multiprocessing import cpu_count +from multiprocessing.dummy import Pool +from time import time import numpy as np - -from time import time -from multiprocessing.dummy import Pool -from multiprocessing import cpu_count from scipy.sparse import csr_matrix from sklearn import neighbors -from sklearn.externals.joblib import Parallel, delayed, load, dump -import sys +from sklearn.externals.joblib import dump, load -from .decorators import timeit from .codebook import Codebook +from .decorators import timeit from .neighborhood import NeighborhoodFactory from .normalization import NormalizerFactory diff --git a/sompy/visualization/bmuhits.py b/sompy/visualization/bmuhits.py index bd265d7..3dd3946 100644 --- a/sompy/visualization/bmuhits.py +++ b/sompy/visualization/bmuhits.py @@ -5,9 +5,7 @@ from matplotlib import pyplot as plt from .mapview import MapView - -from sompy.visualization.plot_tools import plot_hex_map - +from .plot_tools import plot_hex_map class BmuHitsView(MapView): diff --git a/sompy/visualization/dotmap.py b/sompy/visualization/dotmap.py index 8f38441..8a0697a 100644 --- a/sompy/visualization/dotmap.py +++ b/sompy/visualization/dotmap.py @@ -1,6 +1,7 @@ -from .view import MatplotView -from matplotlib import pyplot as plt import numpy as np +from matplotlib import pyplot as plt + +from .view import MatplotView class DotMapView(MatplotView): diff --git a/sompy/visualization/histogram.py b/sompy/visualization/histogram.py index bde155f..d89e8f0 100644 --- a/sompy/visualization/histogram.py +++ b/sompy/visualization/histogram.py @@ -1,8 +1,8 @@ -from .view import MatplotView -from matplotlib import pyplot as plt -from matplotlib import cm -from matplotlib.colors import LogNorm import numpy as np +from matplotlib import cm, pyplot as plt +from matplotlib.colors import LogNorm + +from .view import MatplotView class Hist2d(MatplotView): diff --git a/sompy/visualization/hitmap.py b/sompy/visualization/hitmap.py index 8cad393..52f6675 100644 --- a/sompy/visualization/hitmap.py +++ b/sompy/visualization/hitmap.py @@ -1,10 +1,8 @@ -from .view import MatplotView -from sompy.visualization.plot_tools import plot_hex_map -from matplotlib import pyplot as plt import numpy as np +from matplotlib import pyplot as plt from .mapview import MapView - +from .plot_tools import plot_hex_map class HitMapView(MapView): diff --git a/sompy/visualization/mapview.py b/sompy/visualization/mapview.py index d077536..4290d5b 100644 --- a/sompy/visualization/mapview.py +++ b/sompy/visualization/mapview.py @@ -1,10 +1,9 @@ -from matplotlib import colors import matplotlib +import numpy as np +from matplotlib import pyplot as plt -from sompy.visualization.plot_tools import plot_hex_map +from .plot_tools import plot_hex_map from .view import MatplotView -from matplotlib import pyplot as plt -import numpy as np class MapView(MatplotView): @@ -188,5 +187,3 @@ def show(self, som, what='codebook', which_dim='all', cmap=None, plt.plot(mp, '-k', linewidth=0.8) #plt.show() - - diff --git a/sompy/visualization/umatrix.py b/sompy/visualization/umatrix.py index 76198c9..6a97631 100644 --- a/sompy/visualization/umatrix.py +++ b/sompy/visualization/umatrix.py @@ -1,9 +1,11 @@ -from .view import MatplotView -from matplotlib import pyplot as plt -from pylab import imshow, contour from math import sqrt + import numpy as np +import pylab import scipy +from matplotlib import pyplot as plt + +from .view import MatplotView class UMatrixView(MatplotView): @@ -36,7 +38,7 @@ def show(self, som, distance2=1, row_normalized=False, show_data=True, coord = som.bmu_ind_to_xy(proj) self._fig, ax = plt.subplots(1, 1) - imshow(umat, cmap=plt.cm.get_cmap('RdYlBu_r'), alpha=1) + pylab.imshow(umat, cmap=plt.cm.get_cmap('RdYlBu_r'), alpha=1) if contooor: mn = np.min(umat.flatten()) @@ -44,8 +46,8 @@ def show(self, som, distance2=1, row_normalized=False, show_data=True, std = np.std(umat.flatten()) md = np.median(umat.flatten()) mx = md + 0 * std - contour(umat, np.linspace(mn, mx, 15), linewidths=0.7, - cmap=plt.cm.get_cmap('Blues')) + pylab.contour(umat, np.linspace(mn, mx, 15), linewidths=0.7, + cmap=plt.cm.get_cmap('Blues')) if show_data: plt.scatter(coord[:, 1], coord[:, 0], s=2, alpha=1., c='Gray', @@ -76,7 +78,7 @@ def show(self, som, distance2=1, row_normalized=False, show_data=True, # 'Laplacian of Gaussian' blobs = blob_log(image, max_sigma=5, num_sigma=4, threshold=.152) blobs[:, 2] = blobs[:, 2] * sqrt(2) - imshow(umat, cmap=plt.cm.get_cmap('RdYlBu_r'), alpha=1) + pylab.imshow(umat, cmap=plt.cm.get_cmap('RdYlBu_r'), alpha=1) sel_points = list() for blob in blobs: