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

[scipy-svn at scipy.org]

Author: timl
Date: 2006-10-12 02:04:38 -0500 (Thu, 12 Oct 2006)
New Revision: 2260

Modified:
   trunk/Lib/sandbox/models/contrast.py
Log:
split long lines, remove unused function parameters

Modified: trunk/Lib/sandbox/models/contrast.py
===================================================================
--- trunk/Lib/sandbox/models/contrast.py	2006-10-12 07:03:45 UTC (rev 2259)
+++ trunk/Lib/sandbox/models/contrast.py	2006-10-12 07:04:38 UTC (rev 2260)
@@ -23,9 +23,11 @@
             
     def __str__(self):
         if hasattr(self, 'F'):
-            return '<F contrast: F=%s, df_denom=%d, df_num=%d>' % (`self.F`, self.df_denom, self.df_num)
+            return '<F contrast: F=%s, df_denom=%d, df_num=%d>' % \
+                   (`self.F`, self.df_denom, self.df_num)
         else:
-            return '<T contrast: effect=%s, sd=%s, t=%s, df_denom=%d>' % (`self.effect`, `self.sd`, `self.t`, self.df_denom)
+            return '<T contrast: effect=%s, sd=%s, t=%s, df_denom=%d>' % \
+                   (`self.effect`, `self.sd`, `self.t`, self.df_denom)
             
 
 class Contrast:
@@ -52,7 +54,7 @@
 
     """
 
-    def __init__(self, term, formula, name='', **keywords):
+    def __init__(self, term, formula, name=''):
         self.term = term
         self.formula = formula
         if name is '':
@@ -61,7 +63,8 @@
             self.name = name
 
     def __str__(self):
-        return '<contrast:%s>' % `{'term':str(self.term), 'formula':str(self.formula)}`
+        return '<contrast:%s>' % \
+               `{'term':str(self.term), 'formula':str(self.formula)}`
 
     def getmatrix(self, evaldesign=True, **keywords):
         """
@@ -92,7 +95,7 @@
         except:
             self.rank = 1
 
-def contrastfromcols(T, D, pseudo=None, warn=True):
+def contrastfromcols(T, D, pseudo=None):
     """
     From an n x p design matrix D and a matrix T, tries
     to determine a p x q contrast matrix C which