Changeset 7706:63bdacc97605

Timestamp:

12/06/07 02:53:18 (5 years ago)

Author:

Mike Hansen <mhansen@…>

Branch:

default

Message:

Fixed #533.

File:

• sage/calculus/calculus.py (modified) (11 diffs)

sage/calculus/calculus.py

@@ -1122 +1122 @@
         return ans
 
+    def number_of_arguments(self):
+        """
+        Returns the number of arguments the object can take.
+
+        EXAMPLES:
+            sage: a,b,c = var('a,b,c')
+            sage: foo = function('foo', a,b,c)
+            sage: foo.number_of_arguments()
+            3
+        """
+        return len(self.variables())
+
     def _has_op(self, operator):
         """
@@ -1188 +1200 @@
             sage: f(x=3,y=4)
             7
+
+            sage: a = (2^(8/9))
+            sage: a(4)
+            Traceback (most recent call last):
+            ...
+            ValueError: the number of arguments must be less than or equal to 0
+
         """
         if len(args) == 0:
@@ -3017 +3036 @@
         return sys_init(self._obj, system)
 
+    def number_of_arguments(self):
+        """
+        Returns the number of arguments this object can take.
+
+        EXAMPLES:
+            sage: SR = SymbolicExpressionRing()
+            sage: a = SR(e)
+            sage: a.number_of_arguments()
+            0
+        """
+        return 0
+
 def maxima_init(x):
     try:
@@ -3268 +3299 @@
         return SymbolicArithmetic([self, right], operator.pow)
 
+
 class SymbolicPolynomial(Symbolic_object):
     """
@@ -3350 +3382 @@
         return tuple(variables)
 
+    def number_of_arguments(self):
+        """
+        Returns the number of arguments this object can take.  For
+        SymbolicPolynomials, this is just the number of variables
+        of the polynomial.
+        
+        EXAMPLES:
+            sage: R.<x> = QQ[]; S.<y> = R[]
+            sage: f = x+y*x+y^2
+            sage: g = SR(f)
+            sage: g.number_of_arguments()
+            2
+        """
+        return len(self.variables())
+
     def polynomial(self, base_ring):
         """
@@ -3415 +3462 @@
         self.__variables = vars
         return vars
+
+    def number_of_arguments(self):
+        """
+        Returns the number of arguements this object can take.
+
+        EXAMPLES:
+            sage: x,y,z = var('x,y,z')
+            sage: (x+y).number_of_arguments()
+            2
+            sage: (x+1).number_of_arguments()
+            1
+            sage: (sin+1).number_of_arguments()
+            1
+            sage: (sin+x).number_of_arguments()
+            1
+            sage: (sin+x+y).number_of_arguments()
+            2
+            sage: (sin(z)+x+y).number_of_arguments()
+            3
+            sage: (sin+cos).number_of_arguments()
+            1
+            sage: (sin(x+y)).number_of_arguments()
+            2
+            
+            sage: ( 2^(8/9) - 2^(1/9) )(x-1)
+            Traceback (most recent call last):
+            ...
+            ValueError: the number of arguments must be less than or equal to 0
+
+        """
+        variables = self.variables()
+
+        #We need to do this maximum to correctly handle the case where
+        #self is something like (sin+1)
+        return max( max(map(lambda i: i.number_of_arguments(), self._operands)+[0]), len(variables) )
 
 def var_cmp(x,y):
@@ -3526 +3608 @@
             variables = list( self.variables() )
 
-            if len(args) > len(variables) and len(args) > 1:
-                raise ValueError, "the number of arguments must be less than or equal to %s"%len(variables)
+            if len(args) > self.number_of_arguments():
+                raise ValueError, "the number of arguments must be less than or equal to %s"%self.number_of_arguments()
             
             new_ops = []
@@ -4054 +4136 @@
         return (self, )
 
+    def number_of_arguments(self):
+        """
+        Returns the number of arguments of self.
+
+        EXAMPLES:
+            sage: x = var('x')
+            sage: x.number_of_arguments()
+            1
+        """
+        return 1
+
     def __cmp__(self, right):
         if isinstance(right, SymbolicVariable):
@@ -4280 +4373 @@
     def arguments(self):
         return self.args()
+
+    def number_of_arguments(self):
+        """
+        Returns the number of arguments of self.
+
+        EXAMPLES:
+            sage: a = var('a')
+            sage: g(x) = sin(x) + a
+            sage: g.number_of_arguments()
+            1
+            sage: g(x,y,z) = sin(x) - a + a
+            sage: g.number_of_arguments()
+            3
+        """
+        return len(self.args())
 
     def _maxima_init_(self):
@@ -4856 +4964 @@
         return complex(eval(a))
         
+    def number_of_arguments(self):
+        """
+        Returns the number of arguments of self.
+        
+        EXAMPLES:
+            sage: sin.variables()
+            ()
+            sage: sin.number_of_arguments()
+            1
+        """
+        return 1
 
 _syms = {}
@@ -5959 +6078 @@
         self.__variables = vars
         return vars
+
 
 class SymbolicFunctionEvaluation_delayed(SymbolicFunctionEvaluation):