Changeset fd0df1 in git for Singular

Timestamp:

Jun 10, 2011, 12:44:10 PM (13 years ago)

Author:

Stefan Steidel <steidel@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3ffd6d2e233ebf7267b3b68dc7d6d7d506305516

Parents:

1035602ff5b8a29d54e29d4d0b863eab2f4ecab4

Message:

Some optimization regarding the number of processes used im modStd, some minor documentation improvements.

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

File:

• Singular/LIB/modstd.lib (modified) (11 diffs)

Singular/LIB/modstd.lib

@@ -368 +368 @@
       for(j = 1; j <= size(I[i]); j++)
       {
-         if((leadcoef(I[i][j]) mod p) == 0) { return(0); }
+         if((numerator(leadcoef(I[i][j])) mod p) == 0) { return(0); }
+         if((denominator(leadcoef(I[i][j])) mod p) == 0) { return(0); }
       }
    }
@@ -650 +651 @@
 @*       - variant = 5, if I is not homogeneous, 1-block-ordering and
                         exactness = 1,
-@*       - variant = 3, if I is not homogeneous, complicated ordering (lp or
+@*       - variant = 6, if I is not homogeneous, complicated ordering (lp or
                         > 1 block) and exactness = 1.
 EXAMPLE: example modStd; shows an example
@@ -668 +669 @@
    int index = 1;
    int i,k,c;
-   int pd = printlevel-voice+2;
    int j = 1;
    int pTest, sizeTest;
@@ -682 +682 @@
          int n1 = #[1];
          int exactness = 1;
-         int n2 = 10;
-         int n3 = 10;
+         if(n1 >= 10)
+         { 
+            int n2 = n1 + 1;
+            int n3 = n1;
+         }
+         else
+         {
+            int n2 = 10;
+            int n3 = 10;
+         }
       }
       if(size(#) == 2)
@@ -689 +697 @@
          int n1 = #[1];
          int exactness = #[2];
-         int n2 = 10;
-         int n3 = 10;
+         if(n1 >= 10)
+         { 
+            int n2 = n1 + 1;
+            int n3 = n1;
+         }
+         else
+         {
+            int n2 = 10;
+            int n3 = 10;
+         }
       }
       if(size(#) == 4)
@@ -696 +712 @@
          int n1 = #[1];
          int exactness = #[2];
-         int n2 = #[3];
-         int n3 = #[4];
+         if(n1 >= #[3])
+         {
+            int n2 = n1 + 1;
+         }
+         else
+         {
+            int n2 = #[3];
+         }
+         if(n1 >= #[4])
+         {
+            int n3 = n1;
+         }
+         else
+         {
+            int n3 = #[4];
+         }
       }
    }
@@ -706 +736 @@
       int n2 = 10;
       int n3 = 10;
+   }
+
+   if(printlevel >= 10)
+   {
+      "n1 = "+string(n1)+", n2 = "+string(n2)+", n3 = "+string(n3);
    }
 
@@ -834 +869 @@
       if(h)
       {
-         variant = 1; if(printlevel >= 10) { "variant = 1"; }
+         variant = 1;
+         if(printlevel >= 10) { "variant = 1"; }
          rl[1] = L[5];
          def @r = ring(rl);
@@ -961 +997 @@
    {
       tt = timer; rt = rtimer;
-
+      
+      if(printlevel >= 10) { "size(L) = "+string(size(L)); }
+         
       if(n1 > 1)
       {
-         if(printlevel >= 10) { "size(L) = "+string(size(L)); }
          while(j <= size(L) + 1)
          {
@@ -1125 +1162 @@
                }
             }
-            if(pd > 2) { "pTest o.k. but result wrong"; }
-         }
-         if(pd > 2) { "pTest o.k. but result wrong"; }
+         }
       }
 
@@ -1183 +1218 @@
    size(reduce(J1,J2));
    size(reduce(J2,J1));
-
-   /*
-   ring R4 = 0,x(1..4),wp(1,-1,-1,1);
-   ideal I = cyclic(4);
-   ideal J1 = modStd(I,1,0);
-   */
 }