diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2018-05-15 11:13:46 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-15 11:13:46 -0600 |
commit | 79ec65de3064cbdc687820ab09f20b989028509d (patch) | |
tree | d1db3a47f86b4377738b433fc663a9ceef81597e /numpy/core/numeric.py | |
parent | 9584c2f8ed78194ec18d20aea9616d4a89ee74fa (diff) | |
parent | 8e74c991d1336bd51e71dc492544223055c130f4 (diff) | |
download | numpy-79ec65de3064cbdc687820ab09f20b989028509d.tar.gz |
Merge pull request #11010 from mhvk/poly-matrix-tests-to-matrixlib
Move remaining Matrix tests to matrixlib
Diffstat (limited to 'numpy/core/numeric.py')
-rw-r--r-- | numpy/core/numeric.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py index 1108d4667..cd783d242 100644 --- a/numpy/core/numeric.py +++ b/numpy/core/numeric.py @@ -489,9 +489,9 @@ def asarray(a, dtype=None, order=None): Contrary to `asanyarray`, ndarray subclasses are not passed through: - >>> issubclass(np.matrix, np.ndarray) + >>> issubclass(np.recarray, np.ndarray) True - >>> a = np.matrix([[1, 2]]) + >>> a = np.array([(1.0, 2), (3.0, 4)], dtype='f4,i4').view(np.recarray) >>> np.asarray(a) is a False >>> np.asanyarray(a) is a @@ -545,7 +545,7 @@ def asanyarray(a, dtype=None, order=None): Instances of `ndarray` subclasses are passed through as-is: - >>> a = np.matrix([1, 2]) + >>> a = np.array([(1.0, 2), (3.0, 4)], dtype='f4,i4').view(np.recarray) >>> np.asanyarray(a) is a True @@ -2280,7 +2280,7 @@ def isclose(a, b, rtol=1.e-5, atol=1.e-8, equal_nan=False): relative difference (`rtol` * abs(`b`)) and the absolute difference `atol` are added together to compare against the absolute difference between `a` and `b`. - + .. warning:: The default `atol` is not appropriate for comparing numbers that are much smaller than one (see Notes). |