Navigation

Changeset 1864

Timestamp:

01/10/06 10:07:32 (3 years ago)

Author:

sasha

Message:

allow x... and x[()] for zero rank ndarray x

Files:

r1856	r1864
1797	1797	}
1798	1798	if (self->nd == 0) {
	1799	if (op == Py_Ellipsis \|\|
	1800	PyTuple_Check(op) && 0 == PyTuple_GET_SIZE(op))
	1801	return PyArray_ToScalar(self->data, self);
1799	1802	PyErr_SetString(PyExc_IndexError,
1800	1803	"0-d arrays can't be indexed.");

r1847	r1864
70	70	assert_equal(d2, dtypedescr(float64))
71	71
	72	class test_zero_rank(ScipyTestCase):
	73	def setUp(self):
	74	self.d = array(0), array('x', object)
72	75
73
	76	def check_ellipsis_subscript(self):
	77	a,b = self.d
	78
	79	self.failUnlessEqual(a[...], 0)
	80	self.failUnlessEqual(b[...].item(), 'x')
	81	self.failUnless(type(a[...]) is a.dtype)
	82	self.failUnless(type(b[...]) is b.dtype)
	83
	84	def check_empty_subscript(self):
	85	a,b = self.d
	86
	87	self.failUnlessEqual(a[()], 0)
	88	self.failUnlessEqual(b[()].item(), 'x')
	89	self.failUnless(type(a[()]) is a.dtype)
	90	self.failUnless(type(b[()]) is b.dtype)
	91
	92	def check_invalid_subscript(self):
	93	a,b = self.d
	94	self.failUnlessRaises(IndexError, lambda x: x[0], a)
	95	self.failUnlessRaises(IndexError, lambda x: x[0], b)
	96	self.failUnlessRaises(IndexError, lambda x: x[array([], int)], a)
	97	self.failUnlessRaises(IndexError, lambda x: x[array([], int)], b)
	98
	99	if __name__ == "__main__":
	100	ScipyTest('numpy.core.multiarray').run()