[Numpy-svn] r8638 - in trunk: doc/release numpy/lib numpy/polynomial

numpy-svn@scip... numpy-svn@scip...
Sun Aug 15 14:11:00 CDT 2010


Author: charris
Date: 2010-08-15 14:11:00 -0500 (Sun, 15 Aug 2010)
New Revision: 8638

Modified:
   trunk/doc/release/1.5.0-notes.rst
   trunk/numpy/lib/npyio.py
   trunk/numpy/polynomial/chebyshev.py
   trunk/numpy/polynomial/polynomial.py
   trunk/numpy/polynomial/polytemplate.py
Log:
Merge branch 'poly'

Conflicts:
	numpy/polynomial/chebyshev.py
	numpy/polynomial/polynomial.py

Modified: trunk/doc/release/1.5.0-notes.rst
===================================================================
--- trunk/doc/release/1.5.0-notes.rst	2010-08-15 18:16:38 UTC (rev 8637)
+++ trunk/doc/release/1.5.0-notes.rst	2010-08-15 19:11:00 UTC (rev 8638)
@@ -94,6 +94,7 @@
   Polynomial domain can be specified by using [] as the domain value.
 * Weights can be used in both polyfit and Polynomial.fit
 * A linspace method has been added to the Polynomial class to ease plotting.
+* The polymulx function was added.
 
 polynomial.chebyshev
 --------------------
@@ -109,7 +110,9 @@
   Chebyshev domain can be specified by using [] as the domain value.
 * Weights can be used in both chebfit and Chebyshev.fit
 * A linspace method has been added to the Chebyshev class to ease plotting.
+* The chebmulx function was added.
 
+
 histogram
 ---------
 

Modified: trunk/numpy/lib/npyio.py
===================================================================
--- trunk/numpy/lib/npyio.py	2010-08-15 18:16:38 UTC (rev 8637)
+++ trunk/numpy/lib/npyio.py	2010-08-15 19:11:00 UTC (rev 8638)
@@ -722,7 +722,7 @@
     delimiter : str
         Character separating columns.
     newline : str
-        .. versionadded:: 2.0
+        .. versionadded:: 1.5.0
 
         Character separating lines.
 

Modified: trunk/numpy/polynomial/chebyshev.py
===================================================================
--- trunk/numpy/polynomial/chebyshev.py	2010-08-15 18:16:38 UTC (rev 8637)
+++ trunk/numpy/polynomial/chebyshev.py	2010-08-15 19:11:00 UTC (rev 8638)
@@ -647,6 +647,13 @@
     out : ndarray
         Array representing the result of the multiplication.
 
+<<<<<<< HEAD
+=======
+    Notes
+    -----
+    .. versionadded:: 1.5.0
+
+>>>>>>> poly
     """
     # cs is a trimmed copy
     [cs] = pu.as_series([cs])
@@ -978,7 +985,7 @@
 
     """
     cnt = int(m)
-    if np.isscalar(k) :
+    if not np.iterable(k):
         k = [k]
 
     if cnt != m:

Modified: trunk/numpy/polynomial/polynomial.py
===================================================================
--- trunk/numpy/polynomial/polynomial.py	2010-08-15 18:16:38 UTC (rev 8637)
+++ trunk/numpy/polynomial/polynomial.py	2010-08-15 19:11:00 UTC (rev 8638)
@@ -283,6 +283,10 @@
     out : ndarray
         Array representing the result of the multiplication.
 
+    Notes
+    -----
+    .. versionadded:: 1.5.0
+
     """
     # cs is a trimmed copy
     [cs] = pu.as_series([cs])
@@ -544,8 +548,7 @@
     Raises
     ------
     ValueError
-        If ``m < 1``, ``len(k) > m``, ``np.isscalar(lbnd) == False``, or
-        ``np.isscalar(scl) == False``.
+        If ``m < 1``, ``len(k) > m``.
 
     See Also
     --------
@@ -577,7 +580,7 @@
 
     """
     cnt = int(m)
-    if np.isscalar(k) :
+    if not np.iterable(k):
         k = [k]
 
     if cnt != m:

Modified: trunk/numpy/polynomial/polytemplate.py
===================================================================
--- trunk/numpy/polynomial/polytemplate.py	2010-08-15 18:16:38 UTC (rev 8637)
+++ trunk/numpy/polynomial/polytemplate.py	2010-08-15 19:11:00 UTC (rev 8638)
@@ -308,7 +308,7 @@
 
         Notes
         -----
-        .. versionadded:: 2.0.0
+        .. versionadded:: 1.5.0
 
         """
         return len(self) - 1
@@ -335,7 +335,7 @@
 
         Notes
         -----
-        .. versionadded:: 2.0.0
+        .. versionadded:: 1.5.0
 
         """
         return self.truncate(deg + 1)



More information about the Numpy-svn mailing list