[Scipy-svn] r2305 - in trunk/Lib/sandbox/models: . family robust

scipy-svn at scipy.org scipy-svn at scipy.org
Mon Nov 6 19:46:19 CST 2006


Author: matthew.brett at gmail.com
Date: 2006-11-06 19:46:10 -0600 (Mon, 06 Nov 2006)
New Revision: 2305

Modified:
   trunk/Lib/sandbox/models/bsplines.py
   trunk/Lib/sandbox/models/contrast.py
   trunk/Lib/sandbox/models/cox.py
   trunk/Lib/sandbox/models/family/__init__.py
   trunk/Lib/sandbox/models/family/family.py
   trunk/Lib/sandbox/models/formula.py
   trunk/Lib/sandbox/models/glm.py
   trunk/Lib/sandbox/models/mixed.py
   trunk/Lib/sandbox/models/model.py
   trunk/Lib/sandbox/models/regression.py
   trunk/Lib/sandbox/models/rlm.py
   trunk/Lib/sandbox/models/robust/__init__.py
Log:
Changed relative to absolute imports according to PEP8 python style guide

Modified: trunk/Lib/sandbox/models/bsplines.py
===================================================================
--- trunk/Lib/sandbox/models/bsplines.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/bsplines.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,7 +1,7 @@
 import numpy as N
 import numpy.linalg as L
 import scipy.integrate
-import _bspline
+from scipy.sandbox.models import _bspline
 
 # note to self: check out eig_banded! in linalg.decomp?
 

Modified: trunk/Lib/sandbox/models/contrast.py
===================================================================
--- trunk/Lib/sandbox/models/contrast.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/contrast.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,6 +1,6 @@
 import numpy as N
 from numpy.linalg import pinv
-import utils
+from scipy.sandbox.models import utils
 
 class ContrastResults:
     """

Modified: trunk/Lib/sandbox/models/cox.py
===================================================================
--- trunk/Lib/sandbox/models/cox.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/cox.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,7 +1,7 @@
+import shutil
+import tempfile
 import numpy as N
-import survival
-import model
-import tempfile, shutil
+from scipy.sandbox.models import survival, model
 
 class DiscreteRV:
 

Modified: trunk/Lib/sandbox/models/family/__init__.py
===================================================================
--- trunk/Lib/sandbox/models/family/__init__.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/family/__init__.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,4 +1,4 @@
+from scipy.sandbox.models.family.family import Gaussian, Family, \
+     Poisson, Gamma, InverseGaussian, Binomial
 
-from family import Gaussian, Family, Poisson, Gamma, InverseGaussian, Binomial
 
-

Modified: trunk/Lib/sandbox/models/family/family.py
===================================================================
--- trunk/Lib/sandbox/models/family/family.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/family/family.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,6 +1,6 @@
-import links as L
-import varfuncs as V
 import numpy as N
+from scipy.sandbox.models.family import links as L
+from scipy.sandbox.models.family import varfuncs as V
 
 class Family:
 

Modified: trunk/Lib/sandbox/models/formula.py
===================================================================
--- trunk/Lib/sandbox/models/formula.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/formula.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,4 +1,5 @@
-import types, copy
+import copy
+import types
 import numpy as N
 
 terms = {}

Modified: trunk/Lib/sandbox/models/glm.py
===================================================================
--- trunk/Lib/sandbox/models/glm.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/glm.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,6 +1,6 @@
 import numpy as N
-import family
-from regression import WLSModel
+from scipy.sandbox.models import family
+from scipy.sandbox.models.regression import WLSModel
 
 class Model(WLSModel):
 

Modified: trunk/Lib/sandbox/models/mixed.py
===================================================================
--- trunk/Lib/sandbox/models/mixed.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/mixed.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,6 +1,6 @@
 import numpy as N
 import numpy.linalg as L
-from formula import Formula, I
+from scipy.sandbox.models.formula import Formula, I
 
 class Unit:
 

Modified: trunk/Lib/sandbox/models/model.py
===================================================================
--- trunk/Lib/sandbox/models/model.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/model.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,9 +1,9 @@
-import scipy.optimize
 import numpy as N
 from numpy.linalg import inv
+import scipy.optimize
 
-from utils import recipr
-from contrast import ContrastResults
+from scipy.sandbox.models.contrast import ContrastResults
+from scipy.sandbox.models.utils import recipr
 
 class Model:
     """

Modified: trunk/Lib/sandbox/models/regression.py
===================================================================
--- trunk/Lib/sandbox/models/regression.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/regression.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,9 +1,8 @@
 import numpy as N
 import numpy.linalg as L
-from model import LikelihoodModel, LikelihoodModelResults
-
-import utils
 import scipy.linalg
+from scipy.sandbox.models.model import LikelihoodModel, LikelihoodModelResults
+from scipy.sandbox.models import utils
 
 class OLSModel(LikelihoodModel):
     

Modified: trunk/Lib/sandbox/models/rlm.py
===================================================================
--- trunk/Lib/sandbox/models/rlm.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/rlm.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,7 +1,7 @@
 import numpy as N
-from robust import norms, scale
 
-from regression import WLSModel
+from scipy.sandbox.models.regression import WLSModel
+from scipy.sandbox.models.robust import norms, scale
 
 class Model(WLSModel):
 

Modified: trunk/Lib/sandbox/models/robust/__init__.py
===================================================================
--- trunk/Lib/sandbox/models/robust/__init__.py	2006-11-07 01:03:56 UTC (rev 2304)
+++ trunk/Lib/sandbox/models/robust/__init__.py	2006-11-07 01:46:10 UTC (rev 2305)
@@ -1,8 +1,8 @@
 import numpy as N
 import numpy.linalg as L
-import norms
 
-from scale import MAD
+from scipy.sandbox.models.robust import norms
+from scipy.sandbox.models.robust.scale import MAD
 
 
 



More information about the Scipy-svn mailing list