[Scipy-svn] r3311 - in branches/0.6.x: . scipy/sandbox scipy/sandbox/models scipy/sandbox/models/family scipy/sandbox/models/robust scipy/sandbox/models/tests scipy/stats

scipy-svn@scip... scipy-svn@scip...
Fri Sep 14 13:37:39 CDT 2007


Author: jarrod.millman
Date: 2007-09-14 13:37:31 -0500 (Fri, 14 Sep 2007)
New Revision: 3311

Added:
   branches/0.6.x/scipy/sandbox/models/
Removed:
   branches/0.6.x/scipy/stats/models/
Modified:
   branches/0.6.x/MANIFEST.in
   branches/0.6.x/scipy/sandbox/models/__init__.py
   branches/0.6.x/scipy/sandbox/models/bspline.py
   branches/0.6.x/scipy/sandbox/models/contrast.py
   branches/0.6.x/scipy/sandbox/models/cox.py
   branches/0.6.x/scipy/sandbox/models/family/__init__.py
   branches/0.6.x/scipy/sandbox/models/family/family.py
   branches/0.6.x/scipy/sandbox/models/formula.py
   branches/0.6.x/scipy/sandbox/models/gam.py
   branches/0.6.x/scipy/sandbox/models/glm.py
   branches/0.6.x/scipy/sandbox/models/mixed.py
   branches/0.6.x/scipy/sandbox/models/model.py
   branches/0.6.x/scipy/sandbox/models/regression.py
   branches/0.6.x/scipy/sandbox/models/rlm.py
   branches/0.6.x/scipy/sandbox/models/robust/__init__.py
   branches/0.6.x/scipy/sandbox/models/setup.py
   branches/0.6.x/scipy/sandbox/models/smoothers.py
   branches/0.6.x/scipy/sandbox/models/tests/test_bspline.py
   branches/0.6.x/scipy/sandbox/models/tests/test_formula.py
   branches/0.6.x/scipy/sandbox/models/tests/test_glm.py
   branches/0.6.x/scipy/sandbox/models/tests/test_regression.py
   branches/0.6.x/scipy/sandbox/models/tests/test_rlm.py
   branches/0.6.x/scipy/sandbox/models/tests/test_utils.py
   branches/0.6.x/scipy/sandbox/models/utils.py
   branches/0.6.x/scipy/stats/setup.py
Log:
moved models code back to sandbox for 0.6 release


Modified: branches/0.6.x/MANIFEST.in
===================================================================
--- branches/0.6.x/MANIFEST.in	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/MANIFEST.in	2007-09-14 18:37:31 UTC (rev 3311)
@@ -42,6 +42,10 @@
 include scipy/sandbox/image/*
 include scipy/sandbox/maskedarray/*
 include scipy/sandbox/maskedarray/tests/*
+include scipy/sandbox/models/*
+include scipy/sandbox/models/family/*
+include scipy/sandbox/models/robust/*
+include scipy/sandbox/models/tests/*
 include scipy/sandbox/montecarlo/*
 include scipy/sandbox/montecarlo/src/*
 include scipy/sandbox/montecarlo/tests/*

Copied: branches/0.6.x/scipy/sandbox/models (from rev 3310, branches/0.6.x/scipy/stats/models)

Modified: branches/0.6.x/scipy/sandbox/models/__init__.py
===================================================================
--- branches/0.6.x/scipy/stats/models/__init__.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/__init__.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -4,15 +4,15 @@
 
 __docformat__ = 'restructuredtext'
 
-from scipy.stats.models.info import __doc__
+from scipy.sandbox.models.info import __doc__
 
-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
+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
 
 __all__ = filter(lambda s:not s.startswith('_'),dir())
 

Modified: branches/0.6.x/scipy/sandbox/models/bspline.py
===================================================================
--- branches/0.6.x/scipy/stats/models/bspline.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/bspline.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -20,7 +20,7 @@
 
 from scipy.linalg import solveh_banded
 from scipy.optimize import golden
-from scipy.stats.models import _bspline
+from scipy.sandbox.models import _bspline
 
 def _band2array(a, lower=0, symmetric=False, hermitian=False):
     """

Modified: branches/0.6.x/scipy/sandbox/models/contrast.py
===================================================================
--- branches/0.6.x/scipy/stats/models/contrast.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/contrast.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -1,6 +1,6 @@
 import numpy as N
 from numpy.linalg import pinv
-from scipy.stats.models import utils
+from scipy.sandbox.models import utils
 
 class ContrastResults:
     """

Modified: branches/0.6.x/scipy/sandbox/models/cox.py
===================================================================
--- branches/0.6.x/scipy/stats/models/cox.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/cox.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -3,7 +3,7 @@
 
 import numpy as N
 
-from scipy.stats.models import survival, model
+from scipy.sandbox.models import survival, model
 
 class discrete:
 
@@ -199,7 +199,7 @@
     for i in range(2*n):
         subjects[i].X = X[i]
 
-    import scipy.stats.models.formula as F
+    import scipy.sandbox.models.formula as F
     x = F.quantitative('X')
     f = F.formula(x)
 

Modified: branches/0.6.x/scipy/sandbox/models/family/__init__.py
===================================================================
--- branches/0.6.x/scipy/stats/models/family/__init__.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/family/__init__.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -10,7 +10,7 @@
 
 '''
 
-from scipy.stats.models.family.family import Gaussian, Family, \
+from scipy.sandbox.models.family.family import Gaussian, Family, \
      Poisson, Gamma, InverseGaussian, Binomial
 
 

Modified: branches/0.6.x/scipy/sandbox/models/family/family.py
===================================================================
--- branches/0.6.x/scipy/stats/models/family/family.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/family/family.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -1,6 +1,6 @@
 import numpy as N
-from scipy.stats.models.family import links as L
-from scipy.stats.models.family import varfuncs as V
+from scipy.sandbox.models.family import links as L
+from scipy.sandbox.models.family import varfuncs as V
 
 class Family(object):
 

Modified: branches/0.6.x/scipy/sandbox/models/formula.py
===================================================================
--- branches/0.6.x/scipy/stats/models/formula.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/formula.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -247,7 +247,7 @@
     of another term, i.e. to take powers:
 
     >>> import numpy as N
-    >>> from scipy.stats.models import formula
+    >>> from scipy.sandbox.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.stats.models.formula import formula, I
+>>> from scipy.sandbox.models.formula import formula, I
 >>> I()
 array(1.0)
 >>> I(nrow=5)

Modified: branches/0.6.x/scipy/sandbox/models/gam.py
===================================================================
--- branches/0.6.x/scipy/stats/models/gam.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/gam.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -5,9 +5,9 @@
 
 import numpy as N
 
-from scipy.stats.models import family
-from scipy.stats.models.bspline import SmoothingSpline
-from scipy.stats.models.glm import model as glm
+from scipy.sandbox.models import family
+from scipy.sandbox.models.bspline import SmoothingSpline
+from scipy.sandbox.models.glm import model as glm
 
 def default_smoother(x):
     _x = x.copy()

Modified: branches/0.6.x/scipy/sandbox/models/glm.py
===================================================================
--- branches/0.6.x/scipy/stats/models/glm.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/glm.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -3,8 +3,8 @@
 --------------------
 """
 import numpy as N
-from scipy.stats.models import family
-from scipy.stats.models.regression import wls_model
+from scipy.sandbox.models import family
+from scipy.sandbox.models.regression import wls_model
 
 class model(wls_model):
 

Modified: branches/0.6.x/scipy/sandbox/models/mixed.py
===================================================================
--- branches/0.6.x/scipy/stats/models/mixed.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/mixed.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -4,7 +4,7 @@
 
 import numpy as N
 import numpy.linalg as L
-from scipy.stats.models.formula import formula, I
+from scipy.sandbox.models.formula import formula, I
 
 class Unit:
     """
@@ -311,7 +311,7 @@
     
     n = 3
 
-    from scipy.stats.models.formula import term
+    from scipy.sandbox.models.formula import term
     fixed = term('f')
     random = term('r')
     response = term('y')

Modified: branches/0.6.x/scipy/sandbox/models/model.py
===================================================================
--- branches/0.6.x/scipy/stats/models/model.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/model.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -2,8 +2,8 @@
 from numpy.linalg import inv
 #from scipy import optimize
 
-from scipy.stats.models.contrast import ContrastResults
-from scipy.stats.models.utils import recipr
+from scipy.sandbox.models.contrast import ContrastResults
+from scipy.sandbox.models.utils import recipr
 
 class Model(object):
     """

Modified: branches/0.6.x/scipy/sandbox/models/regression.py
===================================================================
--- branches/0.6.x/scipy/stats/models/regression.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/regression.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -22,9 +22,9 @@
 import numpy.linalg as L
 from scipy.linalg import norm, toeplitz
 
-from scipy.stats.models.model import likelihood_model, \
+from scipy.sandbox.models.model import likelihood_model, \
      likelihood_model_results
-from scipy.stats.models import utils
+from scipy.sandbox.models import utils
 
 class ols_model(likelihood_model):
     """
@@ -34,8 +34,8 @@
     --------
     >>> import numpy as N
     >>> 
-    >>> from scipy.stats.models.formula import term, I
-    >>> from scipy.stats.models.regression import ols_model
+    >>> from scipy.sandbox.models.formula import term, I
+    >>> from scipy.sandbox.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.stats.models.formula import term, I
-    >>> from scipy.stats.models.regression import ar_model
+    >>> from scipy.sandbox.models.formula import term, I
+    >>> from scipy.sandbox.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.stats.models.formula import term, I
-    >>> from scipy.stats.models.regression import wls_model
+    >>> from scipy.sandbox.models.formula import term, I
+    >>> from scipy.sandbox.models.regression import wls_model
     >>> 
     >>> data={'Y':[1,3,4,5,2,3,4],
     ...       'X':range(1,8)}

Modified: branches/0.6.x/scipy/sandbox/models/rlm.py
===================================================================
--- branches/0.6.x/scipy/stats/models/rlm.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/rlm.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -3,8 +3,8 @@
 """
 import numpy as N
 
-from scipy.stats.models.regression import wls_model
-from scipy.stats.models.robust import norms, scale
+from scipy.sandbox.models.regression import wls_model
+from scipy.sandbox.models.robust import norms, scale
 
 class model(wls_model):
 

Modified: branches/0.6.x/scipy/sandbox/models/robust/__init__.py
===================================================================
--- branches/0.6.x/scipy/stats/models/robust/__init__.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/robust/__init__.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -4,5 +4,5 @@
 import numpy as N
 import numpy.linalg as L
 
-from scipy.stats.models.robust import norms
-from scipy.stats.models.robust.scale import MAD
+from scipy.sandbox.models.robust import norms
+from scipy.sandbox.models.robust.scale import MAD

Modified: branches/0.6.x/scipy/sandbox/models/setup.py
===================================================================
--- branches/0.6.x/scipy/stats/models/setup.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/setup.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -9,7 +9,7 @@
 
     try:
         import sys
-        from scipy.stats.models.bspline_module import mod
+        from scipy.sandbox.models.bspline_module import mod
         n, s, d = weave_ext(mod)
         config.add_extension(n, s, **d)
     except ImportError: pass
@@ -25,4 +25,4 @@
 if __name__ == '__main__':
 
     from numpy.distutils.core import setup
-    setup(**configuration(top_path='', package_name='scipy.stats.models').todict())
+    setup(**configuration(top_path='', package_name='scipy.sandbox.models').todict())

Modified: branches/0.6.x/scipy/sandbox/models/smoothers.py
===================================================================
--- branches/0.6.x/scipy/stats/models/smoothers.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/smoothers.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -9,8 +9,8 @@
 from scipy.linalg import solveh_banded
 from scipy.optimize import golden
 
-from scipy.stats.models import _bspline
-from scipy.stats.models.bspline import bspline, _band2array
+from scipy.sandbox.models import _bspline
+from scipy.sandbox.models.bspline import bspline, _band2array
 
 
 class poly_smoother:

Modified: branches/0.6.x/scipy/sandbox/models/tests/test_bspline.py
===================================================================
--- branches/0.6.x/scipy/stats/models/tests/test_bspline.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/tests/test_bspline.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -5,8 +5,8 @@
 import numpy as N
 from numpy.testing import NumpyTest, NumpyTestCase
 
-import scipy.stats.models as S
-import scipy.stats.models.bspline as B
+import scipy.sandbox.models as S
+import scipy.sandbox.models.bspline as B
 
 
 class test_BSpline(NumpyTestCase):

Modified: branches/0.6.x/scipy/sandbox/models/tests/test_formula.py
===================================================================
--- branches/0.6.x/scipy/stats/models/tests/test_formula.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/tests/test_formula.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -9,7 +9,7 @@
 import numpy.linalg as L
 from numpy.testing import assert_almost_equal, NumpyTest, NumpyTestCase
 
-from scipy.stats.models import utils, formula, contrast
+from scipy.sandbox.models import utils, formula, contrast
 
 class test_term(NumpyTestCase):
 

Modified: branches/0.6.x/scipy/sandbox/models/tests/test_glm.py
===================================================================
--- branches/0.6.x/scipy/stats/models/tests/test_glm.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/tests/test_glm.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -6,8 +6,8 @@
 import numpy.random as R
 from numpy.testing import NumpyTest, NumpyTestCase
 
-import scipy.stats.models as S
-import scipy.stats.models.glm as models
+import scipy.sandbox.models as S
+import scipy.sandbox.models.glm as models
 
 W = R.standard_normal
 

Modified: branches/0.6.x/scipy/sandbox/models/tests/test_regression.py
===================================================================
--- branches/0.6.x/scipy/stats/models/tests/test_regression.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/tests/test_regression.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -5,7 +5,7 @@
 from numpy.random import standard_normal
 from numpy.testing import NumpyTest, NumpyTestCase
 
-from scipy.stats.models.regression import ols_model, ar_model
+from scipy.sandbox.models.regression import ols_model, ar_model
 
 W = standard_normal
 

Modified: branches/0.6.x/scipy/sandbox/models/tests/test_rlm.py
===================================================================
--- branches/0.6.x/scipy/stats/models/tests/test_rlm.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/tests/test_rlm.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -5,7 +5,7 @@
 import numpy.random as R
 from numpy.testing import NumpyTest, NumpyTestCase
 
-import scipy.stats.models.rlm as models
+import scipy.sandbox.models.rlm as models
 
 W = R.standard_normal
 

Modified: branches/0.6.x/scipy/sandbox/models/tests/test_utils.py
===================================================================
--- branches/0.6.x/scipy/stats/models/tests/test_utils.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/tests/test_utils.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -6,7 +6,7 @@
 import numpy.random as R
 from numpy.testing import assert_almost_equal, NumpyTest, NumpyTestCase
 
-from scipy.stats.models import utils
+from scipy.sandbox.models import utils
 
 class test_Utils(NumpyTestCase):
 

Modified: branches/0.6.x/scipy/sandbox/models/utils.py
===================================================================
--- branches/0.6.x/scipy/stats/models/utils.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/sandbox/models/utils.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -82,7 +82,7 @@
     Examples
     --------
     >>> from numpy import arange
-    >>> from scipy.stats.models.utils import StepFunction
+    >>> from scipy.sandbox.models.utils import StepFunction
     >>>
     >>> x = arange(20)
     >>> y = arange(20)

Modified: branches/0.6.x/scipy/stats/setup.py
===================================================================
--- branches/0.6.x/scipy/stats/setup.py	2007-09-09 02:13:29 UTC (rev 3310)
+++ branches/0.6.x/scipy/stats/setup.py	2007-09-14 18:37:31 UTC (rev 3311)
@@ -6,7 +6,6 @@
     from numpy.distutils.misc_util import Configuration
     config = Configuration('stats', parent_package, top_path)
 
-    config.add_subpackage('models')
     config.add_data_dir('tests')
 
     config.add_library('statlib',



More information about the Scipy-svn mailing list