Make numpy and mpl imports consistent across files

Author: marcharper

ternary/heatmapping.py

@@ -3,8 +3,8 @@
 """
 
 import functools
-import numpy
-from matplotlib import pyplot
+import numpy as np
+from matplotlib import pyplot as plt
 
 from .helpers import unzip, normalize, simplex_iterator, permute_point, project_point
 from .colormapping import get_cmap, colormapper, colorbar_hack
@@ -85,13 +85,13 @@ def generate_hexagon_deltas():
     hexagon points for the hexagonal heatmap.
     """
 
-    zero = numpy.array([0, 0, 0])
-    alpha = numpy.array([-1./3, 2./3, 0])
-    deltaup = numpy.array([1./3, 1./3, 0])
-    deltadown = numpy.array([2./3, -1./3, 0])
-    i_vec = numpy.array([0, 1./2, -1./2])
-    i_vec_down = numpy.array([1./2, -1./2, 0])
-    deltaX_vec = numpy.array([1./2, 0, -1./2])
+    zero = np.array([0, 0, 0])
+    alpha = np.array([-1./3, 2./3, 0])
+    deltaup = np.array([1./3, 1./3, 0])
+    deltadown = np.array([2./3, -1./3, 0])
+    i_vec = np.array([0, 1./2, -1./2])
+    i_vec_down = np.array([1./2, -1./2, 0])
+    deltaX_vec = np.array([1./2, 0, -1./2])
 
     d = dict()
     # Corner Points
@@ -131,8 +131,8 @@ def hexagon_coordinates(i, j, k):
         else:
             signature += "1"
     deltas = hexagon_deltas[signature]
-    center = numpy.array([i, j, k])
-    return numpy.array([center + x for x in deltas])
+    center = np.array([i, j, k])
+    return np.array([center + x for x in deltas])
 
 
 ## Heatmaps ##
@@ -228,12 +228,12 @@ def heatmap(data, scale, vmin=None, vmax=None, cmap=None, ax=None,
     """
 
     if not ax:
-        fig, ax = pyplot.subplots()
+        fig, ax = plt.subplots()
     # If use_rgba, make the RGBA values numpy arrays so that they can
     # be averaged.
     if use_rgba:
         for k, v in data.items():
-            data[k] = numpy.array(v)
+            data[k] = np.array(v)
     else:
         cmap = get_cmap(cmap)
         if vmin is None:
@@ -395,7 +395,7 @@ def svg_heatmap(data, scale, filename, vmax=None, vmin=None, style='h',
     if vmax is None:
         vmax = max(data.values())
 
-    height = scale * numpy.sqrt(3) / 2 + 2
+    height = scale * np.sqrt(3) / 2 + 2
 
     output_file = open(filename, 'w')
     output_file.write('<svg height="%s" width="%s">\n' % (height, scale))

ternary/helpers.py

@@ -2,12 +2,12 @@
 Helper functions and utilities for projecting to the simplex and various tasks.
 """
 
-import numpy
+import numpy as np
 
 
 ### Constants ###
 
-SQRT3 = numpy.sqrt(3)
+SQRT3 = np.sqrt(3)
 SQRT3OVER2 = SQRT3 / 2.
 
 ### Auxilliary Functions ###
@@ -100,7 +100,7 @@ def project_point(p, permutation=None):
     b = permuted[1]
     x = a + b/2.
     y = SQRT3OVER2 * b
-    return numpy.array([x, y])
+    return np.array([x, y])
 
 
 def planar_to_coordinates(p, scale):
@@ -121,7 +121,7 @@ def planar_to_coordinates(p, scale):
     y = p[1] / SQRT3OVER2
     x = p[0] - y / 2.
     z = scale - x - y
-    return numpy.array([x, y, z])
+    return np.array([x, y, z])
 
 
 def project_sequence(s, permutation=None):

ternary/plotting.py

@@ -3,7 +3,7 @@
 """
 
 import matplotlib
-from matplotlib import pyplot
+from matplotlib import pyplot as plt
 import numpy as np
 
 from .helpers import project_sequence
@@ -66,7 +66,7 @@ def plot(points, ax=None, permutation=None, **kwargs):
         Any kwargs to pass through to matplotlib.
     """
     if not ax:
-        fig, ax = pyplot.subplots()
+        fig, ax = plt.subplots()
     xs, ys = project_sequence(points, permutation=permutation)
     ax.plot(xs, ys, **kwargs)
     return ax
@@ -91,7 +91,7 @@ def plot_colored_trajectory(points, cmap=None, ax=None, permutation=None,
         Any kwargs to pass through to matplotlib.
     """
     if not ax:
-        fig, ax = pyplot.subplots()
+        fig, ax = plt.subplots()
     cmap = get_cmap(cmap)
     xs, ys = project_sequence(points, permutation=permutation)
 
@@ -143,7 +143,7 @@ def scatter(points, ax=None, permutation=None, colorbar=False, colormap=None,
         Any kwargs to pass through to matplotlib.
     """
     if not ax:
-        fig, ax = pyplot.subplots()
+        fig, ax = plt.subplots()
     xs, ys = project_sequence(points, permutation=permutation)
     ax.scatter(xs, ys, vmin=vmin, vmax=vmax, **kwargs)