Changeset 6706:3bad883a6c4d for sage/interfaces/singular.py

Timestamp:

10/05/07 21:22:57 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

Change so that singular variables are not killed unless they are user defined.

I learned about the defined command in Singular, and change the code
to only kill variables when they have been user-defined. This is
actually much cleaner code (no exception handling needed for it), and
fixes the problem I was having with polynomial_singular_interface.py.

File:

• sage/interfaces/singular.py (modified) (2 diffs)

sage/interfaces/singular.py

@@ -381 +381 @@
         Clear the variable named var.
         """
-        try:
-            self.eval('kill %s;'%var)
-        except RuntimeError:
-            pass
-        
-
-        # Reusing var names causes problems, because of strong typing.
-        # If you run the multi_polynomial_ideal.py doctest you'll see this.
-        ##self._available_vars.append(var)
-
-        #Could be an alternative to killing, if that is a problem...
-        #self.eval('def %s=0;'%var)
+        self.eval('if(defined(%s)>0){kill %s;}'%(var,var))
 
     def _create(self, value, type='def'):
@@ -609 +598 @@
             3*a
         """
-        try:
-            self.eval('kill %s'%(str(vars)[1:-1]))
-        except (RuntimeError, TypeError):  # error if variable is not already defined.
-            pass
+        if len(vars) > 2:
+            s = '; '.join(['if(defined(%s)>0){kill %s;};'%(x,x)
+                           for x in vars[1:-1].split(',')])
+            self.eval(s);
+
         if check and isinstance(char, (int, long, sage.rings.integer.Integer)):
             if char != 0: