Changeset c623f27 in git

Timestamp:

Oct 6, 2010, 8:10:20 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

ce136a3deb909101f53d2844ba9fdd9bdc1c7842

Parents:

3561bd1ffefd8ae194f9d9ec57e0d2d9d54be51c

Message:

format

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

Location:

Singular/LIB

Files:

• dmodapp.lib (modified) (14 diffs)
• ncfactor.lib (modified) (1 diff)
• normal.lib (modified) (1 diff)
• primitiv.lib (modified) (2 diffs)

Singular/LIB/dmodapp.lib

@@ -606 +606 @@
       if (sl>2)
       {
-        if (typeof(l[3])<>"string"){wronginput = 1;}
-        if (sl>3){wronginput = 1;}
+        if (typeof(l[3])<>"string"){wronginput = 1;}
+        if (sl>3){wronginput = 1;}
       }
     }
@@ -1512 +1512 @@
       if (size(#)>2)
       {
-        if (typeof(#[3])=="intvec")
-        {
-          if (size(#[3])==2*n && allPositive(#[3])==1)
-          {
-            homogweights = #[3];
-          }
-          else
-          {
-            print("// Homogenization weight vector must consist of positive entries and be");
-            print("// of size " + string(n) + ". Using weight (1,...,1).");
-          }
-        }
+        if (typeof(#[3])=="intvec")
+        {
+          if (size(#[3])==2*n && allPositive(#[3])==1)
+          {
+            homogweights = #[3];
+          }
+          else
+          {
+            print("// Homogenization weight vector must consist of positive entries and be");
+            print("// of size " + string(n) + ". Using weight (1,...,1).");
+          }
+        }
       }
     }
@@ -1569 +1569 @@
   }
   def Dh = nc_algebra(1,@relD);
-  setring Dh; kill @Dh; 
+  setring Dh; kill @Dh;
   dbprint(ppl-1,"// computing in ring",Dh);
   // 2. Compute the initial ideal
@@ -1886 +1886 @@
       if (typeof(#[2])=="int" || typeof(#[2])=="number")
       {
-        l0 = int(#[2]);
-        l0set = 1;
+        l0 = int(#[2]);
+        l0set = 1;
       }
       if (size(#)>2)
       {
-        if (typeof(#[3])=="ideal")
+        if (typeof(#[3])=="ideal")
         {
-          G = #[3];
-          Gset = 1;
-        }
+          G = #[3];
+          Gset = 1;
+        }
       }
     }
@@ -2014 +2014 @@
       for (k=1; k<=ncols(B); k++)
       {
-        p = B[k]*G[i];
-        p = f(p);
-        M[size(M)+1] = p;
+        p = B[k]*G[i];
+        p = f(p);
+        M[size(M)+1] = p;
       }
     }
@@ -2192 +2192 @@
       if (M[1,i]<>0)
       {
-        v = M[2..r,i];
-        if (v == zm)
-        {
-          J[size(J+1)] = M[1,i];
-        }
+        v = M[2..r,i];
+        if (v == zm)
+        {
+          J[size(J+1)] = M[1,i];
+        }
       }
     }
@@ -2302 +2302 @@
       if (v[i] == v[i+1])
       {
-        ERROR("No double entries allowed in intvec");
+        ERROR("No double entries allowed in intvec");
       }
     }
@@ -2371 +2371 @@
       if (v[i] == v[i+1])
       {
-        ERROR("No double entries allowed in intvec");
+        ERROR("No double entries allowed in intvec");
       }
     }
@@ -2453 +2453 @@
       if (typeof(#[2])=="int" || typeof(#[2])=="number")
       {
-        l0 = int(#[2]);
-        l0set = 1;
+        l0 = int(#[2]);
+        l0set = 1;
       }
       if (size(#)>2)
       {
-        if (typeof(#[3])=="ideal")
+        if (typeof(#[3])=="ideal")
         {
-          G = #[3];
-          Gset = 1;
-        }
+          G = #[3];
+          Gset = 1;
+        }
       }
     }
@@ -2476 +2476 @@
       if (v == intvec(0))
       {
-        v[1] = i;
+        v[1] = i;
       }
       else
       {
-        v[size(v)+1] = i;
+        v[size(v)+1] = i;
       }
     }
@@ -2616 +2616 @@
       if (allPositive(#[1])==1)
       {
-        w = #[1];
+        w = #[1];
       }
       else
       {
-        print("// Entries of intvec must be strictly positive");
-        print("// Using weight " + string(w));
+        print("// Entries of intvec must be strictly positive");
+        print("// Using weight " + string(w));
       }
       if (size(#)>1)
       {
-        if (typeof(#[2])=="int" || typeof(#[2])=="number")
+        if (typeof(#[2])=="int" || typeof(#[2])=="number")
         {
-          whichengine = int(#[2]);
-        }
-        if (size(#)>2)
+          whichengine = int(#[2]);
+        }
+        if (size(#)>2)
         {
-          if (typeof(#[3])=="int" || typeof(#[3])=="number")
+          if (typeof(#[3])=="int" || typeof(#[3])=="number")
           {
-            l0 = int(#[3]);
-            l0set = 1;
-          }
-          if (size(#)>3)
+            l0 = int(#[3]);
+            l0set = 1;
+          }
+          if (size(#)>3)
           {
-            if (typeof(#[4])=="ideal")
+            if (typeof(#[4])=="ideal")
             {
-              G = #[4];
-              Gset = 1;
-            }
-          }
-        }
+              G = #[4];
+              Gset = 1;
+            }
+          }
+        }
       }
     }
@@ -2658 +2658 @@
       if (v == intvec(0))
       {
-        v[1] = i;
+        v[1] = i;
       }
       else
       {
-        v[size(v)+1] = i;
+        v[size(v)+1] = i;
       }
     }
@@ -2711 +2711 @@
       while (p<N[j])
       {
-        j++;
+        j++;
       }
       N = insertGenerator(N,p,j+1);
@@ -2762 +2762 @@
       if(typeof(#[2])=="int" || typeof(#[2])=="number")
       {
-        l0 = int(#[2]);
-        l0given = 1;
+        l0 = int(#[2]);
+        l0given = 1;
       }
     }

Singular/LIB/ncfactor.lib

@@ -1268 +1268 @@
        w = D; D=X; X=w;
      }
-     // DONE with assumptions   
+     // DONE with assumptions
      //Input successfully checked
      intvec lexpofX = leadexp(X);

Singular/LIB/normal.lib

@@ -4363 +4363 @@
         // I = I1 \cap I2
         printlevel = printlevel + 1;
-        ideal JDefault = 0;             // Now it uses the default J;
+        ideal JDefault = 0; // Now it uses the default J;
         list nor1 = normalM(Id1, decomp, withDelta, denomOption, JDefault, JDefault)[1];
         list nor2 = normalM(Id2, decomp, withDelta, denomOption, JDefault, JDefault)[1];

Singular/LIB/primitiv.lib

@@ -226 +226 @@
         countz++;
         if (countz>=grad2)
-        { ERROR("No primitive element found!! This should NEVER happen!"); }
+        { ERROR("No primitive element found!! This should NEVER happen!"); }
       }
       g = g +x^countx *z^countz;
@@ -234 +234 @@
         mat=coeffs(mat[countz+1,1],x);
         if (size(mat)>countx)
-        {
+        {
           if (mat[countx+1,1] != 0)
-          {
+          {
             found=1;         // d.h. hier: neues g gefunden
       }}}