Changeset 729b07 in git for Singular

Timestamp:

Oct 2, 2016, 12:17:02 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

232f78f004b2f727c65dfc7f7ace7452e65dab43e946361c872c62f94d3098cd85858e5069cb55fa

Parents:

c715b624176bba2a51d05f1f060368d106adda27

Message:

GPfister: classify_aeq.lib

File:

• Singular/LIB/classify_aeq.lib (modified) (6 diffs)

Singular/LIB/classify_aeq.lib

@@ -1715 +1715 @@
     ideal G1=lead(G);
     ideal I1=lead(I);
-     poly p1=lead(p);
+    poly p1=lead(p);
     //create new ring with extra variables -
     execute
     ("ring T=("+charstr(br)+",x(1),z(1..n)),(x(2),y(1..m)),dp;");
-     execute
+    execute
     ("ring R=("+charstr(br)+"),(x(1..2),y(1..m),z(1..n)),(lp(2),dp(m),dp(n));");
 
-     map phi = br,x(1);
-     ideal P = phi(G1);
-     ideal S = phi(I1);
-     poly check = phi(p1);
-     poly keep=S[1];
-     S=S/keep;
-
-     check=check/keep;
-     ideal M;
-     poly q;
-     for (int i=1;i<=m;i=i+1)
-     {
+    map phi = br,x(1);
+    ideal P = phi(G1);
+    ideal S = phi(I1);
+    poly check = phi(p1);
+    poly keep=S[1];
+    S=S/keep;
+
+    check=check/keep;
+    ideal M;
+    poly q;
+    for (int i=1;i<=m;i=i+1)
+    {
          M[i]=S[i]-y(i);
-     }
-     for (i=1;i<=n;i=i+1)
-     {
+    }
+    for (i=1;i<=n;i=i+1)
+    {
         M[m+i]=P[i]-z(i);
-     }
-     M[size(M)+1]=check-x(2);
-     check=check*keep;
-
-     option(redSB);
-     M=std(M);
-     int j,s;
-
-     for(i=1;i<=size(M);i++)
-     {
+    }
+    M[size(M)+1]=check-x(2);
+    check=check*keep;
+
+    option(redSB);
+    M=std(M);
+    int j,s;
+
+    for(i=1;i<=size(M);i++)
+    {
          if((deg(M[i]/x(2))==0)&&(M[i]/x(1)==0))
          {
@@ -1757 +1757 @@
                }
                M[i]=M[i]-q+q*y(1);
-             q=M[i];
+               q=M[i];
                setring T;
                poly q=imap(R,q);
-             s=deg(q);
+               s=deg(q);
                setring R;
                if(s==1){check=simplify(q,1);break;}
          }
-     }
-     setring br;
-     map psi=R,maxideal(1),p,I,G;
-     return(psi(check));
+    }
+    setring br;
+    map psi=R,maxideal(1),p,I,G;
+    return(psi(check));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -1781 +1781 @@
          f=sagbiNFMODO(f,G,I,b);
     }
-    return(lead(f)+sagbiNFMOD(p-lead(p),G,I,b));
+    return(lead(f)+sagbiNFMOD(f-lead(f),G,I,b));
 }
 ////////////////////////////////////////////////////////////////////////////////
@@ -2144 +2144 @@
             phi=R,var(1)-1/number(m)*I[2][i]/var(1)^(m-1);
             I=phi(I);
+            G=sagbiAlg(I,b);
             I[1]=lead(I[1])+reduc(I[1]-lead(I[1]),G,b);
             I=normalMap(I,b);
@@ -2156 +2157 @@
                phi=R,g;
                I=phi(I);
+               G=sagbiAlg(I,b);
                I[1]=lead(I[1])+reduc(I[1]-lead(I[1]),G,b);
                I[2]=lead(I[2])+reduc(I[2]-lead(I[2]),G,b);
@@ -2163 +2165 @@
          }
       }
-      G=sagbiAlg(I,b);
    }
    return(list(I,v,w,l,moduli));