Redefinitions removed in intbas

Some polynomials and lists where defined twice, this is removed, and also some debug messages.
slap · Sep 20, 2023 · 8694755 · 8694755
1 parent 9e51a76
commit 8694755
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 8 deletions.
diff --git a/Singular/LIB/.singularhistory b/Singular/LIB/.singularhistory
@@ -1091,4 +1091,118 @@ LIB"integralbasis.lib";
 ring r = 0, (x,y), dp;
 poly f = (y7 + x4) * (y7 + y5x3 + x4)+y30;
 list l2 = integralBasis(f,2, "atOrigin", "noOpti");
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y4+3x3y + x4)*(y^7 + 6x4y3 + 2xy + x7)*(y5+7xy-4x2)*(y3+x2)*(y2-x3)+y30;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+l;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y4+3x3y + x4)*(y^7 + 6x4y3 + 2xy + x7)*(y5+7xy-4x2)*(y3+x2)*(y2-x3)+y30;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+"opti", timer - t;
+l1;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y4+3x3y + x4)*(y^7 + 6x4y3 + 2xy + x7)*(y9+7xy2-4x2)*(y3+x2)*(y2-x3)+y30;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+"opti", timer - t;
+l1;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + 3x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+"Optimization: ", timer - t;
+t = timer;
+l1;
+f;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+"Optimization: ", timer - t;
+t = timer;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+"Optimization: ", timer - t;
+t = timer;
+l1;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+l1;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+classes
+ifOut
+I2LiftedFull
+mdm
+with(algcurves);
+f := (Y^5 + X^2) * (Y^5 + Y^4*X + X^2)+Y^11;
+intBasis := integral_basis(f, X, Y);
+puiseux(f,X=0,Y,0);
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+classes
+I2Lifted
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+l1;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), lp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+l1;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y5 + x2) * (y5 + y4x + x2)+y11;
+int t = timer;
+list l1 = integralBasis(f,2, "atOrigin");
+l1;
+LIB"integralbasis.lib";
+ring r = 0, (x,y), dp;
+poly f = (y7 + x4) * (y7 + y5x3 + x4)+y30;
+list l1 = integralBasis(f,2, "atOrigin");
+"Optimization: ", timer - t;
+t = timer;
 
diff --git a/Singular/LIB/integralbasis.lib b/Singular/LIB/integralbasis.lib
@@ -1382,7 +1382,6 @@ static proc ibAt0(poly f, int locBasis)
 
   if((ifOut[4] == 1))  // Wrong number of factors, recompute orders
   {
-    "ifOut4 = 1";
     kill ordsFull;
     kill ordsBest;
     kill ordsTemp;
@@ -1423,6 +1422,7 @@ static proc ibAt0(poly f, int locBasis)
   if(ifOut[3] == 0)
   {
     "Classes are wrongly computed. We need to recompute!";
+    ~;
 
     list mergeCl = mergeClassesIF(f, classes, ifOut, mdm);
     classes = mergeCl[1];
@@ -2360,6 +2360,7 @@ proc buildPolyGroundXRoot(poly f, int den)
     I = groebner(I);
 
     poly fNew = 1;
+    poly fNewTemp;
     for(i = 1; i<=den; i++)
     {
       fNewTemp = fNew * (var(2) - pols[i]);
@@ -3166,6 +3167,7 @@ static proc irreducibleFactors(poly f, list classes, list blocks, int degExpand)
     int ind = 2;
     list classes2;
     poly fu, fuProd;
+    list bP;
     list fuPols;
     int PEPE;
     int cl;
@@ -3226,7 +3228,7 @@ static proc irreducibleFactors(poly f, list classes, list blocks, int degExpand)
 
             list bP = buildPolyGroundXRoot(PE[1][1], PE[1][2]);
 
-            "bP ring", bP;
+            //"bP ring", bP;
 
 
             poly fuProd = bP[1];
@@ -3235,20 +3237,20 @@ static proc irreducibleFactors(poly f, list classes, list blocks, int degExpand)
             //PEPE = PE[1][2];
 
             setring R;
-            poly fuProd = imap(S, fuProd);
+            fuProd = imap(S, fuProd);
             kill S;
           } else
           {
-            list bP = buildPolyGroundXRoot(classes2[j][1][1], classes2[j][1][2]);
-            poly fuProd = bP[1];
-            int gfCheck = bP[2];
+            bP = buildPolyGroundXRoot(classes2[j][1][1], classes2[j][1][2]);
+            fuProd = bP[1];
+            gfCheck = bP[2];
 
-            "bP poly", bP;
+            //"bP poly", bP;
 
           }
 
           bPG = list(fuProd, gfCheck);
-          "bPG"; bPG;
+          //"bPG"; bPG;
 
           if(bPG[2] == 0)
           {