[Scipy-svn] r3283 - in trunk/scipy: sandbox stats stats/models stats/models/family stats/models/robust stats/models/tests
scipy-svn at scipy.org
scipy-svn at scipy.org
Wed Aug 29 14:24:15 EDT 2007
Author: jarrod.millman
Date: 2007-08-29 13:24:04 -0500 (Wed, 29 Aug 2007)
New Revision: 3283
Added:
trunk/scipy/stats/models/
Removed:
trunk/scipy/sandbox/models/
Modified:
trunk/scipy/stats/models/__init__.py
trunk/scipy/stats/models/bspline.py
trunk/scipy/stats/models/contrast.py
trunk/scipy/stats/models/cox.py
trunk/scipy/stats/models/family/__init__.py
trunk/scipy/stats/models/family/family.py
trunk/scipy/stats/models/formula.py
trunk/scipy/stats/models/gam.py
trunk/scipy/stats/models/glm.py
trunk/scipy/stats/models/mixed.py
trunk/scipy/stats/models/model.py
trunk/scipy/stats/models/regression.py
trunk/scipy/stats/models/rlm.py
trunk/scipy/stats/models/robust/__init__.py
trunk/scipy/stats/models/setup.py
trunk/scipy/stats/models/smoothers.py
trunk/scipy/stats/models/tests/test_bspline.py
trunk/scipy/stats/models/tests/test_formula.py
trunk/scipy/stats/models/tests/test_glm.py
trunk/scipy/stats/models/tests/test_regression.py
trunk/scipy/stats/models/tests/test_rlm.py
trunk/scipy/stats/models/tests/test_utils.py
trunk/scipy/stats/models/utils.py
Log:
moved scipy/sandbox/models to scipy/stats/models
Copied: trunk/scipy/stats/models (from rev 3282, trunk/scipy/sandbox/models)
Modified: trunk/scipy/stats/models/__init__.py
===================================================================
--- trunk/scipy/sandbox/models/__init__.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/__init__.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -4,15 +4,15 @@
__docformat__ = 'restructuredtext'
-from scipy.sandbox.models.info import __doc__
+from scipy.stats.models.info import __doc__
-import scipy.sandbox.models.model
-import scipy.sandbox.models.formula
-import scipy.sandbox.models.regression
-import scipy.sandbox.models.robust
-import scipy.sandbox.models.family
-from scipy.sandbox.models.glm import model as glm
-from scipy.sandbox.models.rlm import model as rlm
+import scipy.stats.models.model
+import scipy.stats.models.formula
+import scipy.stats.models.regression
+import scipy.stats.models.robust
+import scipy.stats.models.family
+from scipy.stats.models.glm import model as glm
+from scipy.stats.models.rlm import model as rlm
__all__ = filter(lambda s:not s.startswith('_'),dir())
Modified: trunk/scipy/stats/models/bspline.py
===================================================================
--- trunk/scipy/sandbox/models/bspline.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/bspline.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -20,7 +20,7 @@
from scipy.linalg import solveh_banded
from scipy.optimize import golden
-from scipy.sandbox.models import _bspline
+from scipy.stats.models import _bspline
def _band2array(a, lower=0, symmetric=False, hermitian=False):
"""
Modified: trunk/scipy/stats/models/contrast.py
===================================================================
--- trunk/scipy/sandbox/models/contrast.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/contrast.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -1,6 +1,6 @@
import numpy as N
from numpy.linalg import pinv
-from scipy.sandbox.models import utils
+from scipy.stats.models import utils
class ContrastResults:
"""
Modified: trunk/scipy/stats/models/cox.py
===================================================================
--- trunk/scipy/sandbox/models/cox.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/cox.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -3,7 +3,7 @@
import numpy as N
-from scipy.sandbox.models import survival, model
+from scipy.stats.models import survival, model
class discrete:
@@ -199,7 +199,7 @@
for i in range(2*n):
subjects[i].X = X[i]
- import scipy.sandbox.models.formula as F
+ import scipy.stats.models.formula as F
x = F.quantitative('X')
f = F.formula(x)
Modified: trunk/scipy/stats/models/family/__init__.py
===================================================================
--- trunk/scipy/sandbox/models/family/__init__.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/family/__init__.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -10,7 +10,7 @@
'''
-from scipy.sandbox.models.family.family import Gaussian, Family, \
+from scipy.stats.models.family.family import Gaussian, Family, \
Poisson, Gamma, InverseGaussian, Binomial
Modified: trunk/scipy/stats/models/family/family.py
===================================================================
--- trunk/scipy/sandbox/models/family/family.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/family/family.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -1,6 +1,6 @@
import numpy as N
-from scipy.sandbox.models.family import links as L
-from scipy.sandbox.models.family import varfuncs as V
+from scipy.stats.models.family import links as L
+from scipy.stats.models.family import varfuncs as V
class Family(object):
Modified: trunk/scipy/stats/models/formula.py
===================================================================
--- trunk/scipy/sandbox/models/formula.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/formula.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -247,7 +247,7 @@
of another term, i.e. to take powers:
>>> import numpy as N
- >>> from scipy.sandbox.models import formula
+ >>> from scipy.stats.models import formula
>>> X = N.linspace(0,10,101)
>>> x = formula.term('X')
>>> x.namespace={'X':X}
@@ -600,7 +600,7 @@
only term in the formula, then a keywords argument
\'nrow\' is needed.
->>> from scipy.sandbox.models.formula import formula, I
+>>> from scipy.stats.models.formula import formula, I
>>> I()
array(1.0)
>>> I(nrow=5)
Modified: trunk/scipy/stats/models/gam.py
===================================================================
--- trunk/scipy/sandbox/models/gam.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/gam.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -5,9 +5,9 @@
import numpy as N
-from scipy.sandbox.models import family
-from scipy.sandbox.models.bspline import SmoothingSpline
-from scipy.sandbox.models.glm import model as glm
+from scipy.stats.models import family
+from scipy.stats.models.bspline import SmoothingSpline
+from scipy.stats.models.glm import model as glm
def default_smoother(x):
_x = x.copy()
Modified: trunk/scipy/stats/models/glm.py
===================================================================
--- trunk/scipy/sandbox/models/glm.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/glm.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -3,8 +3,8 @@
--------------------
"""
import numpy as N
-from scipy.sandbox.models import family
-from scipy.sandbox.models.regression import wls_model
+from scipy.stats.models import family
+from scipy.stats.models.regression import wls_model
class model(wls_model):
Modified: trunk/scipy/stats/models/mixed.py
===================================================================
--- trunk/scipy/sandbox/models/mixed.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/mixed.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -4,7 +4,7 @@
import numpy as N
import numpy.linalg as L
-from scipy.sandbox.models.formula import formula, I
+from scipy.stats.models.formula import formula, I
class Unit:
"""
@@ -311,7 +311,7 @@
n = 3
- from scipy.sandbox.models.formula import term
+ from scipy.stats.models.formula import term
fixed = term('f')
random = term('r')
response = term('y')
Modified: trunk/scipy/stats/models/model.py
===================================================================
--- trunk/scipy/sandbox/models/model.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/model.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -2,8 +2,8 @@
from numpy.linalg import inv
#from scipy import optimize
-from scipy.sandbox.models.contrast import ContrastResults
-from scipy.sandbox.models.utils import recipr
+from scipy.stats.models.contrast import ContrastResults
+from scipy.stats.models.utils import recipr
class Model(object):
"""
Modified: trunk/scipy/stats/models/regression.py
===================================================================
--- trunk/scipy/sandbox/models/regression.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/regression.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -22,9 +22,9 @@
import numpy.linalg as L
from scipy.linalg import norm, toeplitz
-from scipy.sandbox.models.model import likelihood_model, \
+from scipy.stats.models.model import likelihood_model, \
likelihood_model_results
-from scipy.sandbox.models import utils
+from scipy.stats.models import utils
class ols_model(likelihood_model):
"""
@@ -34,8 +34,8 @@
--------
>>> import numpy as N
>>>
- >>> from scipy.sandbox.models.formula import term, I
- >>> from scipy.sandbox.models.regression import ols_model
+ >>> from scipy.stats.models.formula import term, I
+ >>> from scipy.stats.models.regression import ols_model
>>>
>>> data={'Y':[1,3,4,5,2,3,4],
... 'X':range(1,8)}
@@ -136,8 +136,8 @@
>>> import numpy as N
>>> import numpy.random as R
>>>
- >>> from scipy.sandbox.models.formula import term, I
- >>> from scipy.sandbox.models.regression import ar_model
+ >>> from scipy.stats.models.formula import term, I
+ >>> from scipy.stats.models.regression import ar_model
>>>
>>> data={'Y':[1,3,4,5,8,10,9],
... 'X':range(1,8)}
@@ -273,8 +273,8 @@
>>> import numpy as N
>>>
- >>> from scipy.sandbox.models.formula import term, I
- >>> from scipy.sandbox.models.regression import wls_model
+ >>> from scipy.stats.models.formula import term, I
+ >>> from scipy.stats.models.regression import wls_model
>>>
>>> data={'Y':[1,3,4,5,2,3,4],
... 'X':range(1,8)}
Modified: trunk/scipy/stats/models/rlm.py
===================================================================
--- trunk/scipy/sandbox/models/rlm.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/rlm.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -3,8 +3,8 @@
"""
import numpy as N
-from scipy.sandbox.models.regression import wls_model
-from scipy.sandbox.models.robust import norms, scale
+from scipy.stats.models.regression import wls_model
+from scipy.stats.models.robust import norms, scale
class model(wls_model):
Modified: trunk/scipy/stats/models/robust/__init__.py
===================================================================
--- trunk/scipy/sandbox/models/robust/__init__.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/robust/__init__.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -4,5 +4,5 @@
import numpy as N
import numpy.linalg as L
-from scipy.sandbox.models.robust import norms
-from scipy.sandbox.models.robust.scale import MAD
+from scipy.stats.models.robust import norms
+from scipy.stats.models.robust.scale import MAD
Modified: trunk/scipy/stats/models/setup.py
===================================================================
--- trunk/scipy/sandbox/models/setup.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/setup.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -10,7 +10,7 @@
try:
import sys
print sys.path
- from scipy.sandbox.models.bspline_module import mod
+ from scipy.stats.models.bspline_module import mod
n, s, d = weave_ext(mod)
config.add_extension(n, s, **d)
except ImportError: pass
@@ -26,4 +26,4 @@
if __name__ == '__main__':
from numpy.distutils.core import setup
- setup(**configuration(top_path='', package_name='scipy.sandbox.models').todict())
+ setup(**configuration(top_path='', package_name='scipy.stats.models').todict())
Modified: trunk/scipy/stats/models/smoothers.py
===================================================================
--- trunk/scipy/sandbox/models/smoothers.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/smoothers.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -9,8 +9,8 @@
from scipy.linalg import solveh_banded
from scipy.optimize import golden
-from scipy.sandbox.models import _bspline
-from scipy.sandbox.models.bspline import bspline, _band2array
+from scipy.stats.models import _bspline
+from scipy.stats.models.bspline import bspline, _band2array
class poly_smoother:
Modified: trunk/scipy/stats/models/tests/test_bspline.py
===================================================================
--- trunk/scipy/sandbox/models/tests/test_bspline.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/tests/test_bspline.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -5,8 +5,8 @@
import numpy as N
from numpy.testing import NumpyTest, NumpyTestCase
-import scipy.sandbox.models as S
-import scipy.sandbox.models.bspline as B
+import scipy.stats.models as S
+import scipy.stats.models.bspline as B
class test_BSpline(NumpyTestCase):
Modified: trunk/scipy/stats/models/tests/test_formula.py
===================================================================
--- trunk/scipy/sandbox/models/tests/test_formula.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/tests/test_formula.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -9,7 +9,7 @@
import numpy.linalg as L
from numpy.testing import assert_almost_equal, NumpyTest, NumpyTestCase
-from scipy.sandbox.models import utils, formula, contrast
+from scipy.stats.models import utils, formula, contrast
class test_term(NumpyTestCase):
Modified: trunk/scipy/stats/models/tests/test_glm.py
===================================================================
--- trunk/scipy/sandbox/models/tests/test_glm.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/tests/test_glm.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -6,8 +6,8 @@
import numpy.random as R
from numpy.testing import NumpyTest, NumpyTestCase
-import scipy.sandbox.models as S
-import scipy.sandbox.models.glm as models
+import scipy.stats.models as S
+import scipy.stats.models.glm as models
W = R.standard_normal
Modified: trunk/scipy/stats/models/tests/test_regression.py
===================================================================
--- trunk/scipy/sandbox/models/tests/test_regression.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/tests/test_regression.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -5,7 +5,7 @@
from numpy.random import standard_normal
from numpy.testing import NumpyTest, NumpyTestCase
-from scipy.sandbox.models.regression import ols_model, ar_model
+from scipy.stats.models.regression import ols_model, ar_model
W = standard_normal
Modified: trunk/scipy/stats/models/tests/test_rlm.py
===================================================================
--- trunk/scipy/sandbox/models/tests/test_rlm.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/tests/test_rlm.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -5,7 +5,7 @@
import numpy.random as R
from numpy.testing import NumpyTest, NumpyTestCase
-import scipy.sandbox.models.rlm as models
+import scipy.stats.models.rlm as models
W = R.standard_normal
Modified: trunk/scipy/stats/models/tests/test_utils.py
===================================================================
--- trunk/scipy/sandbox/models/tests/test_utils.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/tests/test_utils.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -6,7 +6,7 @@
import numpy.random as R
from numpy.testing import assert_almost_equal, NumpyTest, NumpyTestCase
-from scipy.sandbox.models import utils
+from scipy.stats.models import utils
class test_Utils(NumpyTestCase):
Modified: trunk/scipy/stats/models/utils.py
===================================================================
--- trunk/scipy/sandbox/models/utils.py 2007-08-29 16:46:52 UTC (rev 3282)
+++ trunk/scipy/stats/models/utils.py 2007-08-29 18:24:04 UTC (rev 3283)
@@ -82,7 +82,7 @@
Examples
--------
>>> from numpy import arange
- >>> from scipy.sandbox.models.utils import StepFunction
+ >>> from scipy.stats.models.utils import StepFunction
>>>
>>> x = arange(20)
>>> y = arange(20)
More information about the Scipy-svn
mailing list