Changeset d2c1f8 in git

Timestamp:

Feb 1, 2022, 3:15:47 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

305f3718988da09be4b95025aed6bc281e4b5e9e

Parents:

a6ae59204fea5adeb820cb3048d2cb60915467d7

Message:

integralbasis.lib: less noise, removed debug stuff

File:

• Singular/LIB/integralbasis.lib (modified) (26 diffs)

Singular/LIB/integralbasis.lib

@@ -2 +2 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
-version="version integralbasis.lib 4.2.1.3 Dec_2021 "; // $Id$
+version="version integralbasis.lib 4.3.0.1 Feb_2022 "; // $Id$
 category="Commutative Algebra";
 info="
@@ -280 +280 @@
 
 
-  // We chech if the only singularity is at the origin.
+  // We check if the only singularity is at the origin.
   //check0 = 0;
   if(check0 == 1)
   {
-    "Check at origin";
+    dbprint(dbg,"Check at origin");
     int c0 = checkAt0(f, modular);
 
@@ -515 +515 @@
   ideal J = f, diff(f, var(1)), diff(f, var(2));
 
-  if(dbg >= 4){
+  if(dbg >= 4)
+  {
     "The original singular locus is";
     J;
@@ -523 +524 @@
   {
     list out = trivialBasis(f);
-    "out";
-    out;
     return(list(out[1], out[2], 0, 0));
   }
@@ -753 +752 @@
   ideal elimJ = elim(jac, v);
   poly dJ = elimJ[1];
-  option("redSB");
+  option(redSB);
 
   ideal PP = changeDenominatorFast(U, den, dJ, f);
@@ -793 +792 @@
 {
   int dbg = printlevel - voice + 4;
-  option("redSB");
+  option(redSB);
   f = reduce(f, std(D));
 
@@ -2302 +2301 @@
   if(deg(f2, (1,0,0)) > 0)
   {
-    "f2", f2;
-    "Polynomial is not over the ground field";
-    ~;
+    //"f2", f2;
+    ERROR("Polynomial is not over the ground field");
     gfCheck = 0;
   }
@@ -2654 +2652 @@
   ch[pos] = ch[pos] + 1;
 
-//  "md: ", md;
-//  "ch: ", ch;
-//  "cl: ", cl;
   while(ch[pos] > md[pos])
   {
@@ -2663 +2658 @@
     ch[pos] = ch[pos] + 1;
   }
-//  "output: ", ch;
   return(ch);
 }
@@ -2955 +2949 @@
     int den = PE[1][2];
 
-    //"here";
-    //"h, g", h, g;
-
-    //"b debug overflow <-";
-
     if(size(h) > 1)
     {
       h = subst(h, var(1), var(1)^den);
       poly hs = subst(h, var(2), g);
-      //"b debug overflow <-";
 
       matrix MM;
@@ -2976 +2964 @@
       int oo = deg(MM[1, ncols(MM)])*deg(h, intvec(0,1)) + deg(h, intvec(1,0))*den;
     }
-    //~;
 
     number oro = oo/number(den);
 
-    //"h, oro", h, oro;
     kill h;
     kill g;
@@ -3019 +3005 @@
                     // the ground field.
   list gfCheckList;
-
-  //"nClasses: ", nClasses;
-  //"size(I2Lifted): ", size(I2Lifted);
-  //"I2Lifted: ", I2Lifted;
-  //"degExpand: ", degExpand;
 
   int wrongNumber = 0; // If some hensel block contains different classes
@@ -3092 +3073 @@
             } else
             {
-              "RING EXPECTED! Please contact the developers.";
-              ~;
+              ERROR("RING EXPECTED! Please contact the developers.");
             }
           }
@@ -3103 +3083 @@
             // The polynomial computed is not over the ground field.
             // The classes computed are wrong, we need to recompute.
-            "Polynomial not over the ground field.";
+            ERROR("Polynomial not over the ground field.");
             gfCheck = 0;
           }
@@ -3219 +3199 @@
           {
             k = chVec[i];
-            //"i, k", i, k;
             if(k > 0)
             {
@@ -3376 +3355 @@
   if(i == 1)
   {
-    //"Trivial case";
     return(ib[1][1]);
   }
@@ -3400 +3378 @@
   if(mExp > ib[i][2])
   {
-    "WRONG EXPONENT. CHECK!!";
+    ERROR("WRONG EXPONENT. CHECK!!");
     ~;
     setring BR;
@@ -3427 +3405 @@
   if(deg(red, va) > 0)
   {
-    "Wrong degree! Check!";
-    ~;
+    ERROR("Wrong degree! Check!");
   }
   setring BR;
@@ -3472 +3449 @@
       } else
       {
-        "Not implemented.";
+        ERROR("Not implemented.");
         return(list());
       }
@@ -3911 +3888 @@
     } else
     {
-    "ERROR";
-    ~;
       ERROR("f(y)*g(y) != h(0,y)");
     }
@@ -3931 +3906 @@
     } else
     {
-      "ERROR";
-      ~;
       ERROR("f(y)*g(y) != h(0,y)");
     }
@@ -4117 +4090 @@
     if(fLoc == 1)
     {
-      "Warning! No local component. This may indicate you are computing the basis at a value of X where there is no singularity.";
+      dbprint(dbg,"Warning! No local component. This may indicate you are computing the basis at a value of X where there is no singularity.");
     }
     comps[1] = fGlob[2];    // comp[1] is the component outside the origin.
@@ -4435 +4408 @@
     {
       // Singularities at infinity
-      "Singularities at infinity";
+      dbprint(dbg,"Singularities at infinity");
       return(0);
     }
   } else
   {
-    "Check at origin: FALSE";
+    dbprint(dbg,"Check at origin: FALSE");
     return(0);
   }
@@ -4671 +4644 @@
   if(dbg >= 1)
   {
-    "Hensel lifting - order = ", maxExpDen;
+    dbprint(dbg,"Hensel lifting - order = ", maxExpDen);
   }
   // We compute the lifiting of the factor outside the origin up to the
@@ -4869 +4842 @@
                                     { algname="@o";}
          else {
-           "** Sorry -- could not find a free name for the primitive element.";
-           "** Try e.g. a ring without '@a' or '@b' as variable.";
-           return();
+           ERROR("** Sorry -- could not find a free name for the primitive element.";
+           "** Try e.g. a ring without '@a' or '@b' as variable.");
          }}
        }
@@ -4905 +4877 @@
   //------------- Fall 2: Bisheriger Ring hatte ein Minimalpolynom: -----------
   algname=parstr(altring);           // Name des algebraischen Elements
-  if (npars(altring)>1) {"only one Parameter is allowed!!"; return(altring);}
+  if (npars(altring)>1) {ERROR("only one Parameter is allowed!");}
 
   //---------------- Minimalpolynom in ein Polynom umwandeln: -----------------