Changeset 6fe9a5 in git for Singular/LIB/bfun.lib

Timestamp:

Mar 18, 2011, 9:12:17 PM (12 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

3542f7c7fb52228c2cae41980c84109e503eaf75

Parents:

19ad27804d6e9c1c16eb3b3f560ad543ea06b922

Message:

*levandov: bugfixes for bfun_lib and dmodapp_lib by Daniel Andres

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

File:

• Singular/LIB/bfun.lib (modified) (9 diffs)

Singular/LIB/bfun.lib

@@ -75 +75 @@
 - fixed printlevel/debug message issue in bfct, bfctAnn
 - fixed small issue for zero ideal input in linReduceIdeal
+
+16.03.11
+- fixed bug in linReduceIdeal when ideal contained unlucky constellation
+  of zeros
+- fixed printlevel/debug message issue in linReduceIdeal
 */
 
@@ -253 +258 @@
 
 //-------------- main procedures -------------------------------------------------------
+
 proc linReduceIdeal(ideal I, list #)
 "USAGE:  linReduceIdeal(I [,s,t,u]); I an ideal, s,t,u optional ints
@@ -301 +307 @@
   int sI = ncols(I);
   int sZeros = sI - size(I);
-  int i,j;
+  int i,j,k;
   ideal J,lmJ,ordJ;
   list lJ = sort(I);
+  intvec iv,iv2; //todo
   module M; // for the coefficients
   // step 1: prepare, e.g. sort I
@@ -312 +319 @@
       if (remembercoeffs <> 0)
       {
-        j = 0;
-        for (i=1; i<=sI; i++)
-        {
-          if (I[i] == 0)
+        j = 0;
+        k = 0;
+        intvec posNonZero;
+        for (i=1; i<=sI; i++)
+        {
+          if (I[i] == 0)
           {
             j++;
@@ -322 +331 @@
             M[j] = gen(i);
           }
-          else
-          {
-            M[i+sZeros-j] = gen(lJ[2][i-j]+j);
-          }
-        }
+          else
+          {
+            k++;
+            M[k+sZeros] = gen(lJ[2][k]);
+            posNonZero = posNonZero,i;
+          }
+        }
+        posNonZero = posNonZero[2..nrows(posNonZero)];
+        posNonZero = posNonZero[lJ[2]];
+        for (i=1; i<=size(lJ[1]); i++)
+        {
+          M[i+sZeros] = gen(posNonZero[i]);
+        }
+        kill posNonZero;
       }
       else
@@ -343 +361 @@
       if (remembercoeffs <> 0)
       {
-        for (i=1; i<=size(lJ[1]); i++) { M[i+sZeros] = gen(lJ[2][i]); }
+        for (i=1; i<=size(lJ[1]); i++) { M[i] = gen(lJ[2][i]); }
       }
     }
@@ -354 +372 @@
     }
   }
-  dbprint(ppl-1,"// initially sorted ideal:", I);
-  if (remembercoeffs <> 0) { dbprint(ppl-1,"// used permutations:", M); }
+  dbprint(ppl,"// initially sorted ideal:", I);
+  if (remembercoeffs <> 0) { dbprint(ppl,"// used permutations:", M); }
   // step 2: reduce leading monomials by linear reductions
   poly lm,c,redpoly,maxlmJ;
@@ -385 +403 @@
           if (lm == lmJ[j])
           {
-            dbprint(ppl-1,"// reducing " + string(redpoly));
+            dbprint(ppl-1,"// reducing " + string(redpoly));
             dbprint(ppl-1,"//  with " + string(J[j]));
             c = leadcoef(redpoly)/leadcoef(J[j]);
@@ -420 +438 @@
     dbprint(ppl-1,string(J));
     if (remembercoeffs <> 0) { dbprint(ppl-1,"// used reductions:" + string(M)); }
-    int k;
     for (i=sZeros+1; i<=sI; i++)
     {