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

[scipy-svn at scipy.org]

Author: timl
Date: 2006-11-08 00:04:22 -0600 (Wed, 08 Nov 2006)
New Revision: 2313

Modified:
   trunk/Lib/sandbox/models/glm.py
   trunk/Lib/sandbox/models/mixed.py
Log:
remove unused/needed **keywords args

Modified: trunk/Lib/sandbox/models/glm.py
===================================================================
--- trunk/Lib/sandbox/models/glm.py	2006-11-08 06:02:34 UTC (rev 2312)
+++ trunk/Lib/sandbox/models/glm.py	2006-11-08 06:04:22 UTC (rev 2313)
@@ -6,7 +6,7 @@
 
     niter = 10
     
-    def __init__(self, design, family=family.Gaussian(), **keywords):
+    def __init__(self, design, family=family.Gaussian()):
         self.family = family
         self.weights = 1
         self.initialize(design)
@@ -59,12 +59,12 @@
         
         if results is None:
             results = self.results
-        if Y is None: Y = self.Y
+        if Y is None:
+            Y = self.Y
         resid = Y - results.mu
         return (N.power(resid, 2) / self.family.variance(results.mu)).sum() / results.df_resid
     
-    def fit(self, Y, **keywords):
-
+    def fit(self, Y):
         self.Y = N.asarray(Y, N.float64)
         iter(self)
         self.results = wls_model.fit(self, self.family.link.initialize(Y))

Modified: trunk/Lib/sandbox/models/mixed.py
===================================================================
--- trunk/Lib/sandbox/models/mixed.py	2006-11-08 06:02:34 UTC (rev 2312)
+++ trunk/Lib/sandbox/models/mixed.py	2006-11-08 06:04:22 UTC (rev 2313)
@@ -144,7 +144,7 @@
     Vol. 82, No. 397. (Mar., 1987), pp. 97-105. 
     """
 
-    def __init__(self, units, response, fixed=I, random=I, **extra):
+    def __init__(self, units, response, fixed=I, random=I):
         self.units = units
         self.m = len(self.units)