Changeset 90cf60e in git

Timestamp:

Oct 14, 2016, 2:30:14 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a85c1546f3be117e077ebe1215bb680cf6023e70

Parents:

81fb5aeadbd51ed0150e244d060d98a3a6637449

Message:

format

Files:

• Singular/LIB/alexpoly.lib (modified) (4 diffs)
• Singular/LIB/ncHilb.lib (modified) (14 diffs)
• kernel/combinatorics/hilb.cc (modified) (43 diffs)

Singular/LIB/alexpoly.lib

@@ -361 +361 @@
   int n_i,n_j;
   int bad_contact;
-  list newpos;  // when reordering the branches, here we save the new order of the old branches 
+  list newpos;  // when reordering the branches, here we save the new order of the old branches
   for (ii=1;ii<=r;ii++)
   {
@@ -421 +421 @@
       newpos=insert(newpos,newpos[j],i-1);
       newpos=delete(newpos,j+1);
-      // BE AWARE: after this reordering the graphs do not have the correct weight for the 
-      //           strict transform any more; this will be adjusted further down  
+      // BE AWARE: after this reordering the graphs do not have the correct weight for the
+      //           strict transform any more; this will be adjusted further down
       graphs=insert(graphs,graphs[j],i-1);
       graphs=delete(graphs,j+1);
@@ -440 +440 @@
       i=i+1;
     }
-  } 
-  // Here we adjust the weights of the strict transforms in the graphs!!! 
+  }
+  // Here we adjust the weights of the strict transforms in the graphs!!!
   for (i=1;i<=size(graphs);i++)
   {
@@ -578 +578 @@
   {
     list result=rgraph,rtm,rmt;
-    return(result); 
+    return(result);
   }
   else // reorder the branches according to the ordering of the input
   {
-    // reordered total multiplicities, multiplicities and resolution graph 
+    // reordered total multiplicities, multiplicities and resolution graph
     intmat rtmro[nrows(rtm)][ncols(rtm)];
     intmat rmtro[nrows(rmt)][ncols(rmt)];

Singular/LIB/ncHilb.lib

@@ -22 +22 @@
 proc nchilb(list L_wp, int d, list #)
 "USAGE:  nchilb(list of relations, an integer, optional);
-         L is a list of modules (each module represents a free-polynomial), 
-         d is an integer for the degree bound, 
+         L is a list of modules (each module represents a free-polynomial),
+         d is an integer for the degree bound,
          # != NULL for non-finitely generated ideals;
 NOTE  : The input ideal needs to be given in special form. It is a list
@@ -31 +31 @@
         every next entry is a variable.
         Ex. module p1=[1,y,z],[-1,z,y] represents the poly y*z-z*y;
-            module p2=[1,x,z,x],[-1,z,x,z] represents the poly x*z*x-z*x*z 
+            module p2=[1,x,z,x],[-1,z,x,z] represents the poly x*z*x-z*x*z
         for more details about the input, see examples.
 EXAMPLE: example nchilb; shows an example "
 {
 
-    if (d<1) 
+    if (d<1)
     {
       ERROR("bad degree bound");
     }
-    
+
     def save = basering;
     int sz=size(#);
     int lV=nvars(save);
-    
+
     def R =makeLetterplaceRing(d);
     setring R;
@@ -50 +50 @@
     poly p;
     poly q=0;
-    // convert list L_wp of free-poly to letterPlace-poly format 
+    // convert list L_wp of free-poly to letterPlace-poly format
     setring save;
     module M;
@@ -56 +56 @@
     vector w;
     poly pc=0;
-    intvec v; 
+    intvec v;
     slm = size(L_wp);                  // number of polys in the given ideal
-    
+
     for (i=1; i<=slm; i++)
-    {   
+    {
         M  = L_wp[i];
         sm = ncols(M);                 // number of words in the free-poly M
@@ -66 +66 @@
         {
             w  = M[j];
-            sw = size(w); 
+            sw = size(w);
             for (k=2; k<=sw; k++)
             {
@@ -83 +83 @@
         setring R;
         I = I,q; //lp-polynomial added to I
-        q=0;   //ready for the next polynomial  
+        q=0;   //ready for the next polynomial
         setring save;
     }
@@ -89 +89 @@
 
     ideal J = system("freegb",I,d,lV);
-    
+
     //Groebner Basis is computed for the given ideal.
     //now compute the leading monomials of the Groebner Basis
-    
+
     ideal J_lm;
     for(i=1;i<=size(J);i++)
@@ -98 +98 @@
         J_lm[i]=leadmonom(J[i]);
     }
-    
+
     setring save;
     def A =makeLetterplaceRing(2*d);
     setring A;
     ideal I=imap(R, J_lm);
-    
+
     //compute the Hilbert series
-    
+
     if(sz==1)                     // non-finitely generated case
     {
@@ -116 +116 @@
 }
 example
-{ 
+{
 "EXAMPLE:"; echo = 2;
     ring r=0,(x,y,z),dp;
@@ -123 +123 @@
     list l1=list(p1,p2);
     nchilb(l1,6,1); //third argument is for non-finitely generated case
-    
+
     ring r=0,(x,y,z,w),dp;
     module p1=[1,y,x],[-1,x,y];            //represents the poly y*x-x*y
@@ -133 +133 @@
     list l2=list(p1,p2,p3,p4,p5,p6);
     nchilb(l2,5);
-        
+
     ring r=0,(X,Y,Z),dp;
     module p1 =[1,Y,Z];                //represents the poly Y*Z
@@ -145 +145 @@
     list l3=list(p1,p2,p3,p4,p5,p6,p7,p8);
     nchilb(l3,10);
-    
+
     ring r=0,U(1..3),dp;
     module p1=[1,U(2),U(3),U(3)];
@@ -171 +171 @@
     p14,p15,p16,p17,p18,p19,p20,p21);
     nchilb(ll,7,1);
-    
+
     ring r=0,(x,y,z),dp;
     module p1=[1,x,z,y,z,x,z];
@@ -178 +178 @@
     module p4=[1,y,z];
     module p5=[1,x,z,z,x,z];
-    
+
     list l1=list(p1,p2,p3,p4,p5);
     nchilb(l1,7);

kernel/combinatorics/hilb.cc

@@ -1402 +1402 @@
 
 static void idInsertMonomials(ideal I, poly p)
-{ 
+{
   /*
    * adds monomial in I and if required,
@@ -1408 +1408 @@
    * does not make copy of  p
    */
-    
+
   if(I == NULL)
   {
@@ -1446 +1446 @@
   /*
    * polynomials of J and Ob are assumed to
-   * be already sorted. J and Ob are 
+   * be already sorted. J and Ob are
    * represented by the minimal generating set
    */
@@ -1453 +1453 @@
   int JCount = IDELEMS(J);
   int ObCount = IDELEMS(Ob);
-  
+
   if(idIs0(J))
   {
     return(1);
   }
-  if(JCount != ObCount)  
+  if(JCount != ObCount)
   {
     return(0);
@@ -1469 +1469 @@
       return(0);
     }
-  }  
+  }
   return(s);
 }
@@ -1480 +1480 @@
    * degree less or equal to tr
    */
-  
+
   //case when I=1;
   if(p_Totaldegree(I->m[0], currRing) == 0)
@@ -1486 +1486 @@
     return(1);
   }
-  
+
   int count = 0;
   for(int i = 0; i < IDELEMS(I); i++)
@@ -1496 +1496 @@
     count = count + 1;
   }
-  
+
   return(count);
 }
@@ -1503 +1503 @@
 {
   /*
-   * polynomials of J and obc are assumed to 
-   * be already sorted. J and Ob are 
+   * polynomials of J and obc are assumed to
+   * be already sorted. J and Ob are
    * represented by the minimal generating set.
    * checks if J and Ob are same in polys upto deg <=tr
@@ -1516 +1516 @@
     return(1);
   }
-  
-  if(JCount != ObCount)  
+
+  if(JCount != ObCount)
   {
     return(0);
@@ -1529 +1529 @@
     }
   }
-    
+
   return(s);
 }
@@ -1537 +1537 @@
   /*
    * compares the ideal I with ideals in the Orbit 'idorb'
-   * upto degree trInd - max(deg of w, deg of word in polist) polynomials; 
+   * upto degree trInd - max(deg of w, deg of word in polist) polynomials;
    * I and ideals in the Orbit are sorted,
    * Orbit is ordered,
    *
-   * returns 0 if I is not equal to any of the ideals 
+   * returns 0 if I is not equal to any of the ideals
    * in the Orbit else returns position of the matched ideal
    */
-    
+
   int ps = 0;
   int i, j, s = 0;
   int orbCount = idorb.size();
-  
+
   if(idIs0(I))
   {
     return(1);
   }
-  
+
   int degw = p_Totaldegree(w, currRing);
   int degp;
   int dtr;
-  int dtrp; 
-
-  dtr = trInd - degw; 
+  int dtrp;
+
+  dtr = trInd - degw;
   int IwCount;
- 
+
    IwCount = CountOnIdUptoTruncationIndex(I, dtr);
 
@@ -1568 +1568 @@
     return(1);
   }
-  
+
   int ObCount;
-  
+
   bool flag2 = FALSE;
-  
+
   for(i = 1;i < orbCount; i++)
   {
@@ -1579 +1579 @@
     {
       dtr = trInd - degw;
-     
+
       ObCount = 0;
       ObCount = CountOnIdUptoTruncationIndex(idorb[i], dtr);
@@ -1591 +1591 @@
       }
     }
-    else  
+    else
     {
       flag2 = TRUE;
@@ -1602 +1602 @@
 
     s = isMonoIdBasesSame_IG_Case(I, IwCount, idorb[i], ObCount);
-    
+
     if(s)
     {
@@ -1615 +1615 @@
 {
   /*
-   * compares the ideal I with ideals in the Orbit 'idorb' 
+   * compares the ideal I with ideals in the Orbit 'idorb'
    * I and ideals in the Orbit are sorted,
    * Orbit is ordered,
    *
-   * returns 0 if I is not equal to any of the ideals 
+   * returns 0 if I is not equal to any of the ideals
    * in the Orbit else returns position of the matched ideal
    */
@@ -1640 +1640 @@
     }
   }
-  
+
   return(ps);
 }
@@ -1667 +1667 @@
 {
   /*
-   * eliminates monomials which  
+   * eliminates monomials which
    * can be generated by others in I
    */
   //first sort monomials of the ideal
-  
+
   idSkipZeroes(I);
 
   sortMonoIdeal_totalDegOrder(I);
-  
+
   ideal J = idInit(1, 1);
   int i, k;
@@ -1685 +1685 @@
     for(i = 0; i < k; i++)
     {
-  
+
       if(p_LmDivisibleBy(I->m[i], I->m[k], currRing))
-      { 
+      {
         pDelete(&(I->m[k]));//this is not req.
         break;
@@ -1693 +1693 @@
     }
   }
-  
+
   idSkipZeroes(I);
   return(I);
@@ -1700 +1700 @@
 static poly shiftInMon(poly p, int i, int lV, const ring r)
 {
-  /* 
+  /*
    * shifts the varibles of monomial p in the  i^th layer,
    * p remains unchanged,
@@ -1717 +1717 @@
     if(e[j] == 1)
     {
-      s[j+sh] = e[j]; 
-    }
-  }
-  
+      s[j+sh] = e[j];
+    }
+  }
+
   p_SetExpV(smon, s, currRing);
   omFree(e);
   omFree(s);
-  
+
   p_SetComp(smon, p_GetComp(p, currRing), currRing);
   p_Setm(smon, currRing);
-  
+
   return(smon);
 }
@@ -1733 +1733 @@
 static poly deleteInMon(poly w, int i, int lV, const ring r)
 {
-  /* 
+  /*
    * deletes the variables upto i^th layer of monomial w
    * w remains unchanged
    * creates new poly and returns it for the colon ideal
    */
-  
+
   poly dw = p_One(currRing);
   int *e = (int *)omAlloc((r->N+1)*sizeof(int));
@@ -1748 +1748 @@
   for(j=1;j<=cnt;j++)
   {
-    e[j]=0; 
+    e[j]=0;
   }*/
   for(j = (cnt+1); j < (r->N+1); j++)
@@ -1754 +1754 @@
     s[j] = e[j];
   }
-  
+
   p_SetExpV(dw, s, currRing);//new exponents
   omFree(e);
   omFree(s);
-  
+
   p_SetComp(dw, p_GetComp(w, currRing), currRing);
   p_Setm(dw, currRing);
-  
+
   return(dw);
 }
@@ -1780 +1780 @@
   poly qmonp = NULL;
   bool del;
-  
+
   for(i = 0;i <= d - 1; i++)
   {
@@ -1786 +1786 @@
     smon = shiftInMon(p, i, lV, currRing);
     del = TRUE;
-    
+
     if(pLmDivisibleBy(smon, w))
     {
       flag = TRUE;
-      del  = FALSE; 
-      
+      del  = FALSE;
+
       pDelete(&dw);
       pDelete(&smon);
-      
+
       //delete all monomials of Jwi
       //and make Jwi =1
-      
+
       for(int j = 0;j < IDELEMS(Jwi); j++)
       {
@@ -1803 +1803 @@
       }
 
-      idInsertMonomials(Jwi, p_One(currRing)); 
+      idInsertMonomials(Jwi, p_One(currRing));
       break;
     }
 
     if(pLmDivisibleBy(dw, smon))
-    { 
-      del = FALSE; 
+    {
+      del = FALSE;
       qmonp = p_Divide(smon, dw, currRing);
       idInsertMonomials(Jwi, shiftInMon(qmonp, -d, lV, currRing));
-      
+
       //shiftInMon(qmonp, -d, lV, currRing):returns a new poly,
       //qmonp remains unchanged, delete it
@@ -1826 +1826 @@
     }
   }
-  
-} 
+
+}
 
 static ideal colonIdeal(ideal S, poly w, int lV, ideal Jwi)
@@ -1836 +1836 @@
    * keeps S and w unchanged
    */
-  
+
   if(idIs0(S))
   {
@@ -1843 +1843 @@
 
   int i, j, d;
-  d = p_Totaldegree(w, currRing);  
-  bool flag = FALSE; 
+  d = p_Totaldegree(w, currRing);
+  bool flag = FALSE;
   int SCount = IDELEMS(S);
   int cnt = 0;
@@ -1855 +1855 @@
     }
   }
-  
+
   Jwi = minimalMonomialsGenSet(Jwi);
   return(Jwi);
@@ -1862 +1862 @@
 
 void HilbertSeries_OrbitData(ideal S, int lV, bool IG_CASE )
-{  
+{
   /*
    * It is based on iterative right colon operation to the
@@ -1870 +1870 @@
    * that is, all the monomials of ideal can be obtained from
    * finite subsets by applying the finite number
-   * of elementary operations.  
+   * of elementary operations.
    */
 
   int trInd;
   S = minimalMonomialsGenSet(S);
-  
+
   int (*POS)(ideal, poly, std::vector<ideal>, std::vector<poly>, int);
   if(IG_CASE)
@@ -1886 +1886 @@
     POS = &positionInOrbit_FG_Case;
   }
-  
+
   std::vector<ideal > idorb;
   std::vector< poly > polist;
-  
+
   ideal orb_init = idInit(1, 1);
   idorb.push_back(orb_init);
-  
+
   polist.push_back( p_One(currRing));
 
@@ -1903 +1903 @@
   int ds, is, ps, sz;
   int lpcnt = 0;
-  
+
   poly w, wi;
   ideal Jwi;
@@ -1914 +1914 @@
     if(lpcnt >= 1)
     {
-      if(p_Totaldegree(idorb[lpcnt]->m[0], currRing) != 0) 
+      if(p_Totaldegree(idorb[lpcnt]->m[0], currRing) != 0)
       {
         C.push_back(1);
@@ -1947 +1947 @@
       Jwi = colonIdeal(S, wi, lV, Jwi);
       ps = (*POS)(Jwi, wi, idorb, polist, trInd);
-      
+
       if(ps == 0)  // found new colon ideal
       {
-        
+
         idorb.push_back(Jwi);
         polist.push_back(wi);
@@ -1969 +1969 @@
 
   for(is = idorb.size()-1; is >= 0; is--)
-  {  
+  {
     idDelete(&idorb[is]);
   }
@@ -1976 +1976 @@
     pDelete(&polist[is]);
   }
-  
-  idorb.resize(0); 
+
+  idorb.resize(0);
   polist.resize(0);
 
   row.resize(0);
 
-  int rowCount, colCount;  
+  int rowCount, colCount;
 #if 0
   for(rowCount = 0; rowCount < mat.size(); rowCount++)
@@ -2002 +2002 @@
   TransExtInfo p;
   p.r = rDefault(0, 1, tt);
-  coeffs cf = nInitChar(n_transExt,&p);  
-  
+  coeffs cf = nInitChar(n_transExt,&p);
+
   char** xx = (char**)omalloc(sizeof(char*));
   xx[0] = omStrDup("x");
-  ring R = rDefault(cf, 1, xx);  
-  rChangeCurrRing(R);  
+  ring R = rDefault(cf, 1, xx);
+  rChangeCurrRing(R);
   /*
    * matrix corresponding to the orbit of the ideal
@@ -2043 +2043 @@
   matrix Hnot;
   luSolveViaLUDecomp(pMat, lMat, uMat, cMat, H_serVec, Hnot);
-  
+
   mp_Delete(&mR,R);
   mp_Delete(&u,R);