Changeset e55bdc in git

Timestamp:

Jan 4, 2018, 3:39:06 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

25ea9a7c2c1ac7855e46c5f4b2d4e82c1c271f0d

Parents:

cd41db8bc95c947e9ebfa6c7ca4b3c40724b3dae

Message:

fix: system("hilbroune",I): memory errors

File:

• kernel/combinatorics/hilb.cc (modified) (9 diffs)

kernel/combinatorics/hilb.cc

@@ -130 +130 @@
 {
   int  l = lp, x, i, j;
-  int  *p, *pl;
+  int  *pl;
+  int  *p;
   p = pol;
   for (i = Nv; i>0; i--)
@@ -264 +265 @@
 
 //adds the new polynomial at the coresponding position
-//and simplifies the ideal
+//and simplifies the ideal, destroys p
 static void SortByDeg_p(ideal I, poly p)
 {
@@ -279 +280 @@
     if(p_DivisibleBy( I->m[i],p, currRing))
     {
+      p_Delete(&p,currRing);
       return;
     }
@@ -286 +288 @@
     if(p_DivisibleBy(p,I->m[i], currRing))
     {
-      I->m[i] = NULL;
+      p_Delete(&I->m[i],currRing);
     }
   }
@@ -374 +376 @@
   idSkipZeroes(I);
   res = idInit(1,1);
-  res->m[0] = poly(0);
   for(i = 0; i<=IDELEMS(I)-1;i++)
   {
     SortByDeg_p(res, I->m[i]);
+    I->m[i]=NULL; // I->m[i] is now in res
   }
   idSkipZeroes(res);
@@ -438 +440 @@
       {
         SortByDeg_p(I,res->m[i]);
+        res->m[i]=NULL; // is now in I
       }
     }
@@ -449 +452 @@
 {
   SortByDeg_p(I,p->m[0]);
+  p->m[0]=NULL; // is now in I
   //idSkipZeroes(I);
 }
@@ -1320 +1324 @@
 {
   intvec *work, *hseries2;
-  int i, j, k, s, t, l;
+  int i, j, k, t, l;
+  int s;
   if (hseries1 == NULL)
     return NULL;
@@ -1353 +1358 @@
 void hDegreeSeries(intvec *s1, intvec *s2, int *co, int *mu)
 {
-  int m, i, j, k;
+  int i, j, k;
+  int m;
   *co = *mu = 0;
   if ((s1 == NULL) || (s2 == NULL))