Changeset 404f45 in git

Timestamp:

Jan 6, 2015, 2:34:49 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

d853f2fa59455393dace4230a5236621ec346619

Parents:

1a4ddd6e11ed47d58a9c10975aa210bf8fcf2868

Message:

primdec: copying rings

File:

• Singular/LIB/primdec.lib (modified) (15 diffs)

Singular/LIB/primdec.lib

@@ -1907 +1907 @@
         rl[2]=list(rl2[1..nnp]);
         rl[3]=list(list(order,1:nnp),list("C",0));
-    }    
+    }
     else
     {
@@ -1913 +1913 @@
     }
   }
-  
+
   def quotring=ring(rl);
   return(quotring);
@@ -1960 +1960 @@
    i=qr[1];
 
-   execute ("ring gnir = ("+charstr(basering)+"),("+varstr(basering)+"),("
-             +ordstr(basering)+");");
-
+   def gnir=ring(ringlist(@P));
+   setring gnir;
 
    ideal i=fetch(@P,i);
@@ -2432 +2431 @@
                                 &&(find(ordstr(basering),"s")==0))
   {
-     execute("ring gnir = ("+charstr(basering)+"),("+varstr(basering)+"),("
-                              +ordstr(basering)+");");
+     def gnir=ring(ringlist(basering));
+     setring gnir;
      ideal i=imap(P,i);
      ideal j=i;
@@ -2537 +2536 @@
                                 &&(find(ordstr(basering),"s")==0))
   {
-     execute("ring gnir = ("+charstr(basering)+"),("+varstr(basering)+"),("
-                              +ordstr(basering)+");");
+     def gnir=ring(ringlist(basering));
+     setring gnir;
      ideal i=imap(P,i);
      ideal j=i;
@@ -3143 +3142 @@
   if(ordstr(@P)[1]=="w")
   {
-    execute("ring @Phelp=("+charstr(gnir)+"),("+varstr(gnir)+"),("+ordstr(@P)+");");
+    list gnir_l=ringlist(gnir);
+    list @P_l=ringlist(@P);
+    gnir_l[3]=@P_l[3]; // ord
+    def @Phelp=ring(gnir_l);
+    setring @Phelp;
+    kill gnir_l,@P_l;
   }
   else
@@ -3184 +3188 @@
     //change the ring
     {
-      execute("ring gnir1 = ("+charstr(basering)+"),("+varstr(basering)+"),("
-                              +ordstr(basering)+");");
+      def gnir1=ring(ringlist(basering));
+      setring gnir1;
       ideal @j=fetch(gnir,@j);
       attrib(@j,"isSB",1);
@@ -3499 +3503 @@
            //change the ring
         {
-          execute("ring gnir1 = ("+charstr(basering)+"),("+
-               varstr(basering)+"),("+ordstr(basering)+");");
+          def gnir1=ring(ringlist(basering));
+          setring gnir1;
           ideal @j=fetch(gnir,jkeep);
           attrib(@j,"isSB",1);
@@ -3858 +3862 @@
 
 ///////////////////////////////////////////////////////////////////////////////
- proc zeroRad(ideal I,list #)
+proc zeroRad(ideal I,list #)
 "USAGE:  zeroRad(I) , I a zero-dimensional ideal
- RETURN: the radical of I
- NOTE:  Algorithm of Kemper
- EXAMPLE: example zeroRad; shows an example
+RETURN: the radical of I
+NOTE:  Algorithm of Kemper
+EXAMPLE: example zeroRad; shows an example"
 {
    ASSUME(0, hasFieldCoefficient(basering) );
@@ -3898 +3902 @@
    for(i=1;i<=n;i++)
    {
-      l[i]=sep(F[i],i);
-      F[i]=l[i][1];
-      if(l[i][2]>k){k=l[i][2];}  //computation of the maximal k
+     l[i]=sep(F[i],i);
+     F[i]=l[i][1];
+     if(l[i][2]>k){k=l[i][2];}  //computation of the maximal k
    }
 
    if((k==0)||(m==0)) //the separable case
    {
-    intvec save=option(get);option(redSB);
-    I=interred(I+F);option(set,save);return(I);
+     intvec save=option(get);
+     option(redSB);
+     I=interred(I+F);
+     option(set,save);
+     return(I);
    }
    //I=simplify(I,1);
@@ -3935 +3942 @@
    for(i=1;i<=m;i++)
    {
-      J=J,var(i)^k-var(m+n+i);
-      el=el*var(i);
+     J=J,var(i)^k-var(m+n+i);
+     el=el*var(i);
    }
 
@@ -6281 +6288 @@
     //change the ring
     {
-      execute("ring gnir1 = ("+charstr(basering)+"),("+varstr(basering)+"),("
-                              +ordstr(basering)+");");
+      def gnir1=ring(ringlist(basering));
+      setring gnir1;
       ideal @j = fetch(@P, I);
       attrib(@j, "isSB", 1);
@@ -7342 +7349 @@
   if(ordstr(@P)[1]=="w")
   {
-    execute("ring @Phelp=("+charstr(gnir)+"),("+varstr(gnir)+"),("+ordstr(@P)+");");
+    def @Phelp=ring(ringlist(gnir));
+    setring @Phelp;
   }
   else
@@ -7522 +7530 @@
            //change the ring
            {
-              execute("ring gnir1 = ("+charstr(basering)+"),("+
-                varstr(basering)+"),("+ordstr(basering)+");");
+              def gnir1=ring(ringlist(basering));
+              setring gnir1;
               ideal @j=fetch(gnir,jkeep);
               attrib(@j,"isSB",1);
@@ -7861 +7869 @@
    //change the ring
    {
-     execute("ring gnir1 = ("+charstr(basering)+"),("+varstr(basering)+"),("
-                              +ordstr(basering)+");");
+     def gnir1=ring(ringlist(basering));
+     setring gnir1;
      ideal @j = fetch(gnir, @j);
      attrib(@j,"isSB",1);