Skip to content

Commit

Permalink
BUG: Backport fixes for ticket numpy#1579, r8615-r8617.
Browse files Browse the repository at this point in the history
  • Loading branch information
@charris
charris committed Aug 10, 2010
1 parent 1d6e5f9 commit 3367031
Show file tree
Hide file tree
Showing 2 changed files with 139 additions and 109 deletions.
157 changes: 88 additions & 69 deletions numpy/lib/tests/test_twodim_base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,75 +232,94 @@ def test_dtype(self):
assert_array_equal(tri(3,dtype=bool),out.astype(bool))


def test_mask_indices():
# simple test without offset
iu = mask_indices(3, np.triu)
a = np.arange(9).reshape(3, 3)
yield (assert_array_equal, a[iu], array([0, 1, 2, 4, 5, 8]))
# Now with an offset
iu1 = mask_indices(3, np.triu, 1)
yield (assert_array_equal, a[iu1], array([1, 2, 5]))


def test_tril_indices():
# indices without and with offset
il1 = tril_indices(4)
il2 = tril_indices(4, 2)

a = np.array([[1, 2, 3, 4],
[5, 6, 7, 8],
[9, 10, 11, 12],
[13, 14, 15, 16]])

# indexing:
yield (assert_array_equal, a[il1],
array([ 1, 5, 6, 9, 10, 11, 13, 14, 15, 16]) )

# And for assigning values:
a[il1] = -1
yield (assert_array_equal, a,
array([[-1, 2, 3, 4],
[-1, -1, 7, 8],
[-1, -1, -1, 12],
[-1, -1, -1, -1]]) )

# These cover almost the whole array (two diagonals right of the main one):
a[il2] = -10
yield (assert_array_equal, a,
array([[-10, -10, -10, 4],
[-10, -10, -10, -10],
[-10, -10, -10, -10],
[-10, -10, -10, -10]]) )


def test_triu_indices():
iu1 = triu_indices(4)
iu2 = triu_indices(4, 2)

a = np.array([[1, 2, 3, 4],
[5, 6, 7, 8],
[9, 10, 11, 12],
[13, 14, 15, 16]])

# Both for indexing:
yield (assert_array_equal, a[iu1],
array([1, 2, 3, 4, 6, 7, 8, 11, 12, 16]))

# And for assigning values:
a[iu1] = -1
yield (assert_array_equal, a,
array([[-1, -1, -1, -1],
[ 5, -1, -1, -1],
[ 9, 10, -1, -1],
[13, 14, 15, -1]]) )

# These cover almost the whole array (two diagonals right of the main one):
a[iu2] = -10
yield ( assert_array_equal, a,
array([[ -1, -1, -10, -10],
[ 5, -1, -1, -10],
[ 9, 10, -1, -1],
[ 13, 14, 15, -1]]) )
class TestMaskIndices(TestCase):
def test_mask_indices(self):
# simple test without offset
iu = mask_indices(3, np.triu)
a = np.arange(9).reshape(3, 3)
yield (assert_array_equal, a[iu], array([0, 1, 2, 4, 5, 8]))
# Now with an offset
iu1 = mask_indices(3, np.triu, 1)
yield (assert_array_equal, a[iu1], array([1, 2, 5]))


class TestTrilIndices(TestCase):
def test_tril_indices(self):
# indices without and with offset
il1 = tril_indices(4)
il2 = tril_indices(4, 2)

a = np.array([[1, 2, 3, 4],
[5, 6, 7, 8],
[9, 10, 11, 12],
[13, 14, 15, 16]])

# indexing:
yield (assert_array_equal, a[il1],
array([ 1, 5, 6, 9, 10, 11, 13, 14, 15, 16]) )

# And for assigning values:
a[il1] = -1
yield (assert_array_equal, a,
array([[-1, 2, 3, 4],
[-1, -1, 7, 8],
[-1, -1, -1, 12],
[-1, -1, -1, -1]]) )

# These cover almost the whole array (two diagonals right of the main one):
a[il2] = -10
yield (assert_array_equal, a,
array([[-10, -10, -10, 4],
[-10, -10, -10, -10],
[-10, -10, -10, -10],
[-10, -10, -10, -10]]) )


class TestTrilIndicesFrom(TestCase):

def test_exceptions(self):
yield assert_raises(ValueError, tril_indices_from, np.ones((2,)))
yield assert_raises(ValueError, tril_indices_from, np.ones((2,2,2)))
yield assert_raises(ValueError, tril_indices_from, np.ones((2,3)))


class TestTriuIndices(TestCase):
def test_triu_indices(self):
iu1 = triu_indices(4)
iu2 = triu_indices(4, 2)

a = np.array([[1, 2, 3, 4],
[5, 6, 7, 8],
[9, 10, 11, 12],
[13, 14, 15, 16]])

# Both for indexing:
yield (assert_array_equal, a[iu1],
array([1, 2, 3, 4, 6, 7, 8, 11, 12, 16]))

# And for assigning values:
a[iu1] = -1
yield (assert_array_equal, a,
array([[-1, -1, -1, -1],
[ 5, -1, -1, -1],
[ 9, 10, -1, -1],
[13, 14, 15, -1]]) )

# These cover almost the whole array (two diagonals right of the main one):
a[iu2] = -10
yield ( assert_array_equal, a,
array([[ -1, -1, -10, -10],
[ 5, -1, -1, -10],
[ 9, 10, -1, -1],
[ 13, 14, 15, -1]]) )


class TestTriuIndicesFrom(TestCase):

def test_exceptions(self):
yield assert_raises(ValueError, triu_indices_from, np.ones((2,)))
yield assert_raises(ValueError, triu_indices_from, np.ones((2,2,2)))
yield assert_raises(ValueError, triu_indices_from, np.ones((2,3)))


if __name__ == "__main__":
Expand Down
91 changes: 51 additions & 40 deletions numpy/lib/twodim_base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def fliplr(m):
"""
m = asanyarray(m)
if m.ndim < 2:
raise ValueError, "Input must be >= 2-d."
raise ValueError("Input must be >= 2-d.")
return m[:, ::-1]

def flipud(m):
Expand Down Expand Up @@ -111,7 +111,7 @@ def flipud(m):
"""
m = asanyarray(m)
if m.ndim < 1:
raise ValueError, "Input must be >= 1-d."
raise ValueError("Input must be >= 1-d.")
return m[::-1,...]

def rot90(m, k=1):
Expand Down Expand Up @@ -154,12 +154,17 @@ def rot90(m, k=1):
"""
m = asanyarray(m)
if m.ndim < 2:
raise ValueError, "Input must >= 2-d."
raise ValueError("Input must >= 2-d.")
k = k % 4
if k == 0: return m
elif k == 1: return fliplr(m).swapaxes(0,1)
elif k == 2: return fliplr(flipud(m))
else: return fliplr(m.swapaxes(0,1)) # k==3
if k == 0:
return m
elif k == 1:
return fliplr(m).swapaxes(0,1)
elif k == 2:
return fliplr(flipud(m))
else:
# k == 3
return fliplr(m.swapaxes(0,1))

def eye(N, M=None, k=0, dtype=float):
"""
Expand Down Expand Up @@ -284,9 +289,9 @@ def diag(v, k=0):
i = (-k) * s[1]
return v[:s[1]-k].flat[i::s[1]+1]
else:
raise ValueError, "Input must be 1- or 2-d."
raise ValueError("Input must be 1- or 2-d.")

def diagflat(v,k=0):
def diagflat(v, k=0):
"""
Create a two-dimensional array with the flattened input as a diagonal.
Expand Down Expand Up @@ -333,7 +338,7 @@ def diagflat(v,k=0):
s = len(v)
n = s + abs(k)
res = zeros((n,n), v.dtype)
if (k>=0):
if (k >= 0):
i = arange(0,n-k)
fi = i+k+i*n
else:
Expand Down Expand Up @@ -381,7 +386,8 @@ def tri(N, M=None, k=0, dtype=float):
[ 1., 1., 0., 0., 0.]])
"""
if M is None: M = N
if M is None:
M = N
m = greater_equal(subtract.outer(arange(N), arange(M)),-k)
return m.astype(dtype)

Expand Down Expand Up @@ -444,7 +450,7 @@ def triu(m, k=0):
"""
m = asanyarray(m)
out = multiply((1-tri(m.shape[0], m.shape[1], k-1, int)),m)
out = multiply((1 - tri(m.shape[0], m.shape[1], k - 1, int)), m)
return out

# borrowed from John Hunter and matplotlib
Expand Down Expand Up @@ -505,14 +511,15 @@ def vander(x, N=None):
"""
x = asarray(x)
if N is None: N=len(x)
if N is None:
N=len(x)
X = ones( (len(x),N), x.dtype)
for i in range(N-1):
X[:,i] = x**(N-i-1)
for i in range(N - 1):
X[:,i] = x**(N - i - 1)
return X


def histogram2d(x,y, bins=10, range=None, normed=False, weights=None):
def histogram2d(x, y, bins=10, range=None, normed=False, weights=None):
"""
Compute the bi-dimensional histogram of two data samples.
Expand Down Expand Up @@ -608,8 +615,8 @@ def histogram2d(x,y, bins=10, range=None, normed=False, weights=None):
hist, edges = histogramdd([x,y], bins, range, normed, weights)
return hist, edges[0], edges[1]

def mask_indices(n,mask_func,k=0):

def mask_indices(n, mask_func, k=0):
"""
Return the indices to access (n, n) arrays, given a masking function.
Expand Down Expand Up @@ -674,21 +681,22 @@ def mask_indices(n,mask_func,k=0):
array([1, 2, 5])
"""
m = ones((n,n),int)
a = mask_func(m,k)
m = ones((n,n), int)
a = mask_func(m, k)
return where(a != 0)


def tril_indices(n,k=0):
def tril_indices(n, k=0):
"""
Return the indices for the lower-triangle of an (n, n) array.
Parameters
----------
n : int
Sets the size of the arrays for which the returned indices will be valid.
The row dimension of the square arrays for which the returned
indices will be valid.
k : int, optional
Diagonal offset (see `tril` for details).
Diagonal offset (see `tril` for details).
Returns
-------
Expand Down Expand Up @@ -748,21 +756,22 @@ def tril_indices(n,k=0):
[-10, -10, -10, -10]])
"""
return mask_indices(n,tril,k)
return mask_indices(n, tril, k)


def tril_indices_from(arr,k=0):
def tril_indices_from(arr, k=0):
"""
Return the indices for the lower-triangle of an (n, n) array.
Return the indices for the lower-triangle of arr.
See `tril_indices` for full details.
Parameters
----------
n : int
Sets the size of the arrays for which the returned indices will be valid.
arr : array_like
The indices will be valid for square arrays whose dimensions are
the same as arr.
k : int, optional
Diagonal offset (see `tril` for details).
Diagonal offset (see `tril` for details).
See Also
--------
Expand All @@ -773,21 +782,22 @@ def tril_indices_from(arr,k=0):
.. versionadded:: 1.4.0
"""
if not arr.ndim==2 and arr.shape[0] == arr.shape[1]:
if not (arr.ndim == 2 and arr.shape[0] == arr.shape[1]):
raise ValueError("input array must be 2-d and square")
return tril_indices(arr.shape[0],k)
return tril_indices(arr.shape[0], k)



def triu_indices(n,k=0):
def triu_indices(n, k=0):
"""
Return the indices for the upper-triangle of an (n, n) array.
Parameters
----------
n : int
Sets the size of the arrays for which the returned indices will be valid.
The size of the arrays for which the returned indices will
be valid.
k : int, optional
Diagonal offset (see `triu` for details).
Diagonal offset (see `triu` for details).
Returns
-------
Expand Down Expand Up @@ -848,19 +858,20 @@ def triu_indices(n,k=0):
[ 12, 13, 14, -1]])
"""
return mask_indices(n,triu,k)
return mask_indices(n, triu, k)


def triu_indices_from(arr,k=0):
def triu_indices_from(arr, k=0):
"""
Return the indices for the upper-triangle of an (n, n) array.
See `triu_indices` for full details.
Parameters
----------
n : int
Sets the size of the arrays for which the returned indices will be valid.
arr : array_like
The indices will be valid for square arrays whose dimensions are
the same as arr.
k : int, optional
Diagonal offset (see `triu` for details).
Expand All @@ -873,7 +884,7 @@ def triu_indices_from(arr,k=0):
.. versionadded:: 1.4.0
"""
if not arr.ndim==2 and arr.shape[0] == arr.shape[1]:
if not (arr.ndim == 2 and arr.shape[0] == arr.shape[1]):
raise ValueError("input array must be 2-d and square")
return triu_indices(arr.shape[0],k)

0 comments on commit 3367031

Please sign in to comment.