Changeset d0dbd7 in git for factory/cfModResultant.cc

Timestamp:

Dec 4, 2017, 4:06:03 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

0e1179b5ff58e16819323d878adc9a5011d015a1

Parents:

4799efea9bdfdc69fbd2d57c6353cf9ed66664c0

Message:

chg: more NEW_ARRAY/DELETE_ARRY in factory

File:

• factory/cfModResultant.cc (modified) (8 diffs)

factory/cfModResultant.cc

@@ -47 +47 @@
 {
   int n= tmax (F.level(), G.level());
-  int * degsf= new int [n + 1];
-  int * degsg= new int [n + 1];
+  int * degsf= NEW_ARRAY(int,n + 1);
+  int * degsg= NEW_ARRAY(int,n + 1);
 
   for (int i = 0; i <= n; i++)
@@ -61 +61 @@
   int both_zero= 0;
   int degsfx, degsgx;
+  int Flevel=F.level();
+  int Glevel=G.level();
 
   if (x.level() != 1)
@@ -73 +75 @@
         continue;
       }
-      if (degsf[i] == 0 && degsg[i] != 0 && i <= G.level())
+      if (degsf[i] == 0 && degsg[i] != 0 && i <= Glevel)
       {
         f_zero++;
         continue;
       }
-      if (degsg[i] == 0 && degsf[i] && i <= F.level())
+      if (degsg[i] == 0 && degsf[i] && i <= Flevel)
       {
         g_zero++;
@@ -109 +111 @@
         }
       }
-      delete [] degsf;
-      delete [] degsg;
+      DELETE_ARRAY(degsf);
+      DELETE_ARRAY(degsg);
       return;
     }
@@ -116 +118 @@
     if (both_non_zero == 0)
     {
-      delete [] degsf;
-      delete [] degsg;
+      DELETE_ARRAY(degsf);
+      DELETE_ARRAY(degsg);
       return;
     }
@@ -128 +130 @@
       if (i == xlevel)
         continue;
-      if (degsf[i] != 0 && degsg[i] == 0 && i <= F.level())
+      if (degsf[i] != 0 && degsg[i] == 0 && i <= Flevel)
       {
         if (k + both_non_zero != i)
@@ -137 +139 @@
         k++;
       }
-      if (degsf[i] == 0 && degsg[i] != 0 && i <= G.level())
+      if (degsf[i] == 0 && degsg[i] != 0 && i <= Glevel)
       {
         if (l + g_zero + both_non_zero != i)
@@ -233 +235 @@
   }
 
-  delete [] degsf;
-  delete [] degsg;
+  DELETE_ARRAY(degsf);
+  DELETE_ARRAY(degsg);
 }