Changeset eb38b2 in git

Timestamp:

Feb 27, 2015, 9:13:07 PM (8 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

54aa7ddaf531843259b06aef37d3c66407a458c4

Parents:

1e5e1325f697a60090ae41960c9afca41d9fa179

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-02-27 21:13:07+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2015-02-27 21:14:39+01:00

Message:

Fix bug in sres.

NOTE: after errorreported gets set to 1 nothing is guaranteed (e.g. no poly printing)

Files:

• Tst/New.lst (modified) (1 diff)
• Tst/New/sres_bug.res.gz.uu (added)
• Tst/New/sres_bug.stat (added)
• Tst/New/sres_bug.tst (added)
• kernel/GBEngine/syz0.cc (modified) (5 diffs)

Tst/New.lst

@@ -54 +54 @@
 New/bug593_primdecZ.tst
 New/grmodexamples.tst
+New/sres_bug.tst

kernel/GBEngine/syz0.cc

@@ -357 +357 @@
           if (p==NULL)
           {
-            WerrorS("ideal not a standard basis");//no polynom for reduction
             pDelete(&toRed);
             for(k=j;k<Fl;k++) pDelete(&(pairs[k]));
@@ -369 +368 @@
             omFreeSize((ADDRESS)totalS,Fl*sizeof(int));
             for(k=0;k<IDELEMS(result);k++) pDelete(&((*Shdl)[k]));
+            WerrorS("ideal not a standard basis");//no polynom for reduction
             return result;
           }
@@ -660 +660 @@
             else
             {
-              //no polynom for reduction
-              WerrorS("ideal not a standard basis");
-              pDelete(&toRed);
+              pDelete(&toRed); 
+              
               pDelete(&syz);
               for(k=j;k<Fl;k++) pDelete(&(pairs[k]));
               omFreeSize((ADDRESS)pairs,(Fl + gencQ)*sizeof(poly));
+
+              
               for(k=0;k<IDELEMS(result);k++) pDelete(&((*Shdl)[k]));
 
               kBucketDestroy(&(sy0buck));
+
+              //no polynom for reduction
+              WerrorS("ideal not a standard basis");
+              
               return result;
             }
@@ -897 +902 @@
         res[syzIndex+1] = sySchreyersSyzygiesFB(res[syzIndex],&modcomp,mW);
 
+      if (errorreported)
+      {        
+        for (j=0;j<*length;j++) idDelete( &res[j] );
+        omFreeSize((ADDRESS)res,*length*sizeof(ideal));
+        return NULL;
+      }
+
       mW = res[syzIndex];
     }
@@ -934 +946 @@
       if (syzIndex==0) syInitSort(res[0],&modcomp);
       res[syzIndex+1] = sySchreyersSyzygiesFM(res[syzIndex],&modcomp);
+      if (errorreported)
+      {        
+        for (j=0;j<*length;j++) idDelete( &res[j] );
+        omFreeSize((ADDRESS)res,*length*sizeof(ideal));
+        return NULL;
+      }
     }
     syzIndex++;