Changeset 1069:98129ba8f46b for sage/libs/cf/cf.pyxe

Timestamp:

08/07/06 14:17:09 (7 years ago)

Author:

Martin Albrecht <malb@…>

Branch:

default

Message:

[project @ cf.CF indentation issues (again)]

File:

• sage/libs/cf/cf.pyxe (modified) (7 diffs)

sage/libs/cf/cf.pyxe

@@ -144 +144 @@
         INPUT:
 
-            name -- The level of the variable is specified to be the
-            level of the variable which has name name. That means that
-            the generated object can not only be a polynomial variable
-            but also an algebraic or transcendental variable. In the
-            case that there is no variable with name name the
-            generated variable refers to the anonymous polynomial
-            variable which has the lowest level. After the
-            construction the name of the variable is set to name.
-
-            If name is an integer it is interpreted as a level.
+            name -- The level of the variable is specified to be the
+            level of the variable which has name name. That means that
+            the generated object can not only be a polynomial variable
+            but also an algebraic or transcendental variable. In the
+            case that there is no variable with name name the
+            generated variable refers to the anonymous polynomial
+            variable which has the lowest level. After the
+            construction the name of the variable is set to name.
+
+            If name is an integer it is interpreted as a level.
 
             level -- The constructor generates an object of class
@@ -210 +210 @@
         """
         #embed{ int Variable_level(void *obj)
-        return ((Variable *)obj)->level();
+        return ((Variable *)obj)->level();
         #}embed
 
@@ -221 +221 @@
         """
         #embed{ char Variable_name(void *obj)
-        return ((Variable *)obj)->name();
+        return ((Variable *)obj)->name();
         #}embed
 
@@ -250 +250 @@
         """
         #embed{ int Variable_cmp(void *obj,void *obj2)
-        if(*(Variable *)obj == *(Variable *)obj2) {
+        if(*(Variable *)obj == *(Variable *)obj2) {
            return 0;
-        } else if( *(Variable *)obj < *(Variable *)obj2) {
-           return -1;
+        } else if( *(Variable *)obj < *(Variable *)obj2) {
+           return -1;
         } else if( *(Variable *)obj > *(Variable *)obj2) {
-           return 1;
+           return 1;
         }    
         #}embed
@@ -505 +505 @@
         #}embed
 
-        cdef CanonicalForm cRight
-        cdef CanonicalForm cLeft
-        try:
-            cLeft = CanonicalForm(left)
-            cRight = CanonicalForm(right)
-        except TypeError:
-            raise ArithmeticError, "Cannot add %s and %s"%(left,right)
-        _sig_on
-        return make_CF(CF_add(cLeft.thisptr,cRight.thisptr))
+        if not isinstance(left,CanonicalForm):
+            left,right = right,left
+        if not isinstance(right,CanonicalForm):
+            right = CanonicalForm(right)
+        _sig_on
+        return make_CF(CF_add((<CanonicalForm>left).thisptr,(<CanonicalForm>right).thisptr))
 
     def __sub__(left, right):
@@ -649 +646 @@
         """
         #embed{ int CF_cmp(void *obj,void *obj2)
-        if( *(CanonicalForm *)obj == *(CanonicalForm *)obj2 ) {
+        if( *(CanonicalForm *)obj == *(CanonicalForm *)obj2 ) {
            return 0;
-        } else if(*(CanonicalForm *)obj < *(CanonicalForm *)obj2) {
-           return -1;
+        } else if(*(CanonicalForm *)obj < *(CanonicalForm *)obj2) {
+           return -1;
         } else if(*(CanonicalForm *)obj > *(CanonicalForm *)obj2) {
-           return 1;
+           return 1;
         }
         #}embed
@@ -1330 +1327 @@
             return r(polydict.PolyDict(d))
 
+    def lcm(CanonicalForm self,right):
+        #embed{ void *CF_lcm(void *l, void *r)
+        return new CanonicalForm(lcm(*(CanonicalForm*)l,(*(CanonicalForm*)r)));
+        #}embed
+
+        if not isinstance(right,CanonicalForm):
+            right = CanonicalForm(right)
+        _sig_on
+        return make_CF(CF_lcm(self.thisptr,(<CanonicalForm>right).thisptr))
+
+
 
 CF =  CanonicalForm