Changeset 9102bb in git

Timestamp:

Aug 6, 2019, 3:21:38 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

695288e2d57e72ad6969a3bdcc02d8d019857a56

Parents:

48f20b0402356f0f7fa136772209441b8b6d869cf006a1a0d5b28b1d503bf27a7ce5902096a20eba

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2019-08-06 15:21:38+02:00

git-committer:

GitHub <noreply@github.com>2019-08-06 15:21:38+02:00

Message:

Merge pull request #944 from kabouzeid/lp_syzygies

Lp syzygies (work in progress)

Files:

• Singular/LIB/algebra.lib (modified) (1 diff)
• Singular/LIB/assprimeszerodim.lib (modified) (1 diff)
• Singular/LIB/chern.lib (modified) (1 diff)
• Singular/LIB/ellipticcovers.lib (modified) (23 diffs)
• Singular/LIB/finvar.lib (modified) (1 diff)
• Singular/LIB/goettsche.lib (modified) (11 diffs)
• Singular/LIB/graal.lib (modified) (1 diff)
• Singular/LIB/numerAlg.lib (modified) (9 diffs)
• Singular/LIB/numerDecom.lib (modified) (7 diffs)
• Singular/LIB/resolve.lib (modified) (6 diffs)
• Singular/LIB/rinvar.lib (modified) (2 diffs)
• Singular/LIB/sing.lib (modified) (1 diff)
• Singular/LIB/standard.lib (modified) (3 diffs)
• Singular/LIB/tropical.lib (modified) (9 diffs)
• Singular/dyn_modules/freealgebra/freealgebra.cc (modified) (2 diffs)
• Singular/dyn_modules/python/Makefile.am (modified) (1 diff)
• Singular/dyn_modules/systhreads/Makefile.am (modified) (1 diff)
• Singular/iparith.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (3 diffs)
• Singular/table.h (modified) (1 diff)
• Tst/Short/absfact.res.gz.uu (modified) (1 diff)
• Tst/Short/absfact.stat (modified) (1 diff)
• Tst/Short/bug_zp.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_zp.stat (modified) (1 diff)
• doc/NEWS.texi (modified) (1 diff)
• doc/reference.doc (modified) (previous)
• factory/FLINTconvert.cc (modified) (6 diffs)
• factory/FLINTconvert.h (modified) (1 diff)
• factory/Makefile.am (modified) (1 diff)
• factory/NTLconvert.cc (modified) (1 diff)
• factory/canonicalform.cc (modified) (2 diffs)
• factory/cf_char.cc (modified) (1 diff)
• factory/cf_gcd.cc (modified) (4 diffs)
• factory/cf_switches.cc (modified) (1 diff)
• factory/facFqBivar.cc (modified) (3 diffs)
• kernel/GBEngine/kstd1.cc (modified) (4 diffs)
• kernel/GBEngine/kstd1.h (modified) (1 diff)
• kernel/GBEngine/kstd2.cc (modified) (2 diffs)
• kernel/ideals.cc (modified) (2 diffs)
• kernel/mod2.h (modified) (1 diff)
• kernel/preimage.cc (modified) (1 diff)
• libpolys/coeffs/Makefile.am (modified) (1 diff)
• libpolys/coeffs/rintegers2.cc (modified) (2 diffs)
• libpolys/polys/clapconv.cc (modified) (3 diffs)
• libpolys/polys/clapsing.cc (modified) (1 diff)
• libpolys/polys/flint_mpoly.cc (modified) (26 diffs)
• libpolys/polys/monomials/ring.cc (modified) (4 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)
• libpolys/polys/operations/p_Mult_q.cc (modified) (5 diffs)
• libpolys/polys/shiftop.cc (modified) (8 diffs)
• libpolys/polys/shiftop.h (modified) (1 diff)

Singular/LIB/algebra.lib

@@ -1032 +1032 @@
   }
   // --------------------- change of variable names -------------------------
-  execute("ring @bsr = ("+charstr(bsr)+"),y(1..m),("+os+");");
+  list l2;
+  for (int ii = 1; ii <= m; ii++)
+  {
+    l2[ii] = "y("+string(ii)+")";
+  }
+  ring @bsr = create_ring(ringlist(bsr)[1], l2, "("+os+")", "no_minpoly");
   ideal J = fetch(bsr,J);
   ideal PHI = fetch(bsr,PHI);

Singular/LIB/assprimeszerodim.lib

@@ -364 +364 @@
 //=== mapping T to p and test if d=deg(F)
    def R = basering;
-   execute("ring Rhelp = ("+charstr(R)+"), T, dp;");
+   ring Rhelp = create_ring(ringlist(R)[1], "T", "dp", "no_minpoly");
    setring R;
    map phi = Rhelp,p;

Singular/LIB/chern.lib

@@ -3305 +3305 @@
   int n=nvars(basering);
   def br@=basering; // remember the base ring
-  execute("ring r@=("+ charstr(basering) +"),("+varstr(basering)+",homvar@), dp;");
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+",homvar@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   ideal I=F(I);

Singular/LIB/ellipticcovers.lib

@@ -67 +67 @@
 
 
-proc mod_init()
-{
-newstruct("graph","list vertices, list edges");
-newstruct("Net","list rows");
-
-system("install","graph","print",printGraph,1);
-system("install","Net","print",printNet,1);
-system("install","Net","+",catNet,2);
-
-}
-
+static proc mod_init()
+{
+  newstruct("graph","list vertices, list edges");
+  newstruct("Net","list rows");
+
+  system("install","graph","print",printGraph,1);
+  system("install","Net","print",printNet,1);
+  system("install","Net","+",catNet,2);
+}
 
 static proc catNet(Net N, Net M)
 {
-list L;
-list LN=N.rows;
-list LM=M.rows;
-int widthN=size(LN[1]);
-int widthM=size(LM[1]);
-int nm=max(size(LN),size(LM));
-for (int j=1; j<=nm; j++)
-{
+  list L;
+  list LN=N.rows;
+  list LM=M.rows;
+  int widthN=size(LN[1]);
+  int widthM=size(LM[1]);
+  int nm=max(size(LN),size(LM));
+  for (int j=1; j<=nm; j++)
+  {
     if (j>size(LN)){LN[j]=emptyString(widthN);}
     if (j>size(LM)){LM[j]=emptyString(widthM);}
     L[j]=LN[j]+LM[j];
-}
-Net NM;
-NM.rows=L;
-return(NM);}
+  }
+  Net NM;
+  NM.rows=L;
+  return(NM);
+}
 
 
@@ -111 +110 @@
 static proc printNet(Net N)
 {
-list L = N.rows;
-for (int j=1; j<=size(L); j++)
-{
-   print(L[j]);
-}
-}
-
-static proc net(def M){
-  if (typeof(M)=="list"){
+  list L = N.rows;
+  for (int j=1; j<=size(L); j++)
+  {
+    print(L[j]);
+  }
+}
+
+static proc net(def M)
+{
+  if (typeof(M)=="list")
+  {
     return(netList(M));
   }
@@ -126 +127 @@
   L[1]=string(M);
   N.rows=L;
-return(N);}
+  return(N);
+}
 
 
@@ -147 +149 @@
   G;
 }
-
-
 
 proc makeGraph(list v, list e)
@@ -170 +170 @@
   G;
 }
-
 
 proc propagator(def xy, def d)
@@ -195 +194 @@
 "
 {
-  if ((typeof(xy)=="list")||(typeof(d)=="int")) {
+  if ((typeof(xy)=="list")||(typeof(d)=="int"))
+  {
     number x = xy[1];
     number y = xy[2];
@@ -201 +201 @@
     if (d==0) {return(x^2*y^2/(x^2-y^2)^2);}
     number p=0;
-    for (int j=1; j<=d; j++){
+    for (int j=1; j<=d; j++)
+    {
        if (d%j==0){p=p+(j*x^(4*j)+j*y^(4*j))/(x*y)^(2*j);}
     }
     return(p);
   }
-  if ((typeof(xy)=="graph")||(typeof(d)=="list"))  {
+  if ((typeof(xy)=="graph")||(typeof(d)=="list"))
+  {
     list xl = ringlist(basering)[1][2];
     list ed = xy.edges;
     number f=1;
-    for (int j=1; j<=size(ed); j++){
+    for (int j=1; j<=size(ed); j++)
+    {
        execute("number xx1 = "+xl[ed[j][1]]);
        execute("number xx2 = "+xl[ed[j][2]]);
@@ -219 +222 @@
     return(f);
   }
-  if ((typeof(xy)=="graph")||(typeof(d)=="int"))  {
-  }
-ERROR("wrong input type");}
+  if ((typeof(xy)=="graph")||(typeof(d)=="int"))
+  {
+  }
+  ERROR("wrong input type");
+}
 example
 { "EXAMPLE:"; echo=2;
@@ -230 +235 @@
   propagator(G,list(1,1,1,0,0,0));
 }
-
-
-
-
 
 proc computeConstant(number f,number xx)
@@ -240 +241 @@
 RETURN:  number, the constant coefficient of the Laurent series of f in the variable x.
 THEORY:  Computes the constant coefficient of the Laurent series by iterative differentiation.
-
 KEYWORDS: Laurent series
 EXAMPLE:  example computeConstant; shows an example
@@ -250 +250 @@
   int j;
   poly de;
-  while (tst==0){
-     ff=f*xx^k;
-     for (j=1; j<=k; j++){
-        ff=diff(ff,xx)/j;
-     }
-  de = subst(denominator(ff),xx,0);
-  if (de!=0){
-     poly nu = subst(numerator(ff),xx,0);
-     return(number(nu/de));
-  }
-  k=k+1;
-  }
-ERROR("error in computeConstant");}
+  while (tst==0)
+  {
+    ff=f*xx^k;
+    for (j=1; j<=k; j++)
+    {
+      ff=diff(ff,xx)/j;
+    }
+    de = subst(denominator(ff),xx,0);
+    if (de!=0)
+    {
+      poly nu = subst(numerator(ff),xx,0);
+      return(number(nu/de));
+    }
+    k++;
+  }
+  ERROR("error in computeConstant");
+}
 example
 { "EXAMPLE:"; echo=2;
@@ -270 +274 @@
   computeConstant(P,x2);
 }
-
-
-
 
 proc evaluateIntegral(number P, list xL)
@@ -289 +290 @@
 {
   number p = P;
-  for(int j=1; j<=size(xL); j++){
+  for(int j=1; j<=size(xL); j++)
+  {
      p=computeConstant(p,xL[j]);
   }
-return(p);}
+  return(p);
+}
 example
 { "EXAMPLE:"; echo=2;
@@ -300 +303 @@
   evaluateIntegral(p,list(x1,x3,x4,x2));
 }
-
 
 proc permute (list N)
@@ -314 +316 @@
 "
 {
-   int i,j,k;
-   list L,L1;
-   if (size(N)==1){
-     return(list(N));
-   } else {
-     k=1;
-     for (i=1; i<=size(N); i++){
-       L=permute(delete(N,i));
-       for (j=1; j<=size(L); j++){
-          L1[k]=L[j]+list(N[i]);
-          k=k+1;
-       }
-     }
-   }
-return(L1);}
+  int i,j,k;
+  list L,L1;
+  if (size(N)==1)
+  {
+    return(list(N));
+  }
+  else
+  {
+    k=1;
+    for (i=1; i<=size(N); i++)
+    {
+      L=permute(delete(N,i));
+      for (j=1; j<=size(L); j++)
+      {
+        L1[k]=L[j]+list(N[i]);
+        k=k+1;
+      }
+    }
+  }
+  return(L1);
+}
 example
 { "EXAMPLE:"; echo=2;
@@ -349 +357 @@
 "
 {
-ring R = 2,(x(1..n)),dp;
-ideal I = maxideal(a);
-list L;
-for (int j=1;j<=size(I);j++){
-  L[j]=leadexp(I[j]);
-}
-return(L);}
+  ring R = 2,(x(1..n)),dp;
+  ideal I = maxideal(a);
+  list L;
+  for (int j=1;j<=size(I);j++)
+  {
+    L[j]=leadexp(I[j]);
+  }
+  return(L);
+}
 example
 { "EXAMPLE:"; echo=2;
   partitions(3,7);
 }
-
-
 
 proc gromovWitten(def P,list #)
@@ -385 +393 @@
 "
 {
-  if (typeof(P)=="number") {
-  list xl = ringlist(basering)[1][2];
-  int j;
-  for(j=1; j<=size(xl); j++){
-     execute("number n= "+xl[j]);
-     xl[j]=n;
-     kill n;
-  }
-  list pxl = permute(xl);
-  number p = 0;
-  for(j=1; j<=size(pxl); j++){
-     p=p+evaluateIntegral(P,pxl[j]);
-  }
-  return(p);
-  }
-  if (typeof(P)=="graph"){
-     if (size(#)>1){
-       return(gromovWitten(propagator(P,#)));
-     } else {
+  if (typeof(P)=="number")
+  {
+    list xl = ringlist(basering)[1][2];
+    int j;
+    for(j=1; j<=size(xl); j++)
+    {
+      execute("number n= "+xl[j]);
+      xl[j]=n;
+      kill n;
+    }
+    list pxl = permute(xl);
+    number p = 0;
+    for(j=1; j<=size(pxl); j++)
+    {
+      p=p+evaluateIntegral(P,pxl[j]);
+    }
+    return(p);
+  }
+  if (typeof(P)=="graph")
+  {
+    if (size(#)>1)
+    {
+      return(gromovWitten(propagator(P,#)));
+    }
+    else
+    {
       int d =#[1];
       list pa = partitions(size(P.edges),d);
       list re;
       int ti;
-      for (int j=1; j<=size(pa); j++) {
-       ti=timer;
-       re[j]=gromovWitten(propagator(P,pa[j]));
-       ti=timer-ti;
-       //print(string(j)+" / "+string(size(pa))+"    "+string(pa[j])+"     "+string(re[j])+"      "+string(sum(re))+"     "+string(ti));
+      for (int j=1; j<=size(pa); j++)
+      {
+        ti=timer;
+        re[j]=gromovWitten(propagator(P,pa[j]));
+        ti=timer-ti;
+        //print(string(j)+" / "+string(size(pa))+"    "+string(pa[j])+"     "+string(re[j])+"      "+string(sum(re))+"     "+string(ti));
       }
-     return(lsum(re));
-     }
+      return(lsum(re));
+    }
   }
 }
@@ -427 +443 @@
   gromovWitten(G,2);
 }
-
-
 
 proc computeGromovWitten(graph P,int d, int st, int en, list #)
@@ -443 +457 @@
 "
 {
-     number s =0;
-     list pararg;
-     list re;
-     list pa = partitions(size(P.edges),d);
-     int vb=0;
-     if (size(#)>0){vb=#[1];}
-     int ti;
-     if (vb>0){print(size(pa));}
-     for (int j=1; j<=size(pa); j++) {
-      if ((j>=st)&(j<=en)){
-       ti=timer;
-       //pararg[j]=list(propagator(G,pa[j]));
-       re[j]=gromovWitten(propagator(P,pa[j]));
-       ti=timer-ti;
-       if (vb>0){print(string(j)+" / "+string(size(pa))+"    "+string(pa[j])+"     "+string(re[j])+"      "+string(lsum(re))+"     "+string(ti));}
-      } else {re[j]=s;}
-     }
-     //list re = parallelWaitAll("gromovWitten", pararg, list(list(list(2))));
-     return(re);
+  number s =0;
+  list pararg;
+  list re;
+  list pa = partitions(size(P.edges),d);
+  int vb=0;
+  if (size(#)>0){vb=#[1];}
+  int ti;
+  if (vb>0){print(size(pa));}
+  for (int j=1; j<=size(pa); j++)
+  {
+    if ((j>=st)&(j<=en))
+    {
+      ti=timer;
+      //pararg[j]=list(propagator(G,pa[j]));
+      re[j]=gromovWitten(propagator(P,pa[j]));
+      ti=timer-ti;
+      if (vb>0){print(string(j)+" / "+string(size(pa))+"    "+string(pa[j])+"     "+string(re[j])+"      "+string(lsum(re))+"     "+string(ti));}
+    }
+    else
+    {re[j]=s;}
+  }
+  //list re = parallelWaitAll("gromovWitten", pararg, list(list(list(2))));
+  return(re);
 }
 example
@@ -471 +489 @@
   computeGromovWitten(G,2,3,7,1);
 }
-
 
 proc lsum(list L)
@@ -485 +502 @@
 {
   execute(typeof(L[1])+" s");
-  for(int j=1; j<=size(L); j++){
-     s=s+L[j];
-  }
-return(s);}
+  for(int j=1; j<=size(L); j++)
+  {
+    s=s+L[j];
+  }
+  return(s);
+}
 example
 { "EXAMPLE:"; echo=2;
@@ -494 +513 @@
   lsum(L);
 }
-
-
 
 proc generatingFunction(graph G, int d)
@@ -512 +529 @@
   int j,jj;
   list pa,L;
-  for (j=1; j<=d; j++){
+  for (j=1; j<=d; j++)
+  {
     pa = partitions(size(G.edges),j);
     L = computeGromovWitten(G,j,1,size(pa));
-    for (jj=1; jj<=size(pa); jj++) {
-       s=s+L[jj]*monomial(pa[jj]);
-    }
-  }
-return(s);}
+    for (jj=1; jj<=size(pa); jj++)
+    {
+      s=s+L[jj]*monomial(pa[jj]);
+    }
+  }
+  return(s);
+}
 example
 { "EXAMPLE:"; echo=2;

Singular/LIB/finvar.lib

@@ -1390 +1390 @@
     poly A(1)=M[1,2];                 // denominator of Molien series (for now)
     string mp=string(minpoly);
-    execute("ring R=("+charstr(br)+"),("+varstr(br)+"),ds;");
+    ring R = create_ring(ringlist(br)[1], "("+varstr(br)+")", "ds", "no_minpoly");
     if (mp!="0")
     {

Singular/LIB/goettsche.lib

@@ -81 +81 @@
   def br@=basering; // remember the base ring
   // add additional variables z@, t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", z@, t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", z@, t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   // compute the generating function by the Goettsche's formula up to degree n in t@
@@ -144 +144 @@
   def br@=basering; // remember the base ring
   // add additional variables z@, t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", z@, t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", z@, t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   // compute the generating function by the Goettsche's formula up to degree n in t@
@@ -208 +208 @@
   def br@=basering; // remember the base ring
   // add additional variables z@, t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", z@, t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", z@, t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   poly rez=1;
@@ -267 +267 @@
   def br@=basering; // remember the base ring
   // add additional variables z@, t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", z@, t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", z@, t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   // compute the generating function by the Nakajima-Yoshioka formula up to degree n in t@
@@ -322 +322 @@
   def br@=basering; // remember the base ring
   // add additional variables z@, t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", z@, t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", z@, t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   // compute the generating function by the Nakajima-Yoshioka formula up to degree n in t@
@@ -377 +377 @@
   def br@=basering; // remember the base ring
   // add additional variables z@, t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", z@, t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", z@, t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   poly rez=1;
@@ -434 +434 @@
   def br@=basering; // remember the base ring
   // add additional variables z@, t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", z@, t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", z@, t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   poly rez=1;
@@ -485 +485 @@
   def br@=basering; // remember the base ring
   // add additional variables z@, t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", z@, t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", z@, t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   poly rez=1;
@@ -536 +536 @@
   def br@=basering; // remember the base ring
   // add additional variables z@, t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", z@, t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", z@, t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   poly rez=1;
@@ -594 +594 @@
   def br@=basering; // remember the base ring
   // add additional variable t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   poly rez=(1-t@^2)*PPolyW(q, m, n, t@, d);
@@ -637 +637 @@
   def br@=basering; // remember the base ring
   // add additional variable t@ to the base ring
-  execute("ring r@= (" + charstr(basering) + "),("+varstr(basering)+", t@), dp;" );
+  ring r@ = create_ring(ringlist(basering)[1], "("+varstr(basering)+", t@)", "dp", "no_minpoly");
   execute( "map F= br@,"+varstr(br@)+";" ); // define the corresponding inclusion of rings
   poly rez=(1-t@^2)*PPolyW(q, m, n, t@, d);

Singular/LIB/graal.lib

@@ -210 +210 @@
   {
     def origin = basering;
-    execute("ring ringForGeneralPosition = ("+charstr(basering)+"),("+varstr(basering)+"),lp;");
+    ring ringForGeneralPosition = create_ring(ringlist(basering)[1], "("+varstr(basering)+")", "lp", "no_minpoly");
     ideal m = fetch(origin,m);
     newRing = 1;

Singular/LIB/numerAlg.lib

@@ -230 +230 @@
  setring W1;
  number j1=jj;
- execute("ring q=(real,0),("+varstr(S)+"),dp;");
+ ring q = create_ring("(real,0)", "("+varstr(S)+")", "dp");
  ideal I=imap(W1,I);
  ideal J=imap(W1,J);
- execute("ring qq=0,("+varstr(S)+"),dp;");
+ ring qq = create_ring(0, "("+varstr(S)+")", "dp");
  ideal I=imap(S,I);
  ideal J=imap(S,J);
@@ -315 +315 @@
  if((u^2)==0)
  {
-  execute("ring A=(real,e-1),("+varstr(S)+",I),ds;");
+  ring A = create_ring("(real,e-1)", "("+varstr(S)+",I)", "ds");
   ideal II=imap(S,J);
   list rw=imap(S,rw);
@@ -332 +332 @@
  {
   int d=dim(std(J));
-  execute("ring R=(complex,e-1,I),("+varstr(S)+"),ds;");
+  ring R = create_ring("(complex,e-1,I)", "("+varstr(S)+")", "ds");
   list w=imap(S,w);
   ideal II=imap(S,J);
@@ -355 +355 @@
   if(tt==d)
   {
-   execute("ring A=(complex,e,I),("+varstr(S)+"),dp;");
+   ring A = create_ring("(complex,e,I)", "("+varstr(S)+")", "dp");
    t=tt;
   }
   else
   {
-   execute("ring RR=(real,e-2),("+varstr(S)+",I),dp;");
+   ring RR = create_ring("(real,e-2)", "("+varstr(S)+",I)", "dp");
    ideal II=imap(S,J);
    list rw=imap(S,rw);
@@ -398 +398 @@
     setring M;
     sz1=size(SOL);
-    execute("ring RRRQ=(real,e-1),("+varstr(S)+",I),dp;");
+    ring RRRQ = create_ring("(real,e-1)", "("+varstr(S)+",I)", "dp");
     ideal HH=imap(RR,HH);
     if(dim(std(HH))==0)
@@ -413 +413 @@
    if(sz1==sz2)
    {
-    execute("ring A=(complex,e,I),("+varstr(S)+"),dp;");
+    ring A = create_ring("(complex,e,I)", "("+varstr(S)+")", "dp");
     t=d;
    }
    else
    {
-    execute("ring RQ=(real,e-1),("+varstr(S)+"),dp;");
+    ring RQ = create_ring("(real,e-1)", "("+varstr(S)+")", "dp");
     ideal II=imap(S,J);
     def RW=WitSet(II);
@@ -448 +448 @@
         if((ni+nr)<1/10^(2*e-3))
         {
-         execute("ring A=(complex,e,I),("+varstr(S)+"),dp;");
+         ring A = create_ring("(complex,e,I)", "("+varstr(S)+")", "dp");
          list W(ii)=imap(RW,W(ii));
          t=0;
@@ -459 +459 @@
       {
        def SS=Singular2bertini(W(ii));
-       execute("ring D=(complex,e,I),("+varstr(S)+",s,gamma),dp;");
+       ring D = create_ring("(complex,e,I)", "("+varstr(S)+",s,gamma)", "dp");
        string nonsin;
        ideal H,L;
@@ -504 +504 @@
          if(tr<=1/10^(2*e-3))
          {
-          execute("ring A=(complex,e,I),("+varstr(S)+"),dp;");
+          ring A = create_ring("(complex,e,I)", "("+varstr(S)+")", "dp");
           t=ii;
           ii=d+1;

Singular/LIB/numerDecom.lib

@@ -349 +349 @@
    if((n-rn)!=dd)
    {
-    execute("ring R=0,("+varstr(S)+",z(1..dd)),dp;");
+    list l2 = ringlist(S)[2];
+    for (int ii = 1; ii <= dd; ii++)
+    {
+     l2[size(l2)+1] = "z("+string(ii)+")";
+    }
+    ring R = create_ring(0, l2, "dp");
     ideal I=imap(rs,I);
     ideal H(0..n),L,LL,L(1..dd),LL(1..dd),h(1..dd),N(0..dd);
@@ -483 +488 @@
      {
       int w(q-1)=0;
-      execute("ring D(q)=(0,s,gamma),("+varstr(S)+",z(1..q)),dp;");
+      list l2 = ringlist(S)[2];
+      for (int ii = 1; ii <= q; ii++)
+      {
+       l2[size(l2)+1] = "z("+string(ii)+")";
+      }
+      ring D(q) = create_ring("(0,s,gamma)", l2, "dp");
       string nonsin(q),stnonsin(q);
       ideal H(1..q);
@@ -579 +589 @@
          for(qq=q-1;qq>=1;qq--)
          {
-          execute("ring T(qq)=(complex,16,I),("+varstr(S)+",z(1..qq)),dp;");
+          list l2 = ringlist(S)[2];
+          for (int ii = 1; ii <= qq; ii++)
+          {
+           l2[size(l2)+1] = "z("+string(ii)+")";
+          }
+          ring T(qq) = create_ring("(complex,16,I)", l2, "dp");
           list W(qq-1)=var(1);
          }
@@ -591 +606 @@
        {
         int w(qq-1);
-        execute("ring T(qq)=(complex,16,I),("+varstr(S)+",z(1..qq)),dp;");
+        list l2 = ringlist(S)[2];
+        for (int ii = 1; ii <= qq; ii++)
+        {
+         l2[size(l2)+1] = "z("+string(ii)+")";
+        }
+        ring T(qq) = create_ring("(complex,16,I)", l2, "dp"); 
         list W(qq-1)=var(1);
        }
@@ -600 +620 @@
       for(qq=q;qq>=1;qq--)
       {
-       execute("ring T(qq)=(complex,16,I),("+varstr(S)+",z(1..qq)),dp;");
+       list l2 = ringlist(S)[2];
+       for (int ii = 1; ii <= qq; ii++)
+       {
+        l2[size(l2)+1] = "z("+string(ii)+")";
+       }
+       ring T(qq) = create_ring("(complex,16,I)", l2, "dp");
        list W(qq-1)=var(1);
       }
@@ -1951 +1976 @@
   export(J(i));
  }
- execute("ring RR=0,(x(1..n),"+varstr(S)+"),dp;");
+ list l2;
+ for (int ii = 1; ii <= n; ii++)
+ {
+  l2[ii] = "x("+string(ii)+")";
+ }
+ l2 = l2+ringlist(S)[2];
+ ring RR = create_ring(0, l2, "dp");
  for(i=1;i<=d;i++)
  {
@@ -1995 +2026 @@
  int zc=size(D(d));
  export(zc);
- execute("ring DR=0,("+varstr(S)+",x(1..zc)),dp;");
+ list l2 = ringlist(S)[2];
+ for (int ii = 1; ii <= zc; ii++)
+ {
+  l2[size(l2)+1] = "x("+string(ii)+")";
+ }
+ ring DR = create_ring(0, l2, "dp");
  matrix TT(d)=imap(R,TT(d));
  ideal I=imap(S,I);

Singular/LIB/resolve.lib

@@ -396 +396 @@
             laM=subst(laM,var(templist[4][j]),0);
          }
-         execute("ring Rnew=("+charstr(basering)+"),("+string(templist[1])+"),dp;");
+         ring Rnew = create_ring(ringlist(basering)[1], "("+string(templist[1])+")", "dp", "no_minpoly");
          ideal Jnew=imap(R,Jsub);
          ideal eD=imap(R,Esub);
@@ -639 +639 @@
          v=N[4];
          for(j=1;j<=size(v);j++){BO[5]=subst(BO[5],var(v[j]),0);}
-         execute("ring R1=("+charstr(R0)+"),("+newvar+"),dp;");
+         ring R1 = create_ring(ringlist(R0)[1], "("+newvar+")", "dp", "no_minpoly");
          list BO=imap(R0,BO);
          ideal C=imap(R0,C);
@@ -1115 +1115 @@
               laM=subst(laM,var(v[j]),0);
            }
-           execute("ring R2=("+charstr(S)+"),("+newvar+"),dp;");
+           ring R2 = create_ring(ringlist(S)[1], "("+newvar+")", "dp", "no_minpoly");
            list BO=imap(S,B);
            ideal laM=imap(S,laM);
@@ -2984 +2984 @@
 //--- hypersurface is V(@f)
        @f=Jb[fvec[i]];
-       execute("ring R1=("+charstr(R)+"),(@y,"+varstr(R)+"),dp;");
+       ring R1 = create_ring(ringlist(R)[1], "(@y,"+varstr(R)+")", "dp", "no_minpoly");
        poly p=imap(R,@p);
        poly f=imap(R,@f);
@@ -4233 +4233 @@
              kill tr,L;
           }
-          execute("ring R1=("+charstr(S)+"),(@z,"+varstr(S)+"),dp;");
+          ring R1 = create_ring(ringlist(S)[1], "(@z,"+varstr(S)+")", "dp", "no_minpoly");
           poly p=imap(S,@p);
           list BO=imap(S,BO);
@@ -4800 +4800 @@
       {
          string newvar=string(N[1]);
-         execute("ring R1=("+charstr(R)+"),("+newvar+"),dp;");
+         ring R1 = create_ring(ringlist(R)[1], "("+newvar+")", "dp", "no_minpoly");
          list BO=imap(R,BO);
          ideal cent=imap(R,cent);

Singular/LIB/rinvar.lib

@@ -658 +658 @@
           minPoly = string(minpoly);
         }
-        execute("ring RA1=0,(" + varstr(basering) + "," + parName + "), lp;");
+        ring RA1 = create_ring(0, "(" + varstr(basering) + "," + parName + ")", "lp");
         if (minPoly!="0") { execute("ideal mpoly = std(" + minPoly + ");"); }
         ideal I = imap(RIRR,invarsGens);
@@ -962 +962 @@
     minPoly = string(minpoly);
   }
-  execute("ring RA1=0,(" + varstr(basering) + "," + parName + "), lp;");
+  ring RA1 = create_ring(0, "(" + varstr(basering) + "," + parName + ")", "lp");
   if (minPoly!="0") { execute("ideal mpoly = std(" + minPoly + ");"); }
   ideal Grp = imap(ROBR,Grp);

Singular/LIB/sing.lib

@@ -1076 +1076 @@
   int ii;
   def bas = basering;
-  execute("ring  @r_locstd
-     =("+charstr(bas)+"),(@t@,"+varstr(bas)+"),(dp(1),dp);");
+  ring @r_locstd = create_ring(ringlist(bas)[1], "(@t@,"+varstr(bas)+")", "(dp(1),dp)", "no_minpoly");
   ideal @id = imap(bas,id);
   ideal @hid = homog(@id,@t@);

Singular/LIB/standard.lib

@@ -2572 +2572 @@
 {
   string name;
-  intvec w;
   int b1 = find(ordering, "(", 1);
   if (b1 == 0)   // no parentheses
@@ -2579 +2578 @@
     if (name == "C" || name == "c")
     {
-      w = intvec(0);
+      intvec w = intvec(0);
     }
     else
     {
-      w = 1:n_vars;
+      intvec w = 1:n_vars;
     }
   }
@@ -2593 +2592 @@
     if (c == 0)
     {
-      w = 1:int(ordering[b1+1, b2-b1-1]);
+      if (name == "L")
+      {
+        int w = int(ordering[b1+1, b2-b1-1]);
+      }
+      else
+      {
+        intvec w = 1:int(ordering[b1+1, b2-b1-1]);
+      }
     }
     else
     {
       list W = tuple_to_tokens(ordering[b1, b2-b1+1]);
-      w = intvec(int(W[1..size(W)]));
+      intvec w = intvec(int(W[1..size(W)]));
     }
   }

Singular/LIB/tropical.lib

@@ -3644 +3644 @@
   CHARAKTERISTIK=CHARAKTERISTIK[1..size(CHARAKTERISTIK)-2];
   def BASERING=basering;
-  execute("ring INITIALRING=("+CHARAKTERISTIK+"),("+varstr(basering)+"),("+ordstr(basering)+");");
+  ring INITIALRING = create_ring("("+CHARAKTERISTIK+")", "("+varstr(basering)+")", "("+ordstr(basering)+")");
   list l=solve(imap(BASERING,i));
   l;
@@ -5551 +5551 @@
       setring LIFTRing;
       poly mp=minpoly;
-      execute("ring TESTRing=("+charstr(LIFTRing)+"),("+varstr(BASERING)+"),dp;");
+      ring TESTRing = create_ring(ringlist(LIFTRing)[1], "("+varstr(BASERING)+")", "dp", "no_minpoly");
       minpoly=number(imap(LIFTRing,mp));
       ideal i=imap(BASERING,i);
@@ -5939 +5939 @@
         else
         {
-          execute("ring PARARing=("+charstr(basering)+"),t,ls;");
+          ring PARARing = create_ring(ringlist(basering)[1], "t", "ls", "no_minpoly");
         }
         ideal PARA; // will contain the parametrisation
@@ -6200 +6200 @@
         else
         {
-          execute("ring SATURATERING=("+charstr(basering)+"),("+varstr(basering)+"),("+ordstr(basering)+");");
+          ring SATURATERING = create_ring(ringlist(basering)[1], "("+varstr(basering)+")", "("+ordstr(basering)+")", "no_minpoly");
           ideal i=imap(BASERING,i);
           export(i);
@@ -6341 +6341 @@
   // - the variable t is superflous,
   // the variable @a is not if it was already present
-  execute("ring INITIALRING=("+charstr(basering)+"),("+string(variablen)+"),dp;");
+  ring INITIALRING = create_ring(ringlist(basering)[1], "("+string(variablen)+")", "dp", "no_minpoly");
   ideal ini=imap(BASERING,ini);
   // compute the minimal associated primes of the
@@ -6367 +6367 @@
       // define the extension ring which contains
       // the new variable @a, if it is not yet present
-      execute("ring EXTENSIONRING=("+charstr(BASERING)+"),("+string(imap(BASERING,variablen))+",@a,"+tvar+"),(dp("+string(anzahlvariablen-1)+"),dp(1),lp(1));");
+      ring EXTENSIONRING = create_ring(ringlist(BASERING)[1], "("+string(imap(BASERING,variablen))+",@a,"+tvar+")", "(dp("+string(anzahlvariablen-1)+"),dp(1),lp(1))", "no_minpoly");
       // phi maps x_i to x_i, @a to @a (if present in the ring),
       // and the additional variable
@@ -6378 +6378 @@
     else // @a was already present in the BASERING or no
     { // field extension is necessary
-      execute("ring EXTENSIONRING=("+charstr(BASERING)+"),("+varstr(BASERING)+"),("+ordstr(BASERING)+");");
+      ring EXTENSIONRING = create_ring(ringlist(BASERING)[1], "("+varstr(BASERING)+")", "("+ordstr(BASERING)+")", "no_minpoly");
       // phi maps x_i to x_i, @a to @a (if present in the ring),
       // and the additional variable
@@ -7255 +7255 @@
 {
   def BASERING=basering;
-  execute("ring INTERRING=0,("+varstr(basering)+"),("+ordstr(basering)+");");
+  ring INTERRING = create_ring(0, "("+varstr(basering)+")", "("+ordstr(basering)+")");
   poly n=imap(BASERING,n);
-  execute("ring REALRING=(real,50,100),("+varstr(basering)+"),("+ordstr(basering)+");");
+  ring REALRING = create_ring("(real,50,100)", "("+varstr(basering)+")", "("+ordstr(basering)+")");
   map phi=INTERRING,maxideal(1);
   string s=string(phi(n));
@@ -7873 +7873 @@
   {
     def BASERING=basering;
-    execute("ring TRING="+string(char(BASERING))+",t,ds;");
+    ring TRING = create_ring(string(char(BASERING)), "t", "ds");
     poly hn=imap(BASERING,hn);
     poly c4=imap(BASERING,c4);

Singular/dyn_modules/freealgebra/freealgebra.cc

@@ -5 +5 @@
 {
   const short t1[]={2,RING_CMD,INT_CMD};
-  if (iiCheckTypes(args,t1,1))
+  const short t2[]={3,RING_CMD,INT_CMD,INT_CMD};
+  if (iiCheckTypes(args, t2, 0) || iiCheckTypes(args, t1, 1))
   {
     ring r=(ring)args->Data();
@@ -32 +33 @@
       return TRUE;
     }
-    ring R=freeAlgebra(r,d);
+    int ncGenCount = 0; 
+    if (iiCheckTypes(args,t2,0))
+      ncGenCount = (int)(long) args->next->next->Data();
+    ring R=freeAlgebra(r,d,ncGenCount);
     res->rtyp=RING_CMD;
     res->data=R;

Singular/dyn_modules/python/Makefile.am

@@ -51 +51 @@
 python_moduledir =  ${datadir}/singular/LIB
 python_module_DATA = cart.py  interpreter.py  perf.py  symm.py  util.py
+EXTRA_DIST=cart.py  interpreter.py  perf.py  symm.py  util.py

Singular/dyn_modules/systhreads/Makefile.am

@@ -18 +18 @@
 endif
 
-SOURCES = shared.cc lintree.cc bytebuf.cc thread.cc bytebuf.h lintree.h channel.h syncvar.h threadconf.h
+SOURCES = shared.cc lintree.cc bytebuf.cc thread.cc bytebuf.h lintree.h channel.h syncvar.h threadconf.h thread.h singthreads.h
 systhreads_la_SOURCES   = $(SOURCES)
 systhreads_la_CPPFLAGS  = ${MYINCLUDES} ${P_PROCS_CPPFLAGS_COMMON}

Singular/iparith.cc

@@ -5153 +5153 @@
   ideal v_id=(ideal)v->Data();
   tHomog hom=testHomog;
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(currRing))
+  {
+    if (currRing->LPncGenCount < IDELEMS(v_id))
+    {
+      Werror("At least %d ncgen variables are needed for this computation.", IDELEMS(v_id));
+      return TRUE;
+    }
+  }
+#endif
   if (ww!=NULL)
   {

Singular/ipshell.cc

@@ -2252 +2252 @@
 //  R->cf->ch=0;
   // ----------------------------------------
-  // 1:
+  // 0, (r1,r2) [, "i" ]
   if (L->m[1].rtyp!=LIST_CMD)
   {
@@ -2259 +2259 @@
   }
   lists LL=(lists)L->m[1].data;
-  if (((LL->nr!=2)
+  if ((LL->nr!=2)
     || (LL->m[0].rtyp!=INT_CMD)
     || (LL->m[1].rtyp!=INT_CMD))
-  && ((LL->nr!=1)
-    || (LL->m[0].rtyp!=INT_CMD)))
-  {
-    WerrorS("invalid coeff. field description list");
+  {
+    WerrorS("invalid coeff. field description list, expected list(`int`,`int`)");
     return;
   }
   int r1=(int)(long)LL->m[0].data;
   int r2=(int)(long)LL->m[1].data;
+  r1=si_min(r1,32767);
+  r2=si_min(r2,32767);
+  LongComplexInfo par; memset(&par, 0, sizeof(par));
+  par.float_len=r1;
+  par.float_len2=r2;
   if (L->nr==2) // complex
-    R->cf = nInitChar(n_long_C, NULL);
-  else if ((r1<=SHORT_REAL_LENGTH)
-  && (r2<=SHORT_REAL_LENGTH))
-    R->cf = nInitChar(n_R, NULL);
-  else
-  {
-    LongComplexInfo* p = (LongComplexInfo *)omAlloc0(sizeof(LongComplexInfo));
-    p->float_len=r1;
-    p->float_len2=r2;
-    R->cf = nInitChar(n_long_R, p);
-  }
-
-  if ((r1<=SHORT_REAL_LENGTH)   // should go into nInitChar
-  && (r2<=SHORT_REAL_LENGTH))
-  {
-    R->cf->float_len=SHORT_REAL_LENGTH/2;
-    R->cf->float_len2=SHORT_REAL_LENGTH;
-  }
-  else
-  {
-    R->cf->float_len=si_min(r1,32767);
-    R->cf->float_len2=si_min(r2,32767);
-  }
-  // ----------------------------------------
-  // 2: list (par)
-  if (L->nr==2)
-  {
-    //R->cf->extRing->N=1;
+  {
     if (L->m[2].rtyp!=STRING_CMD)
     {
@@ -2304 +2280 @@
       return;
     }
-    //(rParameter(R))=(char**)omAlloc0(rPar(R)*sizeof(char_ptr));
-    rParameter(R)[0]=omStrDup((char *)L->m[2].data);
-  }
-  // ----------------------------------------
+    par.par_name=(char*)L->m[2].data;
+    R->cf = nInitChar(n_long_C, &par);
+  }
+  else if ((r1<=SHORT_REAL_LENGTH) && (r2<=SHORT_REAL_LENGTH)) /* && L->nr==1*/
+    R->cf = nInitChar(n_R, NULL);
+  else /* && L->nr==1*/
+  {
+    R->cf = nInitChar(n_long_R, &par);
+  }
 }
 

Singular/table.h

@@ -278 +278 @@
 ,{D(jjSTD),        STD_CMD,         SMATRIX_CMD,    SMATRIX_CMD   , ALLOW_NC |ALLOW_RING}
 ,{D(jjDUMMY),      STRING_CMD,      STRING_CMD,     STRING_CMD    , ALLOW_NC |ALLOW_RING}
-,{D(jjSYZYGY),     SYZYGY_CMD,      MODUL_CMD,      IDEAL_CMD     , ALLOW_PLURAL |ALLOW_RING}
-,{D(jjSYZYGY),     SYZYGY_CMD,      MODUL_CMD,      MODUL_CMD     , ALLOW_PLURAL |ALLOW_RING}
+,{D(jjSYZYGY),     SYZYGY_CMD,      MODUL_CMD,      IDEAL_CMD     , ALLOW_NC |ALLOW_RING}
+,{D(jjSYZYGY),     SYZYGY_CMD,      MODUL_CMD,      MODUL_CMD     , ALLOW_NC |ALLOW_RING}
 #ifdef HAVE_PLURAL
 ,{D(jjENVELOPE),   ENVELOPE_CMD,    RING_CMD,       RING_CMD      , ALLOW_PLURAL |NO_RING}

Tst/Short/absfact.res.gz.uu

@@ -1 +1 @@
 begin 640 absfact.res.gz
-M'XL("`O%'%T"`V%B<V9A8W0N<F5S`.V<6V_;.!;'W_,IB&*`D2PI(0]OX@3V
-MP^QB%P,L]J'IVZ`IY-2>&IM-@EC=2/WT>VC9)%W1M]:=+K9*45OFS1+/__QX
-M1)&^>?/7W_Y)"&$3\H_??B6OZF5]>;^8OKJ^N%GGP(1@XKO%PZ).TNL+^TXF
-M$U)-E_/JKKY\F+U<+NNJ=N7YA+AC<=FUNBF\W;(,2JI+\KQX^(.\)F.2T#0G
-M29.W^';_Y,OK"5E^>'RNQX3ZQ')"GA[O6_)D*Q9ZU-P"R0B,FE&[.E*C!E_;
-M6X&O3*P3A4Y'B6P@:R&]Y:.D*=KT5OA&S82\G\W)#;:)I_XW//7'Y\6G6?*4
-MDNN+BZLK\G.8_#.Y>YY5]>P]J587D9/%`WGYL+C[@`GWBV5M&WF\_UC/WLU7
-M=98DJ3_,;#N;#++.2,EB299X-'M_:?/?/)+J[FZV7!*LT+7U.._5RDG=/LU(
-MLIBOBCU4_Y[AN;]42U(MEXL_'F;O;5OUXRKW>59_?'X@_ZGN/\[27VS&^F\Y
-MJ^W9)S?I=>^$KR^(LQ6CD["L2V81\S"81-KZG;W]!1LD[_!@S*Z`,9#=9W@[
-M3@HT4Y4QDXZ:C'%KL<P:MLJ,2+M2_.U88F92I:.V2Q%OQVC#"ZR_:ICE+.>Y
-MN,"2_HNPN/\2;.\6"C6J"M2":S7!Q$RFKDU;!=^[-L%=%'<=0%[[2Q6=:-YL
-M:^;7O_R=H&XBLL&<'TTYTG?<&]]Q*B8<?5@XSII%D[7>AD5EE>.%D0!:F?%5
-MHM62M:G3B4"=L#TZJ?:)`Q6TTJJ54$0FI><;,Y?D7XO[^T`O@&YT"'D0\RF`
-M$'EKBOE<OH]=:+/1"`V))1#D^.4W)-E9.OWA40<BBCJ0,;.H@XJ5H:Y&GP%K
-MGP@[X6TDYA0&.@8B*/>#J*>!-YT&=I1/!W)AGYH8N3B-Z("S$\CE8/5U0N#@
-M4<-Y#S5<'$8-CVF:JWVHX1VC`VCD6EO*5'B6>=%469M7KG`YB<C+5KB^2&R%
-M--]T1E#)^.L2M'==@AV^+@&1ZQ)\^[I$@=<67IH0`T7/YCQ"1BDJ8N.^.#SN
-M%QZC%J&;X3D<\INM2)#E<.P('P_]A#N[,@9<80;@GELSDL:`*V/QD(23)!.$
-MBL6?H1D9W!!+L;[-?1[3'%E5I_E[CRHI-U0:-[<B2^I;7D"-02;4R$7\@"G2
-MIHBB2RV837>C@,2;:/=G"ZM"8(T,*V0*&\ML8Y:P/LLVE@F;9[/\F>A=^,M?
-M+5^EIQ"PJS!`4)91"$IS6+P^7&B@EEE3JZ+A-2^8&F&"*!@%,6IJ6=0JPP->
-M`Y81V2H94QN1@4TML#!D8&MUE;$JV!9LI1IOAK$TQT)%#7O"D67@!LO@MF=S
-M02IPW&=WF8KM0B0JA.S0U$Y,NCH#*FW?0@R5BO^_"4MXCBJYC@4#A:E)B-8M
-ML"KMP.J'#57N#/%.BO`&MA%EHFS3]*`$J1=$?[C=2("Z!EF,+1IVL^5$K`Q$
-MZ7J4QXBBQ;G-&3P`T*KGT5KO]FCMIOW'^HHQGVX&ISZ3",KX-']Y>'K#6N0D
-M(900\^N2#WY]9I.*F%^7\AM85'G7+G7/M<O2N79"\RJ?IGDW<Q.X>&DB@[:A
-M@W^?20R&1?W;P%=0_BXB!<-CSFW$X-QGMF?TX9I1YS:G]IYMRIYG&W/0LQFE
-MSK.3*F/IU=1GL<&_SZ,'O$F+^3>CA^\+.Z,DT_0483`J(G[.J!S\_,QV51$_
-M9U1_*[/ZI]B,FL_]G3%ZV-_MRI!M?Q\U/A.&J<8S*R18GQ)Z/A,G2,1-#'WY
-MC`T+EWL$BE%[I@*_8"9PF`AT/:MC9&#EGVUV_]"6`>T1`]AA8O@E+IX8=OV>
-M+\`':IQ9/?&U+@SD$2OX0NFL#&8?,H4#S<DB`A5C!^B!'=_(^F6,'6"^B_'M
-MNAIWS'H$L:M=#A&$\RA!6E]`#`0YLX9X=)T'X^K+131JOT9&.L807@X,^4;V
-MCRV28X)^)_/;U6'N&#;["UBW\F*;%FX]V'R<!+L"^.I(XI'(1'H+OOP&'HR,
-MMU@P3W_X_0%L:[D7\QP0ZH2%D6C^(EAE$WX4JX]^[;_$S]92@50`__%<[EO!
-M`P54&83K>"`+4D27PE+W'5M[`8R[J'`)KH]/Q6[(S$\#S'R`2]>C4;A(>HJF
-M5BK9N4\@U)AT'[VH)$H*CE\6YL4C>NJ2H0+[HI(!N:0C%\?`@[HEK@&]I*.7
-M+=)`*[)69=#P%K^T:46AD5_:+G#-F,!,A1VA&OPD,!%?6@\VN0';%M9(,N?[
-M(J)(X2$:DL'LQXWOX&."(:9,"$*/.A26W1%E-T0QL=DCE12ZVQNUM7YQ+_N<
-M-*U2-2I1=?N@/E^\R&2(-^ZOPN&MMX`UKA3'MVCY`7"V3Z.`4Z<`;B4,A`K3
-MG2[P2*9]X!VODX*I*E/0PUI/)RH@EMH0ZQG6L5;^*7_9BK?4Y_%6]@D#+<A>
-MA"_B[\]Z$=:>6[//RPX<4O&[,G4,B(03@UW/EX%%#XP^H<Q@%:2_P)$;5P3J
-M!H$5V;O"5'B7YD<BM0<Q)Q)F`$S7HU'`:'K4@!10H5"I%4-WT&X.4!3B>#U8
-MM*"$)$0$H0.6:,<2MGNN1X=S/;RH8)J!KJ:\`#T5Z17>3T[E^I11OGK*\;1]
-M93$\<3Z3P'2<-%H=\0!B;9BUL4*U3=>F6QEQWWS`75#M+C(?H$/0^%LUO1LT
-M3Z>!9GA"O>[1*&A*^K\A@S+`2^GPPG>%*F4T5!'92^F+B.XG,NS/8'Q<)E[Y
-MI1QBF+,HRBXGC/>PCB*G+(\8U+@T*`"A``0S4$HN)#=24E-247*C*0.A%?YG
-M#*-1J03F2$&I4D`1:O[7!P3'NA0H5L*P2@L4:C^MC:390$H+)4JI..#(I:AF
-M`O`K5L,CU4H8#8:656:KEH*6"D^.E>:$R`NDJD1A7WFAN?T>C."-890:.P*#
-MPC:5+!4#$XGKR\"5G_W]GUV&&;6'84/4=E[I&]C5U;%%^LR(4W:?HR;,BKD5
-MQDIKP&XGM?TD5.WQ<9ZP<1[/I+"2MDHN(2(SXW<",!/^%-!ZOBO_M)[QZ@GH
-M-4EV%4Y=BYOM/W,LU`H$>-'"*&%%`T%W[MH.-#\E#AQH;;O21&:^@)XT56LG
-M*UM1K(;;8[76'^R!LLB&;:`P4.JL)@<:@Q%0\3U,[ED"%%D2P).EUS]=_!>^
-'1X0-\DP`````
+M'XL("+=525T"`V%B<V9A8W0N<F5S`.V<6V_;.!;'W_,IB&*`D2PI(0]OX@3V
+MP^QB%P,L]J'IVZ`IY-2>&IM-@EC=2/WT>RC9)%W3M]:=+K9*45OFS1+/__QX
+M1)&^>?/7W_Y)"&$3\H_??B6OZF5]>;^8OKJ^N%GEP(1@XKO%PZ).TNL+^TXF
+M$U)-E_/JKKY\F+U<+NNJ=N7YA+AC<=FWNBZ\V;(,2JI+\KQX^(.\)F.2T#0G
+M29.W^';_Y,OK"5E^>'RNQX3ZQ')"GA[O6_)D*Q9ZU-P"R0B,FE';':E1@Z_M
+MK<!7)E:)0J>C1#:0M9#>\E'2%&UZ*WRC9D+>S^;D!MO$4_\;GOKC\^+3+'E*
+MR?7%Q=45^3E,_IG</<^J>O:>5-U%Y&3Q0%X^+.X^8,+]8EG;1A[O/]:S=_.N
+MSI(D]8>9;6>=0589*5DLR1*/9N\O;?Z;1U+=W<V62X(5^K8>YUNU<E*W3S.2
+M+.9=L8?JWS,\]Y=J2:KE<O''P^R];:M^['*?9_7'YP?RG^K^XRS]Q6:L_I:S
+MVIY]<I->;YWP]05QMF)T$I9UR2QB'@:32%N_L[>_8(/D'1Z,V14P!K+_#&_'
+M28%FJC)FTE&3,6XMEEG#5ID1:5^*OQU+S$RJ=-3V*>+M&&UX@?6[AEG.<IZ+
+M"RSIOPB+^R_!]FZA4*.J0"VX5A-,S&3JVK15\+UO$]Q%<=<!Y+6_5-&+YLVF
+M9G[]R]\)ZB8B&\SYT90C?<>]\1VG8L+1AX7CK%DT6>MM6%16.5X8":"5&>\2
+MK9:L39U.!.J$[=%)M4\<J*!.JU9"$9F4GF_,7))_+>[O`[T`NM$AY$',IP!"
+MY*THYG/Y/G:AS48C-"260)#CE]^09&?I](=''8@HZD#&S*(.*E:&NAI]!JQ]
+M(NR%MY:84QCH&(B@W`^B+0V\Z36PHWPZD`O[U,3(Q6E$!YR=0"X'JZ\3`@>/
+M&LZW4,/%8=3PF*:YVH<:WC,Z@$:NM:5,A6>9%TV5M7GE"I>3B+QLA>N+Q%9(
+M\W5G!)6,ORY!MZY+L,/7)2!R78)O7I<H\-K"2Q-BH.C9G$?(*$5%;-P7A\?]
+MPF/4(G0]/(=#?K,1";(<CAWAXZ&?<&=7QH`KS`#<<VM&TAAP92P>DG"29()0
+ML?@S-".#&V(I5K>YSV.:(ZOJ-'_O427EFDKCYE9D27W+"Z@QR(0:N8@?,$7:
+M%%'TJ06SZ6X4D'@3[?YL854(K)%AA4QA8YEMS!+69]G&,F'S;)8_$[T+?_FK
+MY:OT%`+V%08(RC(*06D.B]>'"PW4,FMJ532\Y@53(TP0!:,@1DTMBUIE>,!K
+MP#(BZY(QM1$9V-0""T,&ME9?&:N";<%6JO%F&$MS+%34L"<<609NL`QN>]87
+MI`+'?7:7J=@N1*)"R`Y-[<2DJS.@TO8MQ%"I^/^;L(3GJ)*K6#!0F)J$:-T`
+MJ](.K'[84.7.$.^D"&]@&U$FRC9-#TJ0>D%L#[=K"5#7((NQ1<-NMIR(E8$H
+M?8_R&%&T.+<Y@P<`6FUYM-:[/5J[:?^QOF+,IYO!J<\D@C(^S5\>GMZP%CE)
+M""7$_+KD@U^?V:0BYM>E_`865=ZU2[WEVF7I7#NA>95/T[R?N0E<O#210=O0
+MP;_/)`;#HOYMX"LH?Q>1@N$QYS9B<.XSVS/Z<,VH<YM3>\\VY99G&W/0LQFE
+MSK.3*F/IU=1GL<&_SZ,'O$F+^3>CA^\+>Z,DT_0483`J(G[.J!S\_,QV51$_
+M9U1_*[/ZI]B,FL_]G3%ZV-_MRI!-?Q\U/A.&J<8S*R18GQ)Z/A,G2,1-#'WY
+MC`T+EWL$BE%[I@*_8"9PF`AT/:MC9&#EGVUV_]"6`=TB!K##Q/!+7#PQ[/H]
+M7X`/U#BS>N)K71C((U;PA=+I#&8?,H4#S<DB`A5C!^B!'=_(^F6,'6"^B_'M
+MNAIWS+8(8E>['"((YU&"M+Z`&`AR9@WQZ#H/QM67BVC4?HV,=(PAO!P8\HWL
+M'ULDQP3]3N:WJ\/<,:SW%[!^Y<4F+=QZL/DX"78%\.Y(XI'(1'H+OOP:'HR,
+M-U@P3W_X_0%L8[D7\QP0ZH2%D6C^(EAE$WX4W4>_]E_B9VNI0"J`_W@N]ZW@
+M@0*J#,)U/)`%*:)/8:G[CHV]`,9=5+@$U\>G8C=DYJ<!9C[`I>_1*%PD/453
+MG4IV[A,(-2;=1R\JB9*"XY>%>?&(+77)4(';HI(!N:0C%\?`@[HEK@&]I*.7
+M+=)`*[)69=#P%K^T:46AD5_:+G#-F,!,A1VA&OPD,!%?6@\VN0;;!M9(,N?[
+M(J)(X2$:DL'LQXWOX&."(:9,"$*/.A26W1%E-T0QL=XCE12ZWQNUL7YQ+_N<
+M-*U2-2I1]?N@/E^\R&2(-^ZOPN%M:P%K7"F.;]'R`^!LGT8!ITX!G!4&K/<Z
+M;=`HLLW@@$0Z@6WNC>MDLR41%<!*K6'U#*LP*_^4OVR$6NKS4"O[A#$69"_"
+M%_&W9EO!U9Z[LL_+#@A2\1LR=0R#A!.#7<J7@:4.C#YU"K/Q^0L<N6=%H&Y0
+M2I%M*TR%-VA^$%)[Z'(B7`:V]#T:98NF1XU%`16*;L2Q>RB[H]8=H2[$\9)`
+MNO"RRKC6$5'H@"?:\83MGNK1X50/+RJ89J"K*2]`3T5ZA;>34[DZ:Y2PGB(=
+M_320%L,#YS.)3,=IH]41SQ]6AED9*U3<=&6ZSHC[I@/N@FIWD>D`'<+&WZGI
+MW;!Y.@TVPP/J58]&85/2_PT9E`%>2H<7OBM<*:/ABLA>2E]$]+^087\%X^,R
+M\<HOY1#'G$51=C5AO(=U%#EE><3`QJ5!`0@%()B!4G(AN9&2FI**DAM-&0BM
+M\#]C&)%*)3!'"DJ5`HI0\S\^(#C6I4"Q$H966J!0M]/:2)H-IK10HI2*`XY<
+MBFHF`+_"1M]`M1)&@Z$X4MJJI:"EPI-CI3DA^@*I*E'85UYH;K\'HWAC&*6&
+MV>D'A6TJ62H&)A+;EX$K/_O;/[L*,VH/PX;([;S2-["KJV-K])D1IVP^1TV8
+MCKD5QDHKP&XFM=M)J-KC`SV!0JYX)H65M%5R"1&9&;\1@)GPEX!6TUWYI]6$
+MUY:`7I-D5^'4M;C>_3/'0JU`@!<MC!)6-!!TYZ[=0/-3XL"!UK8K363B"^A)
+M,[5VKK(513?<'JNU[<$>*(OLUP8*`Z7.:G*@,1@!%=_#Y)XE0)$E`3Q9>OW3
++Q7\!?:#A?_%,````
 `
 end

Tst/Short/absfact.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:190632
-1 >> tst_memory_1 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2486272
-1 >> tst_memory_2 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2486272
-1 >> tst_timer :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:18
-2 >> tst_memory_0 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:195048
-2 >> tst_memory_1 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2740224
-2 >> tst_memory_2 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2740224
-2 >> tst_timer :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:50
-3 >> tst_memory_0 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:195048
-3 >> tst_memory_1 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2740224
-3 >> tst_memory_2 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2740224
-3 >> tst_timer :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:1
-4 >> tst_memory_0 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:196464
-4 >> tst_memory_1 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2740224
-4 >> tst_memory_2 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2740224
-4 >> tst_timer :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:9
-5 >> tst_memory_0 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:195968
-5 >> tst_memory_1 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2740224
-5 >> tst_memory_2 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2740224
-5 >> tst_timer_1 :: 1562166539:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:83
+1 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:192208
+1 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2506752
+1 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2506752
+1 >> tst_timer :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:18
+2 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:197648
+2 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+2 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+2 >> tst_timer :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:50
+3 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:197648
+3 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+3 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+3 >> tst_timer :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2
+4 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:202280
+4 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+4 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+4 >> tst_timer :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:9
+5 >> tst_memory_0 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:201784
+5 >> tst_memory_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+5 >> tst_memory_2 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:2637824
+5 >> tst_timer_1 :: 1565087159:4122, 64 bit:4.1.2:x86_64-Linux:nepomuck:83

Tst/Short/bug_zp.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_zp.res.gz
-M'XL("-%LPED"`V)U9U]Z<"YR97,`E5!-3\)`$+WW5[P0#B6I"[O(AQ#6Q'@A
-M,5[P1K19RK9.`FTSNX3*KW>KI.K1T[QY;U[FS6Q>'M?/`*3&T_H!/>^\.-"N
-MMXPV5T5I!#*EDGP\6$9MA=;8G8KT4HO2GH7SQG?C8XT.WPH,AS@;+A-0CIKI
-M:$$.OJIP,%Q8Y!4C-YFO^&/1V28"3&4!7DW&T_E,CD8R:9)]_9-IJJ\NNEC$
-MC;J1(5G@[Y&]&PZ*97*>LC_+XJ-I6D*]J;O!/Z>W\G716M(`5C+:JN]6=HEF
-7O\Z>BZ^/M6\YN3A$ZT>?0,1X.V<!````
+M'XL("$.:.5T"`V)U9U]Z<"YR97,`55#+;L(P$+S[*T:(0Y""P>99$$:J>D&J
+M>H$;:B.3.F$E2"+;B)2OK].BM)QV=V9'L[/;W<OF#8!0>-T\H^.=YR<Z=)9L
+M>V>D0@`3*LA'O25K*I3"X9(GMXH7YLJ=U[Y='RFT_9AC,,!5VR(&9:@LG0W(
+MP9<E3MKF!EEID>G4E_9KT<HF'):*''8U&4WG,S$<BKB./ZN_FZ;JKJ*;053+
+MO@B7!7R-]*AM8(PEYRE],(O.NFX`^2&?>FPOWA>-)`G-2K"]_!U%ZS'[%V3.
+3?W[0!+VX*)AUV3<,'@((.0$`````
 `
 end

Tst/Short/bug_zp.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1505914065:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:83592
-1 >> tst_memory_1 :: 1505914065:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:2215936
-1 >> tst_memory_2 :: 1505914065:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:2215936
-1 >> tst_timer_1 :: 1505914065:4103, 64 bit:4.1.0:x86_64-Linux:nepomuck:0
+1 >> tst_memory_0 :: 1564056131:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:85680
+1 >> tst_memory_1 :: 1564056131:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2150192
+1 >> tst_memory_2 :: 1564056131:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:2191296
+1 >> tst_timer_1 :: 1564056131:4120, 64 bit:4.1.2:x86_64-Linux:nepomuck:5

doc/NEWS.texi

@@ -21 +21 @@
 
 @heading News for version @value{VERSION}
+
+Changes in the kernel/build system:
+@itemize
+@item improved gcd and multiplication via FLINT
+@end itemize
+
+@heading News for version 4-1-2
 New libraries:
 @itemize

factory/FLINTconvert.cc

@@ -24 +24 @@
 #include "singext.h"
 #include "cf_algorithm.h"
+
+#ifdef HAVE_OMALLOC
+#define Alloc(L) omAlloc(L)
+#define Free(A,L) omFreeSize(A,L)
+#else
+#define Alloc(L) malloc(L)
+#define Free(A,L) free(A)
+#endif
 
 #ifdef HAVE_FLINT
@@ -53 +61 @@
 #include <flint/fq_nmod_mat.h>
 #endif
+#if ( __FLINT_RELEASE >= 20503)
+#include <flint/fmpq_mpoly.h>
+#endif
 #ifdef __cplusplus
 }
@@ -152 +163 @@
   if (f.isImm ())
   {
-    fmpz_set_si (fmpq_numref (result), f.num().intval());
-    fmpz_set_si (fmpq_denref (result), f.den().intval());
-  }
-  else
+    fmpq_set_si (result, f.intval(), 1);
+  }
+  else if(f.inQ())
   {
     mpz_t gmp_val;
@@ -165 +175 @@
     mpz_clear (gmp_val);
   }
+  else if(f.inZ())
+  {
+    mpz_t gmp_val;
+    f.mpzval(gmp_val);
+    fmpz_set_mpz (fmpq_numref (result), gmp_val);
+    mpz_clear (gmp_val);
+    fmpz_one(fmpq_denref(result));
+  }
+  else
+  {
+    printf("wrong type\n");
+  }
 }
 
@@ -181 +203 @@
 
   CanonicalForm result;
-  if (mpz_is_imm (nnum) && mpz_is_imm (nden))
-  {
-    num= CanonicalForm (mpz_get_si(nnum));
-    den= CanonicalForm (mpz_get_si(nden));
-    mpz_clear (nnum);
-    mpz_clear (nden);
-    result= num/den;
-    if (!isRat)
-      Off (SW_RATIONAL);
-    return result;
+  if (mpz_is_imm (nden))
+  {
+    if (mpz_is_imm(nnum))
+    {
+      num= CanonicalForm (mpz_get_si(nnum));
+      den= CanonicalForm (mpz_get_si(nden));
+      mpz_clear (nnum);
+      mpz_clear (nden);
+      result= num/den;
+    }
+    else if (mpz_cmp_si(nden,1)==0)
+    {
+      result= CanonicalForm( CFFactory::basic(nnum));
+      mpz_clear (nden);
+    }
+    else
+      result= CanonicalForm( CFFactory::rational( nnum, nden, false));
   }
   else
   {
-    result= make_cf (nnum, nden, false);
-    if (!isRat)
-      Off (SW_RATIONAL);
-    return result;
-  }
+    result= CanonicalForm( CFFactory::rational( nnum, nden, false));
+  }
+  if (!isRat)
+    Off (SW_RATIONAL);
+  return result;
 }
 
@@ -528 +557 @@
 }
 #endif
-
-#endif
-
-
+#if __FLINT_RELEASE >= 20503
+static void convFlint_RecPP ( const CanonicalForm & f, ulong * exp, nmod_mpoly_t result, nmod_mpoly_ctx_t ctx, int N )
+{
+  // assume f!=0
+  if ( ! f.inCoeffDomain() )
+  {
+    int l = f.level();
+    for ( CFIterator i = f; i.hasTerms(); i++ )
+    {
+      exp[N-l] = i.exp();
+      convFlint_RecPP( i.coeff(), exp, result, ctx, N );
+    }
+    exp[N-l] = 0;
+  }
+  else
+  {
+    int c=f.intval(); // with Off(SW_SYMMETRIC_FF): 0<=c<p
+    nmod_mpoly_push_term_ui_ui(result,c,exp,ctx);
+  }
+}
+
+static void convFlint_RecPP ( const CanonicalForm & f, ulong * exp, fmpq_mpoly_t result, fmpq_mpoly_ctx_t ctx, int N )
+{
+  // assume f!=0
+  if ( ! f.inBaseDomain() )
+  {
+    int l = f.level();
+    for ( CFIterator i = f; i.hasTerms(); i++ )
+    {
+      exp[N-l] = i.exp();
+      convFlint_RecPP( i.coeff(), exp, result, ctx, N );
+    }
+    exp[N-l] = 0;
+  }
+  else
+  {
+    fmpq_t c;
+    fmpq_init(c);
+    convertCF2Fmpq(c,f);
+    fmpq_mpoly_push_term_fmpq_ui(result,c,exp,ctx);
+    fmpq_clear(c);
+  }
+}
+
+void convFactoryPFlintMP ( const CanonicalForm & f, nmod_mpoly_t res, nmod_mpoly_ctx_t ctx, int N )
+{
+  if (f.isZero()) return;
+  ulong * exp = (ulong*)Alloc(N*sizeof(ulong));
+  memset(exp,0,N*sizeof(ulong));
+  bool save_sym_ff= isOn (SW_SYMMETRIC_FF);
+  if (save_sym_ff) Off (SW_SYMMETRIC_FF);
+  convFlint_RecPP( f, exp, res, ctx, N );
+  if (save_sym_ff) On(SW_SYMMETRIC_FF);
+  Free(exp,N*sizeof(ulong));
+}
+
+void convFactoryPFlintMP ( const CanonicalForm & f, fmpq_mpoly_t res, fmpq_mpoly_ctx_t ctx, int N )
+{
+  if (f.isZero()) return;
+  ulong * exp = (ulong*)Alloc(N*sizeof(ulong));
+  memset(exp,0,N*sizeof(ulong));
+  convFlint_RecPP( f, exp, res, ctx, N );
+  fmpq_mpoly_reduce(res,ctx);
+  Free(exp,N*sizeof(ulong));
+}
+
+CanonicalForm convFlintMPFactoryP(nmod_mpoly_t f, nmod_mpoly_ctx_t ctx, int N)
+{
+  CanonicalForm result;
+  int d=nmod_mpoly_length(f,ctx)-1;
+  ulong* exp=(ulong*)Alloc(N*sizeof(ulong));
+  for(int i=d; i>=0; i--)
+  {
+    ulong c=nmod_mpoly_get_term_coeff_ui(f,i,ctx);
+    nmod_mpoly_get_term_exp_ui(exp,f,i,ctx);
+    CanonicalForm term=(int)c;
+    for ( int i = 0; i <N; i++ )
+    {
+      if (exp[i]!=0) term*=CanonicalForm( Variable( N-i ), exp[i] );
+    }
+    result+=term;
+  }
+  Free(exp,N*sizeof(ulong));
+  return result;
+}
+
+CanonicalForm convFlintMPFactoryP(fmpq_mpoly_t f, fmpq_mpoly_ctx_t ctx, int N)
+{
+  CanonicalForm result;
+  int d=fmpq_mpoly_length(f,ctx)-1;
+  ulong* exp=(ulong*)Alloc(N*sizeof(ulong));
+  fmpq_t c;
+  fmpq_init(c);
+  for(int i=d; i>=0; i--)
+  {
+    fmpq_mpoly_get_term_coeff_fmpq(c,f,i,ctx);
+    fmpq_mpoly_get_term_exp_ui(exp,f,i,ctx);
+    CanonicalForm term=convertFmpq_t2CF(c);
+    for ( int i = 0; i <N; i++ )
+    {
+      if (exp[i]!=0) term*=CanonicalForm( Variable( N-i ), exp[i] );
+    }
+    result+=term;
+  }
+  fmpq_clear(c);
+  Free(exp,N*sizeof(ulong));
+  return result;
+}
+
+// stolen from:
+// https://graphics.stanford.edu/~seander/bithacks.html#IntegerLog
+static inline int SI_LOG2(int v)
+{
+  const unsigned int b[] = {0x2, 0xC, 0xF0, 0xFF00, 0xFFFF0000};
+  const unsigned int S[] = {1, 2, 4, 8, 16};
+
+  unsigned int r = 0; // result of log2(v) will go here
+  if (v & b[4]) { v >>= S[4]; r |= S[4]; }
+  if (v & b[3]) { v >>= S[3]; r |= S[3]; }
+  if (v & b[2]) { v >>= S[2]; r |= S[2]; }
+  if (v & b[1]) { v >>= S[1]; r |= S[1]; }
+  if (v & b[0]) { v >>= S[0]; r |= S[0]; }
+  return (int)r;
+}
+
+CanonicalForm mulFlintMP_Zp(const CanonicalForm& F,int lF, const CanonicalForm& G, int lG,int m)
+{
+  int bits=SI_LOG2(m)+1;
+  int N=F.level();
+  nmod_mpoly_ctx_t ctx;
+  nmod_mpoly_ctx_init(ctx,N,ORD_LEX,getCharacteristic());
+  nmod_mpoly_t f,g,res;
+  nmod_mpoly_init3(f,lF,bits,ctx);
+  nmod_mpoly_init3(g,lG,bits,ctx);
+  convFactoryPFlintMP(F,f,ctx,N);
+  convFactoryPFlintMP(G,g,ctx,N);
+  nmod_mpoly_init(res,ctx);
+  nmod_mpoly_mul(res,f,g,ctx);
+  nmod_mpoly_clear(g,ctx);
+  nmod_mpoly_clear(f,ctx);
+  CanonicalForm RES=convFlintMPFactoryP(res,ctx,N);
+  nmod_mpoly_clear(res,ctx);
+  nmod_mpoly_ctx_clear(ctx);
+  return RES;
+}
+
+CanonicalForm mulFlintMP_QQ(const CanonicalForm& F,int lF, const CanonicalForm& G, int lG, int m)
+{
+  int bits=SI_LOG2(m)+1;
+  int N=F.level();
+  fmpq_mpoly_ctx_t ctx;
+  fmpq_mpoly_ctx_init(ctx,N,ORD_LEX);
+  fmpq_mpoly_t f,g,res;
+  fmpq_mpoly_init3(f,lF,bits,ctx);
+  fmpq_mpoly_init3(g,lG,bits,ctx);
+  convFactoryPFlintMP(F,f,ctx,N);
+  convFactoryPFlintMP(G,g,ctx,N);
+  fmpq_mpoly_init(res,ctx);
+  fmpq_mpoly_mul(res,f,g,ctx);
+  fmpq_mpoly_clear(g,ctx);
+  fmpq_mpoly_clear(f,ctx);
+  CanonicalForm RES=convFlintMPFactoryP(res,ctx,N);
+  fmpq_mpoly_clear(res,ctx);
+  fmpq_mpoly_ctx_clear(ctx);
+  return RES;
+}
+
+CanonicalForm gcdFlintMP_Zp(const CanonicalForm& F, const CanonicalForm& G)
+{
+  int N=F.level();
+  int lf,lg,m=1<<MPOLY_MIN_BITS;
+  lf=size_maxexp(F,m);
+  lg=size_maxexp(G,m);
+  int bits=SI_LOG2(m)+1;
+  nmod_mpoly_ctx_t ctx;
+  nmod_mpoly_ctx_init(ctx,N,ORD_LEX,getCharacteristic());
+  nmod_mpoly_t f,g,res;
+  nmod_mpoly_init3(f,lf,bits,ctx);
+  nmod_mpoly_init3(g,lg,bits,ctx);
+  convFactoryPFlintMP(F,f,ctx,N);
+  convFactoryPFlintMP(G,g,ctx,N);
+  nmod_mpoly_init(res,ctx);
+  int ok=nmod_mpoly_gcd(res,f,g,ctx);
+  nmod_mpoly_clear(g,ctx);
+  nmod_mpoly_clear(f,ctx);
+  CanonicalForm RES=1;
+  if (ok)
+  {
+    RES=convFlintMPFactoryP(res,ctx,N);
+  }
+  nmod_mpoly_clear(res,ctx);
+  nmod_mpoly_ctx_clear(ctx);
+  return RES;
+}
+
+static CanonicalForm b_content ( const CanonicalForm & f )
+{
+    if ( f.inCoeffDomain() )
+        return f;
+    else
+    {
+        CanonicalForm result = 0;
+        CFIterator i;
+        for ( i = f; i.hasTerms() && (!result.isOne()); i++ )
+            result=bgcd( b_content(i.coeff()) , result );
+        return result;
+    }
+}
+
+
+CanonicalForm gcdFlintMP_QQ(const CanonicalForm& F, const CanonicalForm& G)
+{
+  int N=F.level();
+  fmpq_mpoly_ctx_t ctx;
+  fmpq_mpoly_ctx_init(ctx,N,ORD_LEX);
+  fmpq_mpoly_t f,g,res;
+  fmpq_mpoly_init(f,ctx);
+  fmpq_mpoly_init(g,ctx);
+  convFactoryPFlintMP(F,f,ctx,N);
+  convFactoryPFlintMP(G,g,ctx,N);
+  fmpq_mpoly_init(res,ctx);
+  int ok=fmpq_mpoly_gcd(res,f,g,ctx);
+  fmpq_mpoly_clear(g,ctx);
+  fmpq_mpoly_clear(f,ctx);
+  CanonicalForm RES=1;
+  if (ok)
+  {
+    // Flint normalizes the gcd to be monic.
+    // Singular wants a gcd defined over ZZ that is primitive and has a positive leading coeff.
+    if (!fmpq_mpoly_is_zero(res, ctx))
+    {
+      fmpq_t content;
+      fmpq_init(content);
+      fmpq_mpoly_content(content, res, ctx);
+      fmpq_mpoly_scalar_div_fmpq(res, res, content, ctx);
+      fmpq_clear(content);
+    }
+    RES=convFlintMPFactoryP(res,ctx,N);
+    // gcd(2x,4x) should be 2x, so RES should also have the gcd(lc(F),lc(G))
+    RES*=bgcd(b_content(F),b_content(G));
+  }
+  fmpq_mpoly_clear(res,ctx);
+  fmpq_mpoly_ctx_clear(ctx);
+  return RES;
+}
+
+#endif
+
+#endif
+
+

factory/FLINTconvert.h

@@ -250 +250 @@
 
 
-#endif
-#endif
+#if __FLINT_RELEASE >= 20503
+CanonicalForm mulFlintMP_Zp(const CanonicalForm& F,int lF, const CanonicalForm& Gi, int lG, int m);
+CanonicalForm mulFlintMP_QQ(const CanonicalForm& F,int lF, const CanonicalForm& Gi, int lG, int m);
+CanonicalForm gcdFlintMP_Zp(const CanonicalForm& F, const CanonicalForm& G);
+CanonicalForm gcdFlintMP_QQ(const CanonicalForm& F, const CanonicalForm& G);
+#endif
+#endif
+#endif

factory/Makefile.am

@@ -173 +173 @@
 libfactory_includedir = ${includedir}/factory
 
-nodist_libfactory_include_HEADERS = factory.h factoryconf.h globaldefs.h
+nodist_libfactory_include_HEADERS = factory.h factoryconf.h
+libfactory_include_HEADERS = globaldefs.h
 
 

factory/NTLconvert.cc

@@ -33 +33 @@
 #include "NTLconvert.h"
 
+#ifdef HAVE_OMALLOC
+#define Alloc(L) omAlloc(L)
+#define Free(A,L) omFreeSize(A,L)
+#else
 #define Alloc(L) malloc(L)
 #define Free(A,L) free(A)
+#endif
 
 void out_cf(const char *s1,const CanonicalForm &f,const char *s2);

factory/canonicalform.cc

@@ -17 +17 @@
 #include "gfops.h"
 #include "facMul.h"
+#include "facAlgFuncUtil.h"
 #include "FLINTconvert.h"
 
@@ -707 +708 @@
     else  if ( value->level() == cf.value->level() ) {
 #if (HAVE_NTL && HAVE_FLINT && __FLINT_RELEASE >= 20400)
+#if (__FLINT_RELEASE >= 20503)
+        int l_this,l_cf,m=1;
+        if ((getCharacteristic()>0)
+        && (CFFactory::gettype() != GaloisFieldDomain)
+        &&(!hasAlgVar(*this))
+        &&(!hasAlgVar(cf))
+        &&((l_cf=size_maxexp(cf,m))>10)
+        &&((l_this=size_maxexp(*this,m))>10)
+        )
+        {
+          *this=mulFlintMP_Zp(*this,l_this,cf,l_cf,m);
+        }
+        else
+        /*-----------------------------------------------------*/
+        if ((getCharacteristic()==0)
+        &&(!hasAlgVar(*this))
+        &&(!hasAlgVar(cf))
+        &&((l_cf=size_maxexp(cf,m))>10)
+        &&((l_this=size_maxexp(*this,m))>10)
+        )
+        {
+          *this=mulFlintMP_QQ(*this,l_this,cf,l_cf,m);
+        }
+        else
+#endif
+
         if (value->levelcoeff() == cf.value->levelcoeff() && cf.isUnivariate() && (*this).isUnivariate())
         {

factory/cf_char.cc

@@ -33 +33 @@
         theDegree = 1;
         CFFactory::settype( FiniteFieldDomain );
+        ff_big = c > cf_getSmallPrime( cf_getNumSmallPrimes()-1 );
+        if (c!=theCharacteristic)
+        {
+          if (c > 536870909) factoryError("characteristic is too large(max is 2^29)");
+          ff_setprime( c );
+        }
         theCharacteristic = c;
-        ff_big = c > cf_getSmallPrime( cf_getNumSmallPrimes()-1 );
-        if (c > 536870909) factoryError("characteristic is too large(max is 2^29)");
-        ff_setprime( c );
     }
 }

factory/cf_gcd.cc

@@ -26 +26 @@
 #include "cfSubResGcd.h"
 #include "cfModGcd.h"
+#include "FLINTconvert.h"
 #include "facAlgFuncUtil.h"
 
@@ -100 +101 @@
   if ( getCharacteristic() != 0 )
   {
+    #if defined(HAVE_FLINT) && ( __FLINT_RELEASE >= 20503)
+    if ( isOn( SW_USE_FL_GCD_P)
+    && (CFFactory::gettype() != GaloisFieldDomain)
+    && (getCharacteristic()>10)
+    &&(!hasAlgVar(fc)) && (!hasAlgVar(gc)))
+    {
+      return gcdFlintMP_Zp(fc,gc);
+    }
+    #endif
     #ifdef HAVE_NTL
     if ((!fc_and_gc_Univariate) && (isOn( SW_USE_EZGCD_P )))
@@ -119 +129 @@
     fc = subResGCD_p( fc, gc );
   }
-  else if (!fc_and_gc_Univariate)
+  else if (!fc_and_gc_Univariate) /* && char==0*/
   {
+    #if defined(HAVE_FLINT) && ( __FLINT_RELEASE >= 20503)
+    if (( isOn( SW_USE_FL_GCD_0) )
+    &&(!hasAlgVar(fc)) && (!hasAlgVar(gc)))
+    {
+      return gcdFlintMP_QQ(fc,gc);
+    }
+    else
+    #endif
     if ( isOn( SW_USE_EZGCD ) )
       fc= ezgcd (fc, gc);
-#ifdef HAVE_NTL
+    #ifdef HAVE_NTL
     else if (isOn(SW_USE_CHINREM_GCD))
       fc = modGCDZ( fc, gc);
-#endif
+    #endif
     else
     {
@@ -311 +329 @@
                 CanonicalForm cdF = bCommonDen( f );
                 CanonicalForm cdG = bCommonDen( g );
+                CanonicalForm F = f * cdF, G = g * cdG;
                 Off( SW_RATIONAL );
-                CanonicalForm l = lcm( cdF, cdG );
-                On( SW_RATIONAL );
-                CanonicalForm F = f * l, G = g * l;
-                Off( SW_RATIONAL );
-                l = gcd_poly( F, G );
+                CanonicalForm l = gcd_poly( F, G );
                 On( SW_RATIONAL );
                 return abs( l );

factory/cf_switches.cc

@@ -32 +32 @@
 #ifdef HAVE_NTL
   On(SW_USE_CHINREM_GCD);
-  //Off(SW_USE_NTL_SORT);
+  On(SW_USE_NTL_SORT);
+#endif
+#ifdef HAVE_FLINT
   On(SW_USE_FL_GCD_P);
-  //On(SW_USE_FL_GCD_0);
+  On(SW_USE_FL_GCD_0);
 #endif
   On(SW_USE_EZGCD);

factory/facFqBivar.cc

@@ -6883 +6883 @@
 #ifdef HAVE_FLINT
   nmod_mat_t FLINTN;
-#else
+#endif
+
   if (fac_NTL_char != getCharacteristic())
   {
@@ -6890 +6891 @@
   }
   mat_zz_p NTLN;
-#endif
 
   if (alpha.level() != 1)
@@ -6898 +6898 @@
   }
   mat_zz_pE NTLNe;
+
   if (alpha.level() == 1)
   {

kernel/GBEngine/kstd1.cc

@@ -38 +38 @@
 #include "kernel/GBEngine/kInline.h"
 
+#ifdef HAVE_SHIFTBBA
+#include "polys/shiftop.h"
+#endif
 
 /* the list of all options which give a warning by test */
@@ -2343 +2346 @@
 
 #ifdef HAVE_SHIFTBBA
-  if(rIsLPRing(currRing)) return freegb(F, Q);
+  if(rIsLPRing(currRing)) return kStdShift(F, Q, h, w, hilb, syzComp, newIdeal, vw, FALSE);
 #endif
 
@@ -2820 +2823 @@
                 int newIdeal, intvec *vw, BOOLEAN rightGB)
 {
+  assume(rIsLPRing(currRing));
+  assume(idIsInV(F));
   ideal r;
   BOOLEAN b=currRing->pLexOrder,toReset=FALSE;
@@ -2913 +2918 @@
   delete(strat);
   if ((delete_w)&&(w!=NULL)&&(*w!=NULL)) delete *w;
+  assume(idIsInV(r));
   return r;
 }

kernel/GBEngine/kstd1.h

@@ -42 +42 @@
     int syzComp=0, int newIdeal=0, intvec *vw=NULL, BOOLEAN rightGB=FALSE);
 
-ideal freegb(ideal F, ideal Q);
 ideal rightgb(ideal F, ideal Q);
 

kernel/GBEngine/kstd2.cc

@@ -4520 +4520 @@
 }
 
-
-ideal freegb(ideal F, ideal Q)
-{
-  assume(rIsLPRing(currRing));
-  assume(idIsInV(F));
-  ideal RS = kStdShift(F, Q, testHomog, NULL);
-  idSkipZeroes(RS); // is this even necessary?
-  assume(idIsInV(RS));
-  return(RS);
-}
-
+#ifdef HAVE_SHIFTBBA
 ideal rightgb(ideal F, ideal Q)
 {
@@ -4540 +4530 @@
   return(RS);
 }
+#endif
 
 /*2

kernel/ideals.cc

@@ -617 +617 @@
     p = h2->m[j];
     q = pOne();
+#ifdef HAVE_SHIFTBBA
+    // non multiplicative variable
+    if (rIsLPRing(currRing))
+    {
+      pSetExp(q, currRing->isLPring - currRing->LPncGenCount + j + 1, 1);
+      p_Setm(q, currRing);
+    }
+#endif
     pSetComp(q,syzcomp+1+j);
     pSetmComp(q);
     if (p!=NULL)
     {
-      while (pNext(p)) pIter(p);
-      p->next = q;
+#ifdef HAVE_SHIFTBBA
+      if (rIsLPRing(currRing))
+      {
+        h2->m[j] = pAdd(p, q);
+      }
+      else
+#endif
+      {
+        while (pNext(p)) pIter(p);
+        p->next = q;
+      }
     }
     else
@@ -630 +647 @@
   idTest(h2);
 
+#ifdef HAVE_SHIFTBBA
+  if (rIsLPRing(currRing)) alg = GbStd;
+#endif
   ideal h3=NULL;
   if (alg==GbDefault) alg=GbStd;

kernel/mod2.h

@@ -77 +77 @@
 #endif
 
-#define SINGULAR_PATCHLEVEL 0
+#define SINGULAR_PATCHLEVEL 2
 #define SINGULAR_VERSION ((SINGULAR_MAJOR_VERSION*1000 + SINGULAR_MINOR_VERSION*100 + SINGULAR_SUB_VERSION*10)+SINGULAR_PATCHLEVEL)
 

kernel/preimage.cc

@@ -88 +88 @@
   }
 
-  assume(n_SetMap(theImageRing->cf, dst_r->cf) == ndCopyMap);
-
   if (theImageRing->cf != dst_r->cf)
   {

libpolys/coeffs/Makefile.am

@@ -44 +44 @@
 test_LDADD   = libcoeffs.la $(libcoeffs_la_LIBADD)
 
-EXTRA_DIST = rintegers2.cc rinteger3.cc
+EXTRA_DIST = rintegers2.cc rintegers3.cc

libpolys/coeffs/rintegers2.cc

@@ -515 +515 @@
 }
 
+static void nrzMPZ(mpz_t res, number &a, const coeffs)
+{
+  mpz_init_set(res, (mpz_ptr) a);
+}
+
 static number nrzFarey(number r, number N, const coeffs R)
 {
@@ -621 +626 @@
   r->cfInit = nrzInit;
   r->cfInitMPZ = nrzInitMPZ;
+  r->cfMPZ = nrzMPZ;
   r->cfSize  = nrzSize;
   r->cfInt  = nrzInt;

libpolys/polys/clapconv.cc

@@ -87 +87 @@
   p1=p;
   l=l/2;
-  while(l>0) { p=pNext(p); l--; }
+  while(l>1) { p=pNext(p); l--; }
   p2=pNext(p);
   pNext(p)=NULL;
@@ -101 +101 @@
 
 #define MIN_CONV_LEN 7
-CanonicalForm convSingPFactoryP( poly p, const ring r )
+static CanonicalForm convSingPFactoryP_intern( poly p, int l, BOOLEAN & setChar,const ring r )
 {
   CanonicalForm result = 0;
   int e, n = rVar(r);
-  BOOLEAN setChar=TRUE;
-
-  int l;
-  if ((l=pLength(p))>MIN_CONV_LEN)
+  assume(l==pLength(p));
+
+  if (l>MIN_CONV_LEN)
   {
     poly p1,p2;
     convPhalf(p,l,p1,p2);
-    CanonicalForm P=convSingPFactoryP(p1,r);
-    P+=convSingPFactoryP(p2,r);
+    CanonicalForm P=convSingPFactoryP_intern(p1,l/2,setChar,r);
+    P+=convSingPFactoryP_intern(p2,l-l/2,setChar,r);
     convPunhalf(p1,p2);
     return P;
   }
+  BOOLEAN setChar_loc=setChar;
+  setChar=FALSE;
   while ( p!=NULL )
   {
-    CanonicalForm term=r->cf->convSingNFactoryN(pGetCoeff( p ),setChar, r->cf);
+    CanonicalForm term=r->cf->convSingNFactoryN(pGetCoeff( p ),setChar_loc, r->cf);
     if (errorreported) break;
-    setChar=FALSE;
+    setChar_loc=FALSE;
     for ( int i = 1; i <=n; i++ )
     {
@@ -131 +132 @@
  }
  return result;
+}
+
+CanonicalForm convSingPFactoryP( poly p, const ring r )
+{
+  BOOLEAN setChar=TRUE;
+  return convSingPFactoryP_intern(p,pLength(p),setChar,r);
 }
 

libpolys/polys/clapsing.cc

@@ -59 +59 @@
   #ifdef HAVE_FLINT
   #if __FLINT_RELEASE >= 20503
-  if (rField_is_Zp(r) && (r->cf->ch>500))
+  if (rField_is_Zp(r) && (r->cf->ch>10))
   {
     nmod_mpoly_ctx_t ctx;

libpolys/polys/flint_mpoly.cc

@@ -65 +65 @@
 #if 1
 // memory allocation is not thread safe; singular polynomials must be constructed in serial
+
+/*
+    We agree the that result of a singular -> fmpq_mpoly conversion is
+    readonly. This restricts the usage of the result in flint functions to
+    const arguments. However, the real readonly conversion is currently only
+    implemented in the threaded conversion below since it requires a scan of
+    all coefficients anyways. The _fmpq_mpoly_clear_readonly_sing needs to
+    be provided for a consistent interface in the polynomial operations.
+*/
+static void _fmpq_mpoly_clear_readonly_sing(fmpq_mpoly_t a, fmpq_mpoly_ctx_t ctx)
+{
+    fmpq_mpoly_clear(a, ctx);
+}
 
 void convSingPFlintMP(fmpq_mpoly_t res, fmpq_mpoly_ctx_t ctx, poly p, int lp, const ring r)
@@ -186 +199 @@
 }
 
+
+/*
+    In order that flint may sometimes borrow the large integer coeffs of
+    polynomials over QQ (borrow means: simply point to the same GMP structs
+    that singular has already allocated), we define the result of a
+    singular -> fmpq_mpoly conversion to be readonly. This means we agree
+    that
+        - it can only be used as an const argument to a flint function
+        - singular must not mutate the original coeffs while the readonly object is in use
+*/
+
+static void _fmpq_mpoly_clear_readonly_sing(fmpq_mpoly_t a, fmpq_mpoly_ctx_t ctx)
+{
+    if (fmpq_is_one(a->content))
+    {
+        if (a->zpoly->alloc > 0)
+        {
+            flint_free(a->zpoly->coeffs);
+            flint_free(a->zpoly->exps);
+        }
+
+        fmpq_clear(a->content);
+    }
+    else
+    {
+        fmpq_mpoly_clear(a, ctx);
+    }
+}
+
 /* singular -> fmpq_mpoly conversion */
 
@@ -197 +239 @@
     std::vector<poly> markers;
     ring r;
-
-    convert_sing_to_fmpq_mpoly_base(slong num_threads_, fmpq_mpoly_struct * res_,
-                             const fmpq_mpoly_ctx_struct * ctx_, const ring r_, poly p)
-      : num_threads(num_threads_),
+    fmpq_t content;
+
+    convert_sing_to_fmpq_mpoly_base(fmpq_mpoly_struct * res_,
+                     const fmpq_mpoly_ctx_struct * ctx_, const ring r_, poly p)
+      : num_threads(0),
         res(res_),
         ctx(ctx_),
         r(r_)
     {
+        fmpq_t c;
+        fmpq_init(c);
+        fmpq_init(content);
+        fmpq_zero(content);
+
         length = 0;
         while (1)
         {
             if ((length % 4096) == 0)
+            {
+                my_convSingNFlintN_QQ(c, number(pGetCoeff(p)));
+                fmpq_gcd(content, content, c);
                 markers.push_back(p);
+            }
             if (p == NULL)
                 return;
@@ -215 +267 @@
             pIter(p);
         }
+
+        fmpq_clear(c);
+    }
+
+    ~convert_sing_to_fmpq_mpoly_base()
+    {
+        fmpq_clear(content);
     }
 };
@@ -248 +307 @@
 
     flint_bitcnt_t required_bits = MPOLY_MIN_BITS;
-    fmpq_zero(arg->content);
+    fmpq_set(arg->content, base->content);
 
     while (idx < arg->end_idx)
     {
-        my_convSingNFlintN_QQ(c, number(pGetCoeff(p)));
-        fmpq_gcd(arg->content, arg->content, c);
+        number n = number(pGetCoeff(p));
+
+        if (fmpq_is_one(arg->content) && (SR_HDL(n)&SR_INT || n->s >= 3))
+        {
+            /* content is 1 and n is an integer, nothing to do */
+        }
+        else
+        {
+            my_convSingNFlintN_QQ(c, n);
+            fmpq_gcd(arg->content, arg->content, c);
+        }
 
         #if SIZEOF_LONG==8
@@ -293 +361 @@
     }
 
+    slong N = mpoly_words_per_exp(base->res->zpoly->bits, base->ctx->zctx->minfo);
+    fmpz * res_coeffs = base->res->zpoly->coeffs;
+    ulong * res_exps = base->res->zpoly->exps;
+    flint_bitcnt_t res_bits = base->res->zpoly->bits;
+
     while (idx < arg->end_idx)
     {
-        my_convSingNFlintN_QQ(c, number(pGetCoeff(p)));
-        FLINT_ASSERT(!fmpq_is_zero(base->res->content));
-        fmpq_div(t, c, base->res->content);
-        FLINT_ASSERT(fmpz_is_one(fmpq_denref(t)));
-
-        slong N = mpoly_words_per_exp(base->res->zpoly->bits, base->ctx->zctx->minfo);
-        fmpz_swap(base->res->zpoly->coeffs + idx, fmpq_numref(t));
+        if (fmpq_is_one(base->res->content))
+        {
+            // borrowing singular integers
+            // the entry res_coeffs[idx] is junk, we should just overwrite it
+
+            number n = number(pGetCoeff(p));
+
+            if (SR_HDL(n)&SR_INT)
+            {
+                // n is a singular-small integer
+                res_coeffs[idx] = SR_TO_INT(n);
+            }
+            else if (n->s<3)
+            {
+                // n is an element of QQ \ ZZ, should not happen
+                assume(false);
+            }
+            else
+            {
+                // n is a singular-large integer, n may be flint-small
+                res_coeffs[idx] = PTR_TO_COEFF(n->z);
+                if (fmpz_fits_si(res_coeffs + idx))
+                {
+                    slong val = fmpz_get_si(res_coeffs + idx);
+                    if (val >= COEFF_MIN && val <= COEFF_MAX)
+                        res_coeffs[idx] = val;
+                }
+            }
+        }
+        else
+        {
+            my_convSingNFlintN_QQ(c, number(pGetCoeff(p)));
+            FLINT_ASSERT(!fmpq_is_zero(base->res->content));
+            fmpq_div(t, c, base->res->content);
+            FLINT_ASSERT(fmpz_is_one(fmpq_denref(t)));
+            fmpz_swap(res_coeffs + idx, fmpq_numref(t));
+        }
+
         #if SIZEOF_LONG==8
         p_GetExpVL(p, (int64*)exp, base->r);
-        mpoly_set_monomial_ui(base->res->zpoly->exps + N*idx, exp, base->res->zpoly->bits, base->ctx->zctx->minfo);
+        mpoly_set_monomial_ui(res_exps + N*idx, exp, res_bits, base->ctx->zctx->minfo);
         #else
         p_GetExpV(p, (int*)exp, base->r);
-        mpoly_set_monomial_ui(base->res->zpoly->exps + N*idx, &(exp[1]), base->res->zpoly->bits, base->ctx->minfo);
+        mpoly_set_monomial_ui(res_exps + N*idx, &(exp[1]), res_bits, base->ctx->minfo);
         #endif
 
@@ -324 +428 @@
     thread_pool_handle * handles;
     slong num_handles;
-    slong thread_limit = 1000;
-
-    /* get workers */
+    slong thread_limit = 1000; // TODO: should be paramter to this function
+
+    /* the constructor works out the length of p and sets some markers */
+    convert_sing_to_fmpq_mpoly_base base(res, ctx, r, p);
+
+    /* sensibly limit thread count and get workers */
+    thread_limit = FLINT_MIN(thread_limit, base.length/1024);
     handles = NULL;
     num_handles = 0;
@@ -340 +448 @@
     }
 
-    convert_sing_to_fmpq_mpoly_base base(num_handles + 1, res, ctx, r, p);
-
     /* fill in thread division points */
+    base.num_threads = 1 + num_handles;
     convert_sing_to_fmpq_mpoly_arg * args = new convert_sing_to_fmpq_mpoly_arg[base.num_threads];
     slong cur_idx = 0;
@@ -348 +455 @@
     {
         slong next_idx = i + 1 < base.num_threads ? (i + 1)*base.length/base.num_threads : base.length;
+        FLINT_ASSERT(cur_idx <= base.length);
         next_idx = FLINT_MAX(next_idx, cur_idx);
         next_idx = FLINT_MIN(next_idx, base.length);
@@ -367 +475 @@
         required_bits = FLINT_MAX(required_bits, args[i].required_bits);
 
-    /* initialize res with optimal bits */
-    fmpq_mpoly_init3(res, base.length, mpoly_fix_bits(required_bits, ctx->zctx->minfo), ctx);
-
     /* sign of content should match sign of first coeff */
-    fmpq_zero(base.res->content);
+    fmpq_t content;
+    fmpq_init(content);
+    fmpq_zero(content);
     for (slong i = 0; i < base.num_threads; i++)
-        fmpq_gcd(base.res->content, base.res->content, args[i].content);
+        fmpq_gcd(content, content, args[i].content);
     if (p != NULL)
     {
@@ -380 +487 @@
         my_convSingNFlintN_QQ(c, number(pGetCoeff(p)));
         if (fmpq_sgn(c) < 0)
-            fmpq_neg(base.res->content, base.res->content);
+            fmpq_neg(content, content);
         fmpq_clear(c);
     }
+
+    /* initialize res with optimal bits */
+    required_bits = mpoly_fix_bits(required_bits, ctx->zctx->minfo);
+    if (fmpq_is_one(content))
+    {
+        /* initialize borrowed coeffs */
+        slong N = mpoly_words_per_exp(required_bits, ctx->zctx->minfo);
+        slong alloc = base.length;
+        if (alloc != 0)
+        {
+            res->zpoly->coeffs = (fmpz *) flint_malloc(alloc*sizeof(fmpz));
+            res->zpoly->exps   = (ulong *) flint_malloc(alloc*N*sizeof(ulong));
+        }
+        else
+        {
+            res->zpoly->coeffs = NULL;
+            res->zpoly->exps = NULL;
+        }
+        res->zpoly->alloc = alloc;
+        res->zpoly->length = 0;
+        res->zpoly->bits = required_bits;
+
+        fmpq_init(res->content);
+        fmpq_one(res->content);
+    }
+    else
+    {
+        /* initialize coeffs that will be created and destroyed */
+        fmpq_mpoly_init3(res, base.length, required_bits, ctx);
+        fmpq_swap(res->content, content);
+    }
+
+    fmpq_clear(content);
 
     /* fill in res->zpoly */
@@ -468 +608 @@
     thread_pool_handle * handles;
     slong num_handles;
-    slong thread_limit = 1000;
-
-    /* get workers */
+    slong thread_limit = 1000;// TODO: should be paramter to this function
+
+    /* sensibly limit threads and get workers */
+    thread_limit = FLINT_MIN(thread_limit, f->zpoly->length/1024);
     handles = NULL;
     num_handles = 0;
@@ -485 +626 @@
 
     convert_fmpq_mpoly_to_sing_base base(num_handles + 1, f, ctx, r);
-
     convert_fmpq_mpoly_to_sing_arg * args = new convert_fmpq_mpoly_to_sing_arg[base.num_threads];
     slong cur_idx = 0;
@@ -492 +632 @@
         slong next_idx = i + 1 < base.num_threads ? (i + 1)*base.f->zpoly->length/base.num_threads
                                                   : base.f->zpoly->length;
+        FLINT_ASSERT(cur_idx <= base.f->zpoly->length);
         next_idx = FLINT_MAX(next_idx, cur_idx);
         next_idx = FLINT_MIN(next_idx, base.f->zpoly->length);
@@ -542 +683 @@
     ring r;
 
-    convert_sing_to_nmod_mpoly_base(slong num_threads_, nmod_mpoly_struct * res_,
-                            const nmod_mpoly_ctx_struct * ctx_, const ring r_, poly p)
-      : num_threads(num_threads_),
+    convert_sing_to_nmod_mpoly_base(nmod_mpoly_struct * res_,
+                     const nmod_mpoly_ctx_struct * ctx_, const ring r_, poly p)
+      : num_threads(0),
         res(res_),
         ctx(ctx_),
@@ -624 +765 @@
     }
 
+    slong N = mpoly_words_per_exp(base->res->bits, base->ctx->minfo);
+    ulong * res_coeffs = base->res->coeffs;
+    ulong * res_exps = base->res->exps;
+    flint_bitcnt_t res_bits = base->res->bits;
+
     while (idx < arg->end_idx)
     {
-        slong N = mpoly_words_per_exp(base->res->bits, base->ctx->minfo);
         #if SIZEOF_LONG==8
         p_GetExpVL(p, (int64*)exp, base->r);
-        mpoly_set_monomial_ui(base->res->exps + N*idx, exp, base->res->bits, base->ctx->minfo);
+        mpoly_set_monomial_ui(res_exps + N*idx, exp, res_bits, base->ctx->minfo);
         #else
         p_GetExpV(p, (int*)exp, base->r);
-        mpoly_set_monomial_ui(base->res->exps + N*idx, &(exp[1]), base->res->bits, base->ctx->minfo);
+        mpoly_set_monomial_ui(res_exps + N*idx, &(exp[1]), res_bits, base->ctx->minfo);
         #endif
 
-        base->res->coeffs[idx] = (ulong)(number(pGetCoeff(p)));
+        res_coeffs[idx] = (ulong)(number(pGetCoeff(p)));
 
         pIter(p);
@@ -649 +794 @@
     thread_pool_handle * handles;
     slong num_handles;
-    slong thread_limit = 1000;
-
-    /* get workers */
+    slong thread_limit = 1000; // TODO: should be paramter to this function
+
+    /* the constructor works out the length of p and sets some markers */
+    convert_sing_to_nmod_mpoly_base base(res, ctx, r, p);
+
+    /* sensibly limit thread count and get workers */
+    thread_limit = FLINT_MIN(thread_limit, base.length/1024);
     handles = NULL;
     num_handles = 0;
@@ -665 +814 @@
     }
 
-    convert_sing_to_nmod_mpoly_base base(num_handles + 1, res, ctx, r, p);
-
     /* fill in thread division points */
+    base.num_threads = 1 + num_handles;
     convert_sing_to_nmod_mpoly_arg * args = new convert_sing_to_nmod_mpoly_arg[base.num_threads];
     slong cur_idx = 0;
@@ -674 +822 @@
         slong next_idx = i + 1 < base.num_threads ? (i + 1)*base.length/base.num_threads
                                                   : base.length;
+        FLINT_ASSERT(cur_idx <= base.length);
         next_idx = FLINT_MAX(next_idx, cur_idx);
         next_idx = FLINT_MIN(next_idx, base.length);
@@ -777 +926 @@
     thread_pool_handle * handles;
     slong num_handles;
-    slong thread_limit = 1000;
-
-    /* get workers */
+    slong thread_limit = 1000; // TODO: should be paramter to this function
+
+    /* sensibly limit threads and get workers */
+    thread_limit = FLINT_MIN(thread_limit, f->length/1024);
     handles = NULL;
     num_handles = 0;
@@ -794 +944 @@
 
     convert_nmod_mpoly_to_sing_base base(num_handles + 1, f, ctx, r);
-
     convert_nmod_mpoly_to_sing_arg * args = new convert_nmod_mpoly_to_sing_arg[base.num_threads];
     slong cur_idx = 0;
@@ -801 +950 @@
         slong next_idx = i + 1 < base.num_threads ? (i + 1)*base.f->length/base.num_threads
                                                   : base.f->length;
+        FLINT_ASSERT(cur_idx <= base.f->length);
         next_idx = FLINT_MAX(next_idx, cur_idx);
         next_idx = FLINT_MIN(next_idx, base.f->length);
@@ -845 +995 @@
 {
   fmpq_mpoly_t pp,qq,res;
-  convSingPFlintMP(pp,ctx,p,lp,r);
-  convSingPFlintMP(qq,ctx,q,lq,r);
+  convSingPFlintMP(pp,ctx,p,lp,r); // pp read only
+  convSingPFlintMP(qq,ctx,q,lq,r); // qq read only
   fmpq_mpoly_init(res,ctx);
   fmpq_mpoly_mul(res,pp,qq,ctx);
   poly pres=convFlintMPSingP(res,ctx,r);
   fmpq_mpoly_clear(res,ctx);
-  fmpq_mpoly_clear(pp,ctx);
-  fmpq_mpoly_clear(qq,ctx);
+  _fmpq_mpoly_clear_readonly_sing(pp,ctx);
+  _fmpq_mpoly_clear_readonly_sing(qq,ctx);
   fmpq_mpoly_ctx_clear(ctx);
   p_Test(pres,r);
@@ -878 +1028 @@
 {
   fmpq_mpoly_t pp,qq,res;
-  convSingPFlintMP(pp,ctx,p,lp,r);
-  convSingPFlintMP(qq,ctx,q,lq,r);
+  convSingPFlintMP(pp,ctx,p,lp,r); // pp read only
+  convSingPFlintMP(qq,ctx,q,lq,r); // qq read only
   fmpq_mpoly_init(res,ctx);
   fmpq_mpoly_divides(res,pp,qq,ctx);
   poly pres = convFlintMPSingP(res,ctx,r);
   fmpq_mpoly_clear(res,ctx);
-  fmpq_mpoly_clear(pp,ctx);
-  fmpq_mpoly_clear(qq,ctx);
+  _fmpq_mpoly_clear_readonly_sing(pp,ctx);
+  _fmpq_mpoly_clear_readonly_sing(qq,ctx);
   fmpq_mpoly_ctx_clear(ctx);
   p_Test(pres,r);
@@ -934 +1084 @@
 {
   fmpq_mpoly_t pp,qq,res;
-  convSingPFlintMP(pp,ctx,p,lp,r);
-  convSingPFlintMP(qq,ctx,q,lq,r);
+  convSingPFlintMP(pp,ctx,p,lp,r); // pp read only
+  convSingPFlintMP(qq,ctx,q,lq,r); // qq read only
   fmpq_mpoly_init(res,ctx);
   int ok=fmpq_mpoly_gcd(res,pp,qq,ctx);
@@ -959 +1109 @@
   }
   fmpq_mpoly_clear(res,ctx);
-  fmpq_mpoly_clear(pp,ctx);
-  fmpq_mpoly_clear(qq,ctx);
+  _fmpq_mpoly_clear_readonly_sing(pp,ctx);
+  _fmpq_mpoly_clear_readonly_sing(qq,ctx);
   fmpq_mpoly_ctx_clear(ctx);
   return pres;

libpolys/polys/monomials/ring.cc

@@ -432 +432 @@
   if (rIsLPRing(r))
   {
-    Print("\n// letterplace ring (block size %d)",r->isLPring);
+    Print("\n// letterplace ring (block size %d, ncgen count %d)",r->isLPring, r->LPncGenCount);
   }
 #endif
@@ -1393 +1393 @@
 #ifdef HAVE_SHIFTBBA
   res->isLPring=r->isLPring; /* 0 for non-letterplace rings, otherwise the number of LP blocks, at least 1, known also as lV */
+  res->LPncGenCount=r->LPncGenCount;
 #endif
 
@@ -1522 +1523 @@
 #ifdef HAVE_SHIFTBBA
   res->isLPring=r->isLPring; /* 0 for non-letterplace rings, otherwise the number of LP blocks, at least 1, known also as lV */
+  res->LPncGenCount=r->LPncGenCount;
 #endif
 
@@ -1667 +1669 @@
   #ifdef HAVE_SHIFTBBA
   if (r1->isLPring!=r2->isLPring) return FALSE;
+  if (r1->LPncGenCount!=r2->LPncGenCount) return FALSE;
   #endif
 

libpolys/polys/monomials/ring.h

@@ -312 +312 @@
 #ifdef HAVE_SHIFTBBA
   short          isLPring; /* 0 for non-letterplace rings, otherwise the number of LP blocks, at least 1, known also as lV */
+  short          LPncGenCount;
 #endif
 

libpolys/polys/operations/p_Mult_q.cc

@@ -67 +67 @@
 }
 
+static void pqLengthApprox(poly p, poly q, int &lp, int &lq, const int min)
+{
+  int l = 0;
+
+  do
+  {
+    if (p == NULL)
+    {
+      lp=l;
+      lq=l+(q!=NULL);
+      return;
+    }
+    if (q == NULL) /* && p!=NULL */
+    {
+      lp=l+1;
+      lq=l;
+      return;
+    }
+    if (l>min) /* && p,q!=NULL */
+    {
+      lp=l; lq=l;
+      return;
+    }
+    pIter(p);
+    pIter(q);
+    l++;
+  }
+  while (1);
+}
+
 
 static poly _p_Mult_q_Bucket(poly p, const int lp,
@@ -290 +320 @@
   poly pt;
 
-  pqLength(p, q, lp, lq, MIN_LENGTH_FACTORY);
+  // MIN_LENGTH_FACTORY must be >= MIN_LENGTH_FACTORY_QQ, MIN_FLINT_QQ, MIN_FLINT_Zp 20
+  pqLengthApprox(p, q, lp, lq, MIN_LENGTH_FACTORY);
 
   if (lp < lq)
@@ -309 +340 @@
     if (pure_polys && rField_is_Q(r) && !convSingRFlintR(ctx,r))
     {
-      lp=pLength(p);
-      //printf("mul in flint\n");
-      poly res=Flint_Mult_MP(p,lp,q,lq,ctx,r);
+      // lq is a lower bound for the length of p and  q
+      poly res=Flint_Mult_MP(p,lq,q,lq,ctx,r);
       if (!copy)
       {
@@ -325 +355 @@
     if (pure_polys && rField_is_Zp(r) && !convSingRFlintR(ctx,r))
     {
-      lp=pLength(p);
-      //printf("mul in flint\n");
-      poly res=Flint_Mult_MP(p,lp,q,lq,ctx,r);
+      // lq is a lower bound for the length of p and  q
+      poly res=Flint_Mult_MP(p,lq,q,lq,ctx,r);
       if (!copy)
       {
@@ -357 +386 @@
   {
     lp=pLength(p);
-    assume(lq == pLength(q));
+    lq=pLength(q);
     return _p_Mult_q_Bucket(p, lp, q, lq, copy, r);
   }

libpolys/polys/shiftop.cc

@@ -529 +529 @@
   PrintLn(); WriteLPExpV(m1ExpV, ri);
 #endif
+  assume(_p_mLPNCGenValid(m1ExpV, ri));
 }
 
@@ -564 +565 @@
   PrintLn(); WriteLPExpV(m1ExpV, ri);
 #endif
+  assume(_p_mLPNCGenValid(m1ExpV, ri));
 }
 
@@ -608 +610 @@
   assume(p_FirstVblock(m1,r) <= 1);
   assume(p_FirstVblock(m2,r) <= 1);
+}
+
+BOOLEAN _p_mLPNCGenValid(int *mExpV, const ring r)
+{
+  BOOLEAN hasNCGen = FALSE;
+  int lV = r->isLPring;
+  int degbound = r->N/lV;
+  int ncGenCount = r->LPncGenCount;
+  for (int i = 1; i <= degbound; i++)
+  {
+    for (int j = i*lV; j > (i*lV - ncGenCount); j--)
+    {
+      if (mExpV[j])
+      {
+        if (hasNCGen)
+        {
+          return FALSE;
+        }
+        hasNCGen = TRUE;
+      }
+    }
+  }
+  return TRUE;
 }
 
@@ -673 +698 @@
     if (B[j]!=0) break;
   }
-  /* do not need e anymore */
+
+  if (j==0)
+  {
+    omFreeSize((ADDRESS) e, (r->N+1)*sizeof(int));
+    omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
+    return 1;
+  }
+
+  if (!_p_mLPNCGenValid(e, r))
+  {
+    omFreeSize((ADDRESS) e, (r->N+1)*sizeof(int));
+    omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
+    return 0;
+  }
+
   omFreeSize((ADDRESS) e, (r->N+1)*sizeof(int));
 
-  if (j==0) goto ret_true;
 //   {
 //     /* it is a zero exp vector, which is in V */
@@ -688 +726 @@
     {
       omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
-      return(0);
-    }
-  }
- ret_true:
+      return 0;
+    }
+  }
+
   omFreeSize((ADDRESS) B, (b+1)*sizeof(int));
-  return(1);
+  return 1;
 }
 
@@ -783 +821 @@
 }
 
-ring freeAlgebra(ring r, int d)
-{
+ring freeAlgebra(ring r, int d, int ncGenCount)
+{
+  if (ncGenCount) r = rCopy0(r);
+  for (int i = 1; i <= ncGenCount; i++)
+  {
+    char *varname=(char *)omAlloc(256);
+    sprintf(varname, "ncgen(%d)", i);
+    ring save = r;
+    r = rPlusVar(r, varname, 0);
+    omFreeSize(varname, 256);
+    rDelete(save);
+  }
   ring R=rCopy0(r);
   int p;
@@ -795 +843 @@
   R->N=r->N*d;
   R->isLPring=r->N;
+  R->LPncGenCount=ncGenCount;
   // create R->order
   BOOLEAN has_order_a=FALSE;
@@ -883 +932 @@
   R->names=names;
 
+  if (ncGenCount) rDelete(r);
   rComplete(R,TRUE);
   return R;

libpolys/polys/shiftop.h

@@ -55 +55 @@
 BOOLEAN _p_LPLmDivisibleByNoComp(poly a, poly b, const ring r);
 
+BOOLEAN _p_mLPNCGenValid(int *mExpV, const ring r);
+
 poly p_LPVarAt(poly p, int pos, const ring r);
 
 /// create the letterplace ring corresponding to r up to degree d
-ring freeAlgebra(ring r, int d);
+ring freeAlgebra(ring r, int d, int LPncGenCount = 0);
 #endif
 #endif