[Scipy-svn] r2304 - trunk/Lib/sandbox/models

[scipy-svn at scipy.org]

Author: matthew.brett at gmail.com
Date: 2006-11-06 19:03:56 -0600 (Mon, 06 Nov 2006)
New Revision: 2304

Added:
   trunk/Lib/sandbox/models/info.py
Modified:
   trunk/Lib/sandbox/models/model.py
   trunk/Lib/sandbox/models/utils.py
Log:
Tiny cleanups, addition of skeleton info.py

Added: trunk/Lib/sandbox/models/info.py
===================================================================
--- trunk/Lib/sandbox/models/info.py	2006-11-06 20:50:54 UTC (rev 2303)
+++ trunk/Lib/sandbox/models/info.py	2006-11-07 01:03:56 UTC (rev 2304)
@@ -0,0 +1,14 @@
+"""
+Statistical models
+==================
+
+
+"""
+
+depends = ['weave',
+           'special.orthogonal',
+           'integrate',
+           'optimize',
+           'linalg']
+
+postpone_import = True

Modified: trunk/Lib/sandbox/models/model.py
===================================================================
--- trunk/Lib/sandbox/models/model.py	2006-11-06 20:50:54 UTC (rev 2303)
+++ trunk/Lib/sandbox/models/model.py	2006-11-07 01:03:56 UTC (rev 2304)
@@ -6,7 +6,6 @@
 from contrast import ContrastResults
 
 class Model:
-
     """
     A (predictive) statistical model. The class Model itself does nothing
     but lays out the methods expected of any subclass.

Modified: trunk/Lib/sandbox/models/utils.py
===================================================================
--- trunk/Lib/sandbox/models/utils.py	2006-11-06 20:50:54 UTC (rev 2303)
+++ trunk/Lib/sandbox/models/utils.py	2006-11-07 01:03:56 UTC (rev 2304)
@@ -1,6 +1,5 @@
 import numpy as N
 import numpy.linalg as L
-import scipy
 import scipy.interpolate
 import scipy.linalg
 
@@ -23,7 +22,7 @@
 
     _shape = a.shape
     a.shape = N.product(a.shape,axis=0)
-    m = scipy.median(N.fabs(a - scipy.median(a))) / c
+    m = N.median(N.fabs(a - N.median(a))) / c
     a.shape = _shape
     return m