summaryrefslogtreecommitdiff
path: root/numpy/core/info.py
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-09-28 09:56:41 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-09-28 09:56:41 +0000
commit7906451af30f3c29250937863b22199cf9f42dfd (patch)
tree53463f5e33fb7b7c87b7f6b892c4c280fe36d181 /numpy/core/info.py
parent483ce064ed954b8b9235f69f06bbbcff35d5fe4d (diff)
downloadnumpy-7906451af30f3c29250937863b22199cf9f42dfd.tar.gz
Fix the fromfunction routine to use float as default. Update oldnumeric and numarray compatibility modules.
Diffstat (limited to 'numpy/core/info.py')
-rw-r--r--numpy/core/info.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/numpy/core/info.py b/numpy/core/info.py
index 8947fea6f..561e171b0 100644
--- a/numpy/core/info.py
+++ b/numpy/core/info.py
@@ -16,7 +16,7 @@ Functions
- reshape - Return array with new shape
- repeat - Repeat elements of array
- choose - Construct new array from indexed array tuple
-- cross_correlate - Correlate two 1-d arrays
+- correlate - Correlate two 1-d arrays
- searchsorted - Search for element in 1-d array
- sum - Total sum over a specified dimension
- average - Average, possibly weighted, over axis or array.
@@ -29,9 +29,8 @@ Functions
More Functions:
-- arrayrange (arange) - Return regularly spaced array
+- arange - Return regularly spaced array
- asarray - Guarantee NumPy array
-- sarray - Guarantee a NumPy array that keeps precision
- convolve - Convolve two 1-d arrays
- swapaxes - Exchange axes
- concatenate - Join arrays together
@@ -40,9 +39,9 @@ More Functions:
- argsort - Indices of sorted array
- argmax - Index of largest value
- argmin - Index of smallest value
-- innerproduct - Innerproduct of two arrays
+- inner - Innerproduct of two arrays
- dot - Dot product (matrix multiplication)
-- outerproduct - Outerproduct of two arrays
+- outer - Outerproduct of two arrays
- resize - Return array with arbitrary new shape
- indices - Tuple of indices
- fromfunction - Construct array from universal function