[Scipy-svn] r4752 - trunk/scipy/stats

[scipy-svn at scipy.org]

Author: oliphant
Date: 2008-09-26 07:53:59 -0500 (Fri, 26 Sep 2008)
New Revision: 4752

Modified:
   trunk/scipy/stats/distributions.py
Log:
Fix distributions to return numpy scalars instead of 0-d arrays.

Modified: trunk/scipy/stats/distributions.py
===================================================================
--- trunk/scipy/stats/distributions.py	2008-09-26 04:25:25 UTC (rev 4751)
+++ trunk/scipy/stats/distributions.py	2008-09-26 12:53:59 UTC (rev 4752)
@@ -478,6 +478,8 @@
         goodargs = argsreduce(cond, *((x,)+args+(scale,)))
         scale, goodargs = goodargs[-1], goodargs[:-1]
         place(output,cond,self._pdf(*goodargs) / scale)
+        if output.ndim == 0:
+            return output[()]
         return output
 
     def cdf(self,x,*args,**kwds):
@@ -507,6 +509,8 @@
         place(output,cond2,1.0)
         goodargs = argsreduce(cond, *((x,)+args))
         place(output,cond,self._cdf(*goodargs))
+        if output.ndim == 0:
+            return output[()]
         return output
 
     def sf(self,x,*args,**kwds):
@@ -536,6 +540,8 @@
         place(output,cond2,1.0)
         goodargs = argsreduce(cond, *((x,)+args))
         place(output,cond,self._sf(*goodargs))
+        if output.ndim == 0:
+            return output[()]        
         return output
 
     def ppf(self,q,*args,**kwds):
@@ -565,6 +571,8 @@
         goodargs = argsreduce(cond, *((q,)+args+(scale,loc)))
         scale, loc, goodargs = goodargs[-2], goodargs[-1], goodargs[:-2]
         place(output,cond,self._ppf(*goodargs)*scale + loc)
+        if output.ndim == 0:
+            return output[()]        
         return output
 
     def isf(self,q,*args,**kwds):
@@ -594,6 +602,8 @@
         goodargs = argsreduce(cond, *((1.0-q,)+args+(scale,loc)))
         scale, loc, goodargs = goodargs[-2], goodargs[-1], goodargs[:-2]
         place(output,cond,self._ppf(*goodargs)*scale + loc)
+        if output.ndim == 0:
+            return output[()]
         return output
 
     def stats(self,*args,**kwds):
@@ -3536,6 +3546,8 @@
         place(output,(1-cond0)*(cond1==cond1),self.badvalue)
         goodargs = argsreduce(cond, *((k,)+args))
         place(output,cond,self._pmf(*goodargs))
+        if output.ndim == 0:
+            return output[()]        
         return output
 
     def cdf(self, k, *args, **kwds):
@@ -3564,6 +3576,8 @@
         place(output,cond2*(cond0==cond0), 1.0)
         goodargs = argsreduce(cond, *((k,)+args))
         place(output,cond,self._cdf(*goodargs))
+        if output.ndim == 0:
+            return output[()]        
         return output
 
     def sf(self,k,*args,**kwds):
@@ -3592,6 +3606,8 @@
         place(output,cond2,1.0)
         goodargs = argsreduce(cond, *((k,)+args))
         place(output,cond,self._sf(*goodargs))
+        if output.ndim == 0:
+            return output[()]        
         return output
 
     def ppf(self,q,*args,**kwds):
@@ -3620,6 +3636,8 @@
         goodargs = argsreduce(cond, *((q,)+args+(loc,)))
         loc, goodargs = goodargs[-1], goodargs[:-1]
         place(output,cond,self._ppf(*goodargs) + loc)
+        if output.ndim == 0:
+            return output[()]        
         return output
 
     def isf(self,q,*args,**kwds):
@@ -3649,6 +3667,8 @@
         goodargs = argsreduce(cond, *((q,)+args+(loc,)))
         loc, goodargs = goodargs[-1], goodargs[:-1]
         place(output,cond,self._ppf(*goodargs) + loc)
+        if output.ndim == 0:
+            return output[()]        
         return output
 
     def stats(self, *args, **kwds):