Changeset 90cf60e in git for Singular

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

Location:

Singular/LIB

Files:

• alexpoly.lib (modified) (4 diffs)
• ncHilb.lib (modified) (14 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);