Changeset 75f83c in git

Timestamp:

Sep 21, 2023, 4:28:05 PM (8 months ago)

Author:

slap <slaplagne@…>

Branches:

(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

70a5104457d3ea96b77d515e712f8a3fbb0b7144

Parents:

5bb58e4c13fe299469984183890384cb6dd543b0

git-author:

slap <slaplagne@gmail.com>2023-09-21 16:28:05+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2023-11-07 16:30:30+01:00

Message:

Tidying up the optimization approach

Added some comments and remove prints.

File:

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

Singular/LIB/integralbasis.lib

@@ -1186 +1186 @@
 }
 
+// We compute the Puiseux segments using Hensel lifting.
+// The segments are order according to the initial exponent from
+// smaller to larger.
+// The classes of Puiseux expansions are grouped matching the
+// Puiseux segments.
+
 proc getSegments(poly f, list classes, list slopes, int globOrder)
 {
@@ -1208 +1214 @@
   int locOrder = maxOrder;
 
+  // If loc == 1, we remove the component outside the origin.
   if(loc == 1)
   {
@@ -1229 +1236 @@
     for(i = 1; i <= size(fSegment); i++)
     {
+      // We compute the newton poly of each polynomial to find out the
+      // corresponding slope
       list l = newtonpoly(fSegment[i]);
-      "l(", i , ") = ", l;
-      
       slopeSegment = number(l[2][1]) / number(l[1][2]);
+
+      // We look for all classes with same slope as each segment
       classesNew = list();
-        
-      // We look for all classes with same slope as this segment
       for(j = 1; j <= size(classes); j++)
       {
@@ -1244 +1251 @@
         }
       }  
+      
+      // We put everything together
       out[i] = list(fSegment[i], slopeSegment, classesNew);
     }
@@ -1251 +1260 @@
   out = sortSegments(out);
   
-  
-  "output of getSegments: "; out;
-  //~;
   return(out);
 }
@@ -1261 +1267 @@
 proc sortSegments(list segment);
 {
-  //"START - integralbasis.lib - sortFactors - 1";
+  //"START - integralbasis.lib - sortSegments - 1";
   int i, j;
   int n = size(segment);
@@ -1281 +1287 @@
 
 
-// We compute the local integral at f by exhaustive search
-// See "Direct approach in the combinatorial paper
+// We compute the local integral basis at f by exhaustive search
+// See "Direct approach in the combinatorial paper.
 proc ibSegment(poly f, list classes, int degExpand)
 {
@@ -1291 +1297 @@
   intvec degPolySet;
   intvec vy = (0,1);
-  // We get all the possible polynomials, includign the full polys
+  
+  // We get all the possible polynomials, including the full polys
   list bF = buildFactors(classes);
   
@@ -1300 +1307 @@
   for(i = 1; i <= size(classes); i++)
   {
+    // We put everything in a list, with no repeated elements
     for(j = 1; j <= size(bF[1][i]); j++)
     {
@@ -1307 +1315 @@
       }
     }
+    // We compute the full polynomial up to the integrality exponent
     pGround = buildPolyGroundXRootClass(classes[i], degExpand);
     if(in_array(polySet, pGround) == 0)
@@ -1330 +1339 @@
     }
   }
-  "polySet = "; polySet;
-  "degPolySet = "; degPolySet;
-  "ordExpAtPoly = "; ordExpAtPoly;
-  ~;
+  //"polySet = "; polySet;
+  //"degPolySet = "; degPolySet;
+  //"ordExpAtPoly = "; ordExpAtPoly;
+  //~;
   
   // We compute the integral basis by exhaustive search
@@ -1341 +1350 @@
 }
   
+// For each degree up to the degree of f, with compute the best 
+// possible product of factors by checking exhaustively all possible
+// combinations such that the product has the correct degree.
 proc ibExhaustive(list polySet, intvec degPolySet, list ordExpAtPoly, int degF)
 {
@@ -1355 +1367 @@
     // The best element of degree d;
     oMax  = 0;
+    
+    // We generate the list of all possible combinations
     c = summandsFac(degPolySet, d);
+    
+    // We compute the valuation of each combination,
+    // and we keep the largest one.
     for(i = 1; i <= size(c); i++)
     {
@@ -1375 +1392 @@
     "---";
   }
-  "ib computation finished!";
-  ib;
+  //"ib computation finished!";
+  //ib;
   return(ib);
 }
@@ -1406 +1423 @@
 }
 
-
+// List of intvecs suchs that the sum of each coordinate times the degree
+// given in degPolySet equals degTotal
+// This is used to compute a product of factors such that the total
+// degree is equal to degTotal
 proc summandsFac(intvec degPolySet, int degTotal)
 {
@@ -1435 +1455 @@
 }
   
-
+//We implement the optimization approach from scratch
 proc optiBase(list ibSeg, list segmentSlope)
 {
@@ -1552 +1572 @@
   dbprint(dbg, "---- Degree of expansions: ", degExpand);
 
+
+  // Optimization algorithm from scratch
   if(optimize == 1)
   {
@@ -1575 +1597 @@
     IOut[1] = var(1)^intExp;
 
-    // We convery to ib shape
+    // We convert to ib shape
     for(i = 1; i <= size(ib); i++)
     {