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

[scipy-svn at scipy.org]

Author: timl
Date: 2006-12-15 04:55:10 -0600 (Fri, 15 Dec 2006)
New Revision: 2417

Modified:
   trunk/Lib/sandbox/models/model.py
   trunk/Lib/sandbox/models/regression.py
   trunk/Lib/sandbox/models/survival.py
Log:
change some class names from CamelCase to under_score

Modified: trunk/Lib/sandbox/models/model.py
===================================================================
--- trunk/Lib/sandbox/models/model.py	2006-12-15 10:52:28 UTC (rev 2416)
+++ trunk/Lib/sandbox/models/model.py	2006-12-15 10:55:10 UTC (rev 2417)
@@ -41,7 +41,7 @@
         """
         raise NotImplementedError
 
-class LikelihoodModel(Model):
+class likelihood_model(Model):
 
     def logL(self, theta):
         """

Modified: trunk/Lib/sandbox/models/regression.py
===================================================================
--- trunk/Lib/sandbox/models/regression.py	2006-12-15 10:52:28 UTC (rev 2416)
+++ trunk/Lib/sandbox/models/regression.py	2006-12-15 10:55:10 UTC (rev 2417)
@@ -1,10 +1,10 @@
 import numpy as N
 import numpy.linalg as L
 import scipy.linalg
-from scipy.sandbox.models.model import LikelihoodModel, LikelihoodModelResults
+from scipy.sandbox.models.model import likelihood_model, LikelihoodModelResults
 from scipy.sandbox.models import utils
 
-class ols_model(LikelihoodModel):
+class ols_model(likelihood_model):
     
     """
     A simple ordinary least squares model.
@@ -14,7 +14,7 @@
         return -scipy.linalg.norm(self.whiten(Y) - N.dot(self.wdesign, b))**2 / 2.
 
     def __init__(self, design):
-        LikelihoodModel.__init__(self)
+        likelihood_model.__init__(self)
         self.initialize(design)
 
     def initialize(self, design):

Modified: trunk/Lib/sandbox/models/survival.py
===================================================================
--- trunk/Lib/sandbox/models/survival.py	2006-12-15 10:52:28 UTC (rev 2416)
+++ trunk/Lib/sandbox/models/survival.py	2006-12-15 10:55:10 UTC (rev 2417)
@@ -1,18 +1,18 @@
 import numpy as N
 
-class SurvivalTime:
+class survival_time:
     def __init__(self, time, delta):
         self.time, self.delta = time, delta
 
     def atrisk(self, time):
         raise NotImplementedError
 
-class RightCensored(SurvivalTime):
+class right_censored(survival_time):
 
     def atrisk(self, time):
         return N.less_equal.outer(time, self.time)
 
-class LeftCensored(SurvivalTime):
+class left_censored(survival_time):
 
     def atrisk(self, time):
         return N.greater_equal.outer(time, self.time)