[Scipy-svn] r4369 - in branches/refactor_fft: . scipy/stats

[scipy-svn at scipy.org]

Author: cdavid
Date: 2008-05-16 01:46:53 -0500 (Fri, 16 May 2008)
New Revision: 4369

Modified:
   branches/refactor_fft/
   branches/refactor_fft/scipy/stats/stats.py
Log:
Merged revisions 4327-4368 via svnmerge from 
http://svn.scipy.org/svn/scipy/trunk

........
  r4352 | oliphant | 2008-05-16 01:36:59 +0900 (Fri, 16 May 2008) | 1 line
  
  Fix stats.var for complex variables.
........



Property changes on: branches/refactor_fft
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/build_with_scons:1-3868 /branches/scipy.scons:1-3533 /branches/sparse_build_reduce_mem:1-4005 /branches/testing_cleanup:1-3662 /trunk:1-4326
   + /branches/build_with_scons:1-3868 /branches/scipy.scons:1-3533 /branches/sparse_build_reduce_mem:1-4005 /branches/testing_cleanup:1-3662 /trunk:1-4368

Modified: branches/refactor_fft/scipy/stats/stats.py
===================================================================
--- branches/refactor_fft/scipy/stats/stats.py	2008-05-16 06:28:21 UTC (rev 4368)
+++ branches/refactor_fft/scipy/stats/stats.py	2008-05-16 06:46:53 UTC (rev 4369)
@@ -1191,7 +1191,7 @@
     mn = np.expand_dims(mean(a,axis),axis)
     deviations = a - mn
     n = a.shape[axis]
-    vals = ss(deviations,axis)/(n-1.0)
+    vals = sum(abs(deviations)**2,axis)/(n-1.0)
     if bias:
         return vals * (n-1.0)/n
     else: