Changeset eccae7 in git for factory

Timestamp:

Nov 29, 2021, 3:12:38 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

1c90ae397653250439ad7f58016a650d1f64d3af

Parents:

8e89a3717be03ec921eaaddd599f3dba8a2774be

Message:

fix: memeory leak with leadDeg in tryBrownGCD

Location:

factory

Files:

• cfGcdAlgExt.cc (modified) (6 diffs)
• cfGcdAlgExt.h (modified) (1 diff)

factory/cfGcdAlgExt.cc

@@ -370 +370 @@
 }
 
+static void leadDeg(const CanonicalForm & f, int degs[])
+{ // leading degree vector w.r.t. lex. monomial order x(i+1) > x(i)
+  // 'a' should point to an array of sufficient size level(f)+1
+  if(f.inCoeffDomain())
+    return;
+  CanonicalForm tmp = f;
+  do
+  {
+    degs[tmp.level()] = tmp.degree();
+    tmp = LC(tmp);
+  }
+  while(!tmp.inCoeffDomain());
+}
+
 void tryBrownGCD( const CanonicalForm & F, const CanonicalForm & G, const CanonicalForm & M, CanonicalForm & result, bool & fail, bool topLevel )
 { // assume F,G are multivariate polys over Z/p(a) for big prime p, M "univariate" polynomial in an algebraic variable
@@ -530 +544 @@
     return;
   }
-  int *L = new int[mv+1]; // L is addressed by i from 2 to mv
-  int *N = new int[mv+1];
+  int L[mv+1];
+  int N[mv+1];
   for(int i=2; i<=mv; i++)
     L[i] = N[i] = 0;
-  L = leadDeg(f, L);
-  N = leadDeg(g, N);
+  leadDeg(f, L);
+  leadDeg(g, N);
   CanonicalForm gamma;
   TIMING_START (alg_euclid_p)
@@ -587 +601 @@
     for(int i=2; i<=mv; i++)
       dg_im[i] = 0; // reset (this is necessary, because some entries may not be updated by call to leadDeg)
-    dg_im = leadDeg(g_image, dg_im); // dg_im cannot be NIL-pointer
+    leadDeg(g_image, dg_im);
     if(isEqual(dg_im, L, 2, mv))
     {
@@ -786 +800 @@
   for(int i=1; i<=mv; i++) // initialize 'bound', 'other' with zeros
     bound[i] = other[i] = 0;
-  bound = leadDeg(f,bound); // 'bound' is set the leading degree vector of f
-  other = leadDeg(g,other);
+  leadDeg(f,bound); // 'bound' is set the leading degree vector of f
+  leadDeg(g,other);
   for(int i=1; i<=mv; i++) // entry at i=0 not visited
     if(other[i] < bound[i])
@@ -831 +845 @@
     for(int i=1; i<=mv; i++)
       other[i] = 0; // reset (this is necessary, because some entries may not be updated by call to leadDeg)
-    other = leadDeg(Dp,other);
+    leadDeg(Dp,other);
 
     if(isEqual(bound, other, 1, mv)) // equal
@@ -918 +932 @@
 
 
-int * leadDeg(const CanonicalForm & f, int *degs)
-{ // leading degree vector w.r.t. lex. monomial order x(i+1) > x(i)
-  // if f is in a coeff domain, the zero pointer is returned
-  // 'a' should point to an array of sufficient size level(f)+1
-  if(f.inCoeffDomain())
-    return 0;
-  CanonicalForm tmp = f;
-  do
-  {
-    degs[tmp.level()] = tmp.degree();
-    tmp = LC(tmp);
-  }
-  while(!tmp.inCoeffDomain());
-  return degs;
-}
-
 
 bool isLess(int *a, int *b, int lower, int upper)

factory/cfGcdAlgExt.h

@@ -35 +35 @@
 void tryBrownGCD( const CanonicalForm & F, const CanonicalForm & G, const CanonicalForm & M, CanonicalForm & result, bool & fail, bool topLevel= true );
 
-int * leadDeg(const CanonicalForm & f, int *degs);
 bool isLess(int *a, int *b, int lower, int upper);
 bool isEqual(int *a, int *b, int lower, int upper);