[Numpy-svn] r8450 - trunk/numpy/core

[numpy-svn at scipy.org]

Author: rgommers
Date: 2010-06-02 08:07:10 -0500 (Wed, 02 Jun 2010)
New Revision: 8450

Modified:
   trunk/numpy/core/fromnumeric.py
   trunk/numpy/core/memmap.py
   trunk/numpy/core/numeric.py
   trunk/numpy/core/records.py
Log:
DOC: merge wiki edits for module core.

Modified: trunk/numpy/core/fromnumeric.py
===================================================================
--- trunk/numpy/core/fromnumeric.py	2010-06-01 13:28:52 UTC (rev 8449)
+++ trunk/numpy/core/fromnumeric.py	2010-06-02 13:07:10 UTC (rev 8450)
@@ -2371,7 +2371,7 @@
     The standard deviation is the square root of the average of the squared
     deviations from the mean, i.e., ``std = sqrt(mean(abs(x - x.mean())**2))``.
 
-    The mean is normally calculated as ``x.sum() / N``, where
+    The average squared deviation is normally calculated as ``x.sum() / N``, where
     ``N = len(x)``.  If, however, `ddof` is specified, the divisor ``N - ddof``
     is used instead. In standard statistical practice, ``ddof=1`` provides an
     unbiased estimator of the variance of the infinite population. ``ddof=0``

Modified: trunk/numpy/core/memmap.py
===================================================================
--- trunk/numpy/core/memmap.py	2010-06-01 13:28:52 UTC (rev 8449)
+++ trunk/numpy/core/memmap.py	2010-06-02 13:07:10 UTC (rev 8450)
@@ -61,6 +61,16 @@
         Fortran (column-major).  This only has an effect if the shape is
         greater than 1-D.  The default order is 'C'.
 
+    Attributes
+    ----------
+    filename : str
+        Path to the mapped file.
+    offset : int
+        Offset position in the file.
+    mode : str
+        File mode.
+
+
     Methods
     -------
     close

Modified: trunk/numpy/core/numeric.py
===================================================================
--- trunk/numpy/core/numeric.py	2010-06-01 13:28:52 UTC (rev 8449)
+++ trunk/numpy/core/numeric.py	2010-06-02 13:07:10 UTC (rev 8450)
@@ -35,10 +35,10 @@
 
 class ComplexWarning(RuntimeWarning):
     """
-    Warning that is raised when casting complex numbers to real.
+    The warning raised when casting a complex dtype to a real dtype.
 
-    Casting a complex number to real discards its imaginary part, and
-    this behavior may not be what is intended in all cases.
+    As implemented, casting a complex number to a real discards its imaginary
+    part, but this behavior may not be what the user actually wants.
 
     """
     pass
@@ -743,15 +743,15 @@
 
     See Also
     --------
-    scipy.signal.fftconv : Convolve two arrays using the Fast Fourier
-                           Transform.
+    scipy.signal.fftconvolve : Convolve two arrays using the Fast Fourier
+                               Transform.
     scipy.linalg.toeplitz : Used to construct the convolution operator.
 
     Notes
     -----
     The discrete convolution operation is defined as
 
-    .. math:: (f * g)[n] = \\sum_{m = -\\infty}^{\\infty} f[m] f[n - m]
+    .. math:: (f * g)[n] = \\sum_{m = -\\infty}^{\\infty} f[m] g[n - m]
 
     It can be shown that a convolution :math:`x(t) * y(t)` in time/space
     is equivalent to the multiplication :math:`X(f) Y(f)` in the Fourier

Modified: trunk/numpy/core/records.py
===================================================================
--- trunk/numpy/core/records.py	2010-06-01 13:28:52 UTC (rev 8449)
+++ trunk/numpy/core/records.py	2010-06-02 13:07:10 UTC (rev 8450)
@@ -285,7 +285,7 @@
     """
     Construct an ndarray that allows field access using attributes.
 
-    Arrays may have a data-types containing fields, analagous
+    Arrays may have a data-types containing fields, analogous
     to columns in a spread sheet.  An example is ``[(x, int), (y, float)]``,
     where each entry in the array is a pair of ``(int, float)``.  Normally,
     these attributes are accessed using dictionary lookups such as ``arr['x']``
@@ -346,7 +346,7 @@
     Notes
     -----
     This constructor can be compared to ``empty``: it creates a new record
-    array but does not fill it with data.  To create a reccord array from data,
+    array but does not fill it with data.  To create a record array from data,
     use one of the following methods:
 
     1. Create a standard ndarray and convert it to a record array,