Changeset c13ff56 in git

Timestamp:

Apr 14, 2009, 10:36:17 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

b8973d758f37286564ab8fb1f67367ac731674c7

Parents:

3402b4b654df40779dd0b3d83c4d023a3ef93e0b

Message:

*hannes: format


git-svn-id: file:///usr/local/Singular/svn/trunk@11686 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/LIB/qhmoduli.lib (modified) (46 diffs)

Singular/LIB/qhmoduli.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: qhmoduli.lib,v 1.14 2009-04-08 14:08:25 Singular Exp $";
+version="$Id: qhmoduli.lib,v 1.15 2009-04-14 08:36:17 Singular Exp $";
 category="Singularities";
 info="
@@ -492 +492 @@
   Variables = StabVar(wt);    // possible quasihomogeneous substitutions
   nrVars = 0;
-  for(i = 1; i <= size(wt); i = i + 1) {
+  for(i = 1; i <= size(wt); i++)
+  {
     nrVars = nrVars + size(Variables[i]);
   }
@@ -499 +500 @@
 
   varString = "s(1.." + string(nrVars) + ")";
-  if(npars(basering) == 1) {
+  if(npars(basering) == 1)
+  {
     parString = "(0, " + parstr(basering) + ")";
   }
@@ -527 +529 @@
   nrVars = 0;
   offset = 0;
-  for(i = 1; i <= size(wt); i = i + 1) {    // build the substitution t(i) -> ...
+  for(i = 1; i <= size(wt); i++)
+  {    // build the substitution t(i) -> ...
     if(i > 1) { offset = offset + size(Variables[i - 1]); }
     g = 0;
-    for(j = 1; j <= size(Variables[i]); j = j + 1) {
+    for(j = 1; j <= size(Variables[i]); j++)
+    {
       pp = 1;
-      for(k = 2; k <= size(Variables[i][j]); k = k + 1) {
+      for(k = 2; k <= size(Variables[i][j]); k++)
+      {
         pp = pp * var(Variables[i][j][k]);
         if(Variables[i][j][k] == i) { varSubsList[i] = offset + j;}
@@ -562 +567 @@
   coMx = coef(f, vars);          // coefficients of f
 
-  for(i = 1; i <= ncols(newcoMx); i = i + 1) {      // build the system of eqns via coeff. comp.
+  for(i = 1; i <= ncols(newcoMx); i++)
+  {      // build the system of eqns via coeff. comp.
     j = 1;
     h = 0;
-    while(j <= ncols(coMx)) {        // all monomials in f
+    while(j <= ncols(coMx))
+    {        // all monomials in f
       if(coMx[j][1] == newcoMx[i][1]) { h = coMx[j][2]; j = ncols(coMx) + 1;}
       else {j = j + 1;}
@@ -662 +669 @@
   jacobIdstd = std(jacobianId);
   newFs = Fs;
-  for(i = 1; i <= size(B); i = i + 1) {
+  for(i = 1; i <= size(B); i++)
+  {
     basisDegList[i] = deg(B[i], wt);
   }
@@ -671 +679 @@
   d = deg(f, wt);
 
-  for(i = d + 1; i < ub; i = i + 1) {    // base[1] = monomials of degree i
+  for(i = d + 1; i < ub; i++)
+  {    // base[1] = monomials of degree i
     upperBasis[i] = SelectMonos(list(B, B), wt, i);    // B must not contain 0's
   }
@@ -679 +688 @@
   // it into newFs
 
-  for(i = d + 1; i < ub; i = i + 1) {  // ub instead of @UB
+  for(i = d + 1; i < ub; i = i + 1)
+  {  // ub instead of @UB
     dbprint(dbPrt, "-- degree = " + string(i) + " of " + string(ub - 1) + " ---------------------------");
     if(size(newFs) < 80) { dbprint(dbPrt, "  polynomial = " + string(newFs - f));}
@@ -688 +698 @@
     gmonos = SelectMonos(parts, wt, i);
     common = IntersectionQHM(upperBasis[i][1], gmonos[1]);
-    if(size(common) == size(gmonos[1])) {
+    if(size(common) == size(gmonos[1]))
+    {
       dbprint(dbPrt, " no additional monomials ");
     }
@@ -696 +707 @@
     // write g = c[i] * jacobianId[i]
 
-    else {
+    else
+    {
       dbprint(dbPrt, "  additional Monomials found, compute the map ");
       g = PSum(gmonos[2]);      // sum of all monomials in g of degree i
@@ -704 +716 @@
       gCoeffMx = lift(jacobianId, g - gred);    // compute c[i]
       mapId = var(1) - gCoeffMx[1][1];    // generate the map
-      for(j = 2; j <= size(gCoeffMx); j = j + 1) {
+      for(j = 2; j <= size(gCoeffMx); j++)
+      {
         mapId[j] = var(j) - gCoeffMx[1][j];
       }
@@ -736 +749 @@
   data = jet(f, ub - 1, wt);
   k = 0;
-  for(i = 1; i <= size(data); i = i + 1) {
+  for(i = 1; i <= size(data); i++)
+  {
     mono = lead(data[i]);
-    if(deg(mono, wt) < ub) {
+    if(deg(mono, wt) < ub)
+    {
       k = k + 1;
       lcInv = 1/leadcoef(mono);
@@ -771 +786 @@
 
   k = 0;
-  for(i = 1; i <= size(parts[1]); i = i + 1) {
+  for(i = 1; i <= size(parts[1]); i++)
+  {
     mono = parts[1][i];
-    if(deg(mono, wt) == d) {
-      k = k + 1;
+    if(deg(mono, wt) == d)
+    {
+      k++;
       monomials[k] = mono;
       terms[k] = parts[2][i];
@@ -810 +827 @@
   // compute substitution[1]^degVec[1],...,subs[n]^degVec[n]
 
-  for(i = 1; i <= ncols(substitution); i = i + 1) {
-    if(size(substitution[i]) < 3 || degVec[i] < 4) {
+  for(i = 1; i <= ncols(substitution); i++)
+  {
+    if(size(substitution[i]) < 3 || degVec[i] < 4)
+    {
       powerList[i] = reduce(substitution[i]^degVec[i], reduceI); // new
     }  // directly for small exponents
-    else {
+    else
+    {
       powerList[i] = PolyPower1(i, substitution[i], degVec[i], reduceI, w1, truncated[i], ub);
     }
@@ -821 +841 @@
   g = powerList[1];
   minDeg = w1[1] * degVec[1];
-  for(i = 2; i <= ncols(substitution); i = i + 1) {
+  for(i = 2; i <= ncols(substitution); i++)
+  {
     g = jet(g, ub - w1[i] * degVec[i] - 1, w1);
     h = jet(powerList[i], ub - minDeg - 1, w1);
@@ -842 +863 @@
 "
 {
-  int SUBSMAXSIZE = 3000;    //
+  int SUBSMAXSIZE = 3000;
   int i, nrParts, sizeOfPart, currentPos, partSize, maxSIZE;
   poly g, h, gxh, prodComp, @g2;    // replace @g2 by subst.
@@ -849 +870 @@
   h = h1;
 
-  if(size(g)*size(h) > SUBSMAXSIZE) {
-
+  if(size(g)*size(h) > SUBSMAXSIZE)
+  {
     // divide the polynomials with more terms in parts s.t.
     // the product of each part with the other polynomial
@@ -861 +882 @@
     partSize = size(g) / nrParts;
     gxh = 0;  // 'g times h'
-    for(i = 1; i <= nrParts; i = i + 1){
+    for(i = 1; i <= nrParts; i++)
+    {
       //print(" loop #" + string(i) + " of " + string(nrParts));
       currentPos = (i - 1) * partSize;
@@ -870 +892 @@
       if(size(@g2) < size(prodComp)) { print(" killed " + string(size(prodComp) - size(@g2)) + " terms ");}
       gxh =  reduce(gxh + @g2, reduceI);
-
-    }
-  }
-  else {
+    }
+  }
+  else
+  {
     gxh = reduce(jet(g * h,ub - 1, wt), reduceI);
   }  // compute directly
@@ -898 +920 @@
   if(e == 1) { return(f);}
   if(f == 0) { return(1); }
-  else {
-
+  else
+  {
     // test if f has been computed to some power
-
-    if(computedPowers[varIndex][1] > 0) {
+    if(computedPowers[varIndex][1] > 0)
+    {
       maxPrecomputedPower = computedPowers[varIndex][1];
-      if(maxPrecomputedPower >= e) {
+      if(maxPrecomputedPower >= e)
+      {
         // no computation necessary, f^e has already benn computed
         g = computedPowers[varIndex][2][e - 1];
@@ -916 +939 @@
       }
     }
-    else {    // no precomputed data
+    else
+    {    // no precomputed data
       lb = 2;
       ordOfg = wt[varIndex];
       g = f;
     }
-    for(i = lb; i <= e; i = i + 1) {
+    for(i = lb; i <= e; i++)
+    {
       fn = jet(f, ub - ordOfg - 1, wt); // reduce w.r.t. reduceI
       g = PolyProduct(g, fn, reduceI, wt, ub);
       ordOfg = ordOfg + wt[varIndex];
       if(g == 0) { break; }
-      if((i > maxPrecomputedPower) && !truncated) {
-        if(maxPrecomputedPower == 0) {  // init computedPowers
+      if((i > maxPrecomputedPower) && !truncated)
+      {
+        if(maxPrecomputedPower == 0)
+        {  // init computedPowers
           computedPowers[varIndex] = list(i, list(g));
         }
@@ -946 +973 @@
   list temp;
 
-  for(i = 1; i <= size(@index); i = i + 1) { temp[i] = string(var(@index[i])); }
+  for(i = 1; i <= size(@index); i++) { temp[i] = string(var(@index[i])); }
   return(temp);
 }
@@ -976 +1003 @@
 
   parts = MonosAndTerms(f, wt, ub);
-  for(i = 1; i <= size(parts[1]); i = i + 1) {
+  for(i = 1; i <= size(parts[1]); i = i + 1)
+  {
     coeffList[i] = parts[2][i]/parts[1][i];
     degVecList[i] = leadexp(parts[1][i]);
@@ -988 +1016 @@
 
   @ringVars = "(" + varstr(basering) + ", " + parstr(1) + ",";  // precondition
-  if(nrs > 0) {
+  if(nrs > 0)
+  {
     @ringVars = @ringVars + "s(1.." + string(nrs) + "), ";
   }
@@ -1013 +1042 @@
   f = imap(RASB, f);
 
-  for(i = 1; i <= n; i = i + 1) {      // all "base" variables
+  for(i = 1; i <= n; i++)
+  {      // all "base" variables
     computedPowers[i] = list(0);
-    for(j = 1; j <= size(substitution[i]); j = j + 1) { degList[j] = deg(substitution[i][j], w1);}
+    for(j = 1; j <= size(substitution[i]); j++) { degList[j] = deg(substitution[i][j], w1);}
     degOfSubs[i] = degList;
   }
@@ -1022 +1052 @@
 
   g = 0;
-  for(i = 1; i <= size(degVecList); i = i + 1) {
+  for(i = 1; i <= size(degVecList); i++)
+  {
     truncatedQ = Table("0", "i", 1, n);
     newSubs = 0;
@@ -1033 +1064 @@
     // where m' is the monomial m without the j-th variable
 
-    for(j = 1; j <= size(degVec); j = j + 1) { minDeg[j] = d - degVec[j] * wt[j]; }
-
-    for(j = 1; j <= size(degVec); j = j + 1) {
+    for(j = 1; j <= size(degVec); j++) { minDeg[j] = d - degVec[j] * wt[j]; }
+
+    for(j = 1; j <= size(degVec); j++)
+    {
       subsPoly = 0;      // set substitution to 0
-      if(degVec[j] > 0) {
-
+      if(degVec[j] > 0)
+      {
         // if variable occurs then check if
         // substitution[j][k] * (linear part)^(degVec[j]-1) + minDeg[j] < ub
@@ -1047 +1079 @@
         // to the result and cannot be omitted
 
-        for(k = 1; k <= size(substitution[j]); k = k + 1) {
-          if(degOfSubs[j][k] + (degVec[j] - 1) * wt[j] + minDeg[j]  < ub) {
+        for(k = 1; k <= size(substitution[j]); k++)
+        {
+          if(degOfSubs[j][k] + (degVec[j] - 1) * wt[j] + minDeg[j]  < ub)
+          {
             subsPoly = subsPoly + substitution[j][k];
           }
@@ -1084 +1118 @@
 
   varList = StabVarComb(wt);
-  for(i = 1; i <= size(wt); i = i + 1) {
+  for(i = 1; i <= size(wt); i = i + 1)
+  {
     subs = 0;
-
     // built linear substituitons
-    for(j = 1; j <= size(varList[1][i]); j = j + 1) {
+    for(j = 1; j <= size(varList[1][i]); j++)
+    {
       subs[j] = list(i) + list(varList[1][i][j]);
     }
     Variables[i] = subs;
-    if(size(varList[2][i]) > 0) {
-
+    if(size(varList[2][i]) > 0)
+    {
       // built nonlinear substituitons
       subs = 0;
-      for(j = 1; j <= size(varList[2][i]); j = j + 1) {
+      for(j = 1; j <= size(varList[2][i]); j++)
+      {
         subs[j] = list(i) + varList[2][i][j];
       }
@@ -1116 +1152 @@
 "
 {
-  int mi, ma, i, j, k, uw, ic;
+  int mmi, mma, ii, j, k, uw, ic;
   list index, indices, usedWeights, combList, combinations;
   list linearSubs, nonlinearSubs;
@@ -1126 +1162 @@
   uw = 0;
   ic = 0;
-  mi = Min(wt);
-  ma = Max(wt);
-
-  for(i = mi; i <= ma; i = i + 1) {
-    if(ContainedQ(wt, i)) {    // find variables of weight i
+  mmi = Min(wt);
+  mma = Max(wt);
+
+  for(ii = mmi; ii <= mma; ii++)
+  {
+    if(ContainedQ(wt, ii))
+    {    // find variables of weight ii
       k = 0;
       index = 0;
       // collect the indices of all variables of weight i
-      for(j = 1; j <= size(wt); j = j + 1) {
-        if(wt[j] == i) {
-          k = k + 1;
+      for(j = 1; j <= size(wt); j++)
+      {
+        if(wt[j] == ii)
+        {
+          k++;
           index[k] = j;
         }
       }
-      uw = uw + 1;
-      usedWeights[uw] = i;
-      ic = ic + 1;
-      indices[i] = index;
+      uw++;
+      usedWeights[uw] = ii;
+      ic++;
+      indices[ii] = index;
 
       // linear part of the substitution
 
-      for(j = 1; j <= size(index); j = j + 1) {
+      for(j = 1; j <= size(index); j++)
+      {
         linearSubs[index[j]] = index;
       }
@@ -1153 +1194 @@
       // nonlinear part of the substitution
 
-      if(uw > 1) {    // variables of least weight do not allow nonlinear subs.
-
-      partitions = Partitions(i, delete(usedWeights, uw));
-      for(j = 1; j <= size(partitions); j = j + 1) {
-        combinations[j] = AllCombinations(partitions[j], indices);
+      if(uw > 1)
+      {    // variables of least weight do not allow nonlinear subs.
+
+        partitions = Partitions(ii, delete(usedWeights, uw));
+        for(j = 1; j <= size(partitions); j++)
+        {
+          combinations[j] = AllCombinations(partitions[j], indices);
+        }
+        for(j = 1; j <= size(index); j++)
+        {
+          nonlinearSubs[index[j]] = FlattenQHM(combinations);   // flatten one level !
+        }
       }
-      for(j = 1; j <= size(index); j = j + 1) {
-        nonlinearSubs[index[j]] = FlattenQHM(combinations);   // flatten one level !
-      }
-
-      } // end if
-
     }
   }
@@ -1189 +1231 @@
   ok = 1;
   m = partition[1];
-  while(ok) {
-    if(i > size(partition)) {
+  while(ok)
+  {
+    if(i > size(partition))
+    {
       ok = 0;
       p = 0;
@@ -1196 +1240 @@
     else { p = partition[i];}
     if(p == m) { i = i + 1;}
-    else {
+    else
+    {
       k = k + 1;
       nrList[k] = i - 1 - offset;
@@ -1218 +1263 @@
   list comb, newC, temp, newIndex;
 
-  if(n == 1) {
-    for(i = 1; i <= size(index); i = i + 1) {
+  if(n == 1)
+  {
+    for(i = 1; i <= size(index); i++)
+    {
       temp = index[i];
       comb[i] = temp;
@@ -1225 +1272 @@
     return(comb);
   }
-  if(size(index) == 1) {
+  if(size(index) == 1)
+  {
     temp = Table(string(index[1]), "i", 1, n);
     comb[1] = temp;
@@ -1231 +1279 @@
   }
   newIndex = index;
-  for(i = 1; i <= size(index); i = i + 1) {
+  for(i = 1; i <= size(index); i = i + 1)
+  {
     if(i > 1) { newIndex = delete(newIndex, 1); }
     newC = AllSingleCombinations(n - 1, newIndex);
     k = size(comb);
     temp = 0;
-    for(j = 1; j <= size(newC); j = j + 1) {
+    for(j = 1; j <= size(newC); j++)
+    {
       temp[1] = index[i];
       temp = temp + newC[j];
@@ -1263 +1313 @@
 
   if(size(restC) == 0) { comb = firstC;}
-  else {
-    for(i = 1; i <= size(firstC); i = i + 1) {
+  else
+  {
+    for(i = 1; i <= size(firstC); i++)
+    {
       k = size(comb);
-      for(j = 1; j <= size(restC); j = j + 1) {
+      for(j = 1; j <= size(restC); j++)
+      {
         //elem = firstC[i] + restC[j];
         // comb[k + j] = elem;
@@ -1288 +1341 @@
 
   if(size(nr) == 0) { return(list());}
-  if(size(nr) == 1) {
-    if(NumFactor(nr[1], n) > 0) {
+  if(size(nr) == 1)
+  {
+    if(NumFactor(nr[1], n) > 0)
+    {
       parts[1] = Table(string(nr[1]), "i", 1, NumFactor(nr[1], n));
     }
     return(parts);
   }
-  else {
+  else
+  {
     parts =  Partitions(n, nr[1]);
     restP = Partitions(n, delete(nr, 1));
 
     parts = parts + restP;
-    for(i = 1; i <= n / nr[1]; i = i + 1) {
+    for(i = 1; i <= n / nr[1]; i = i + 1)
+    {
       temp = Table(string(nr[1]), "i", 1, i);
       decP = Partitions(n - i*nr[1], delete(nr, 1));
       k = size(parts);
-      for(j = 1; j <= size(decP); j = j + 1) {
+      for(j = 1; j <= size(decP); j++)
+      {
         newP = temp + decP[j];        // new partition
-        if(!ContainedQ(parts, newP, 1)) {
+        if(!ContainedQ(parts, newP, 1))
+        {
           k = k + 1;
           parts[k] = newP;
@@ -1339 +1398 @@
   execute("int " + iterator + ";");
 
-  for(int @i = lb; @i <= ub; @i++) {
+  for(int @i = lb; @i <= ub; @i++)
+  {
     execute(iterator + " = " + string(@i));
     execute("data[" + string(@i) + "] = " + cmd + ";");
@@ -1359 +1419 @@
   c = 1;
 
-  for(i = 1; i <= size(data); i = i + 1) {
-    for(j = 1; j <= size(data[i]); j = j + 1) {
+  for(i = 1; i <= size(data); i++)
+  {
+    for(j = 1; j <= size(data[i]); j++)
+    {
       fList[c] = data[i][j];
       c = c + 1;
@@ -1379 +1441 @@
   c = 1;
 
-  for(int i = 1; i <= size(l1); i = i + 1) {
+  for(int i = 1; i <= size(l1); i++)
+  {
     b = ContainedQ(l2, l1[i]);
-    if(b == 1) {
+    if(b == 1)
+    {
       l[c] = l1[i];
-      c = c + 1;
+      c++;
     }
   }
@@ -1399 +1463 @@
   i = 0;
   pos = 0;
-  while(!pos && i < size(data)) {
-    i = i + 1;
-    if(data[i] == elem) { pos = i;}
+  while(i < size(data))
+  {
+    i++;
+    if(data[i] == elem) { pos = i; break;}
   }
   return(pos);
@@ -1411 +1476 @@
 {
   poly f;
-  for(int i = 1; i <= size(e); i = i + 1) {
+  for(int i = size(e);i>=1;i--)
+  {
     f = f + e[i];
   }
   return(f);
-
 }
 
@@ -1430 +1495 @@
   int max = data[1];
 
-  for(i = 1; i <= size(data); i = i + 1) {
+  for(i = size(data); i>1;i--)
+  {
     if(data[i] > max) { max = data[i]; }
   }
@@ -1452 +1518 @@
   int min = data[1];
 
-  for(i = 1; i <= size(data); i = i + 1) {
+  for(i = size(data);i>1; i--)
+  {
     if(data[i] < min) { min = data[i]; }
   }