Changeset 7380:ce3daeb811aa

Timestamp:

11/17/07 09:18:58 (6 years ago)

Author:

Martin Albrecht <malb@…>

Branch:

default

Message:

fixing #991 (problem in interaction with Singular subprocesses)

Location:

sage/rings/polynomial

Files:

• multi_polynomial_libsingular.pyx (modified) (2 diffs)
• polynomial_singular_interface.py (modified) (3 diffs)

sage/rings/polynomial/multi_polynomial_libsingular.pyx

@@ -795 +795 @@
             if self.base_ring().is_finite():
                 R.set_ring() #sorry for that, but needed for minpoly
-                if  singular.eval('minpoly') != self.__minpoly:
+                if  singular.eval('minpoly') != "(" + self.__minpoly + ")":
                     singular.eval("minpoly=%s"%(self.__minpoly))
+                    self.__minpoly = singular.eval('minpoly')[1:-1] # store in correct format
             return R
         except (AttributeError, ValueError):
@@ -862 +863 @@
             gen = str(self.base_ring().gen())
             r = singular.ring( "(%s,%s)"%(self.characteristic(),gen), _vars, order=order)
-            self.__minpoly = "("+(str(self.base_ring().modulus()).replace("x",gen)).replace(" ","")+")"
-            singular.eval("minpoly=%s"%(self.__minpoly) )
-
+            self.__minpoly = (str(self.base_ring().modulus()).replace("x",gen)).replace(" ","")
+            if  singular.eval('minpoly') != "(" + self.__minpoly + ")":
+                singular.eval("minpoly=%s"%(self.__minpoly) )
+                self.__minpoly = singular.eval('minpoly')[1:-1]
             self.__singular = r
         else:    

sage/rings/polynomial/polynomial_singular_interface.py

@@ -165 +165 @@
                     number_field.all.is_NumberField(self.base_ring()):
                 R.set_ring() #sorry for that, but needed for minpoly
-                if  singular.eval('minpoly') != self.__minpoly:
+                if  singular.eval('minpoly') != "(" + self.__minpoly + ")":
                     singular.eval("minpoly=%s"%(self.__minpoly))
+                    self.__minpoly = singular.eval('minpoly')[1:-1]
+
             return R
         except (AttributeError, ValueError):
@@ -218 +220 @@
             gen = str(self.base_ring().gen())
             r = singular.ring( "(%s,%s)"%(self.characteristic(),gen), _vars, order=order, check=False)
-            self.__minpoly = "("+(str(self.base_ring().modulus()).replace("x",gen)).replace(" ","")+")"
-            singular.eval("minpoly=%s"%(self.__minpoly) )
+            self.__minpoly = (str(self.base_ring().modulus()).replace("x",gen)).replace(" ","")
+            if  singular.eval('minpoly') != "(" + self.__minpoly + ")":
+                singular.eval("minpoly=%s"%(self.__minpoly) )
+                self.__minpoly = singular.eval('minpoly')[1:-1]
 
             self.__singular = r
+
         elif number_field.all.is_NumberField(self.base_ring()):
             # not the rationals!
@@ -229 +234 @@
             poly_str=str(poly).replace(poly_gen,gen)
             r = singular.ring( "(%s,%s)"%(self.characteristic(),gen), _vars, order=order, check=False)
-            self.__minpoly = "("+(poly_str).replace(" ","")+")"
-            singular.eval("minpoly=%s"%(self.__minpoly) )
+            self.__minpoly = (poly_str).replace(" ","")
+            if  singular.eval('minpoly') != "(" + self.__minpoly + ")":
+                singular.eval("minpoly=%s"%(self.__minpoly) )
+                self.__minpoly = singular.eval('minpoly')[1:-1]
 
             self.__singular = r
-                        
         
         else: