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

[scipy-svn at scipy.org]

Author: jonathan.taylor
Date: 2006-07-11 12:47:07 -0500 (Tue, 11 Jul 2006)
New Revision: 2078

Modified:
   trunk/Lib/sandbox/models/formula.py
Log:
small change in name of Term.__pow__ return value


Modified: trunk/Lib/sandbox/models/formula.py
===================================================================
--- trunk/Lib/sandbox/models/formula.py	2006-07-11 14:02:18 UTC (rev 2077)
+++ trunk/Lib/sandbox/models/formula.py	2006-07-11 17:47:07 UTC (rev 2078)
@@ -199,14 +199,19 @@
         try:
             power = float(power)
         except:
-            raise ValueError, 'expecting an integer'
+            raise ValueError, 'expecting a float'
 
-        name = '%s^%0.2f' % (self.name, power)
+        if power == int(power):
+            name = '%s^%d' % (self.name, int(power))
+        else:
+            name = '%s^%0.2f' % (self.name, power)
 
-        def func(namespace=terms, power=power, **extra):
+        def func(obj=self, namespace=terms, power=power, **extra):
             x = N.asarray(obj(namespace=namespace, **extra))
             return N.power(x, power)
-        return Term(name, func=func)
+        value = Term(name, func=func)
+        value.power = power
+        return value
 
 class FuncQuant(Quantitative):
 
@@ -308,6 +313,7 @@
                 pass
         else:
             if allvals != []:
+                allvals = N.concatenate(allvals)
                 n = allvals.shape[1]
                 allvals = N.concatenate([N.ones((1,n), N.float64), allvals])
             elif nrow <= 1: