diff options
author | Jarrod Millman <millman@berkeley.edu> | 2007-10-29 14:58:18 +0000 |
---|---|---|
committer | Jarrod Millman <millman@berkeley.edu> | 2007-10-29 14:58:18 +0000 |
commit | 0b77f0e5f0e46b2ef7c570ebda046c34bbcc0f26 (patch) | |
tree | c7609a2a685fd5bff235d812b8c5705621216f4c /numpy/lib | |
parent | aa3c27cce3d0625f719b812c9e6b0aa73114c612 (diff) | |
download | numpy-0b77f0e5f0e46b2ef7c570ebda046c34bbcc0f26.tar.gz |
ran reindent.py to clean up whitespace
Diffstat (limited to 'numpy/lib')
-rw-r--r-- | numpy/lib/function_base.py | 2 | ||||
-rw-r--r-- | numpy/lib/index_tricks.py | 4 | ||||
-rw-r--r-- | numpy/lib/shape_base.py | 2 | ||||
-rw-r--r-- | numpy/lib/tests/test_shape_base.py | 1 | ||||
-rw-r--r-- | numpy/lib/twodim_base.py | 16 | ||||
-rw-r--r-- | numpy/lib/type_check.py | 2 | ||||
-rw-r--r-- | numpy/lib/utils.py | 6 |
7 files changed, 16 insertions, 17 deletions
diff --git a/numpy/lib/function_base.py b/numpy/lib/function_base.py index 2d7bc6189..0463c48f5 100644 --- a/numpy/lib/function_base.py +++ b/numpy/lib/function_base.py @@ -1,7 +1,7 @@ __docformat__ = "restructuredtext en" __all__ = ['logspace', 'linspace', 'select', 'piecewise', 'trim_zeros', - 'copy', 'iterable', + 'copy', 'iterable', 'diff', 'gradient', 'angle', 'unwrap', 'sort_complex', 'disp', 'unique', 'extract', 'place', 'nansum', 'nanmax', 'nanargmax', 'nanargmin', 'nanmin', 'vectorize', 'asarray_chkfinite', 'average', diff --git a/numpy/lib/index_tricks.py b/numpy/lib/index_tricks.py index 8e6f36e30..26a44976c 100644 --- a/numpy/lib/index_tricks.py +++ b/numpy/lib/index_tricks.py @@ -125,7 +125,7 @@ class nd_grid(object): [2], [3], [4]]), array([[0, 1, 2, 3, 4]])] - + """ def __init__(self, sparse=False): self.sparse = sparse @@ -319,7 +319,7 @@ class r_class(concatenator): For example: >>> r_[array([1,2,3]), 0, 0, array([4,5,6])] array([1, 2, 3, 0, 0, 4, 5, 6]) - + """ def __init__(self): concatenator.__init__(self, 0) diff --git a/numpy/lib/shape_base.py b/numpy/lib/shape_base.py index 95b2bf2ce..9ac77666f 100644 --- a/numpy/lib/shape_base.py +++ b/numpy/lib/shape_base.py @@ -299,7 +299,7 @@ def dstack(tup): [[2, 3]], <BLANKLINE> [[3, 4]]]) - + """ return _nx.concatenate(map(atleast_3d,tup),2) diff --git a/numpy/lib/tests/test_shape_base.py b/numpy/lib/tests/test_shape_base.py index c819ba366..320871a95 100644 --- a/numpy/lib/tests/test_shape_base.py +++ b/numpy/lib/tests/test_shape_base.py @@ -410,4 +410,3 @@ def compare_results(res,desired): if __name__ == "__main__": NumpyTest().run() - diff --git a/numpy/lib/twodim_base.py b/numpy/lib/twodim_base.py index a067139af..4852097f3 100644 --- a/numpy/lib/twodim_base.py +++ b/numpy/lib/twodim_base.py @@ -143,7 +143,7 @@ def vander(x, N=None): X[:,i] = x**(N-i-1) return X - + def histogram2d(x,y, bins=10, range=None, normed=False, weights=None): """histogram2d(x,y, bins=10, range=None, normed=False) -> H, xedges, yedges @@ -151,27 +151,27 @@ def histogram2d(x,y, bins=10, range=None, normed=False, weights=None): :Parameters: - `x,y` : Sample arrays (1D). - - `bins` : Number of bins -or- [nbin x, nbin y] -or- + - `bins` : Number of bins -or- [nbin x, nbin y] -or- [bin edges] -or- [x bin edges, y bin edges]. - `range` : A sequence of lower and upper bin edges (default: [min, max]). - `normed` : Boolean, if False, return the number of samples in each bin, if True, returns the density. - - `weights` : An array of weights. The weights are normed only if normed + - `weights` : An array of weights. The weights are normed only if normed is True. Should weights.sum() not equal N, the total bin count \ will not be equal to the number of samples. - + :Return: - `hist` : Histogram array. - - `xedges, yedges` : Arrays defining the bin edges. - + - `xedges, yedges` : Arrays defining the bin edges. + Example: >>> x = random.randn(100,2) >>> hist2d, xedges, yedges = histogram2d(x, bins = (6, 7)) - + :SeeAlso: histogramdd """ from numpy import histogramdd - + try: N = len(bins) except TypeError: diff --git a/numpy/lib/type_check.py b/numpy/lib/type_check.py index 60c84e335..20817ab01 100644 --- a/numpy/lib/type_check.py +++ b/numpy/lib/type_check.py @@ -7,7 +7,7 @@ __all__ = ['iscomplexobj','isrealobj','imag','iscomplex', import numpy.core.numeric as _nx from numpy.core.numeric import asarray, asanyarray, array, isnan, \ - obj2sctype, zeros + obj2sctype, zeros from ufunclike import isneginf, isposinf _typecodes_by_elsize = 'GDFgdfQqLlIiHhBb?' diff --git a/numpy/lib/utils.py b/numpy/lib/utils.py index fa69e6718..386506bd6 100644 --- a/numpy/lib/utils.py +++ b/numpy/lib/utils.py @@ -118,7 +118,7 @@ def byte_bounds(a): high is just *past* the last byte If the array is not single-segment, then it may not actually - use every byte between these bounds. + use every byte between these bounds. The array provided must conform to the Python-side of the array interface """ @@ -140,7 +140,7 @@ def byte_bounds(a): a_high += (shape-1)*stride a_high += bytes_a return a_low, a_high - + def may_share_memory(a, b): """Determine if two arrays can share memory @@ -275,7 +275,7 @@ def info(object=None,maxwidth=76,output=sys.stdout,toplevel='numpy'): Example: >>> from numpy import * >>> info(polyval) # doctest: +SKIP - + polyval(p, x) Evaluate the polymnomial p at x. |