Changeset d2d22f in git

Timestamp:

Feb 24, 2005, 5:26:18 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

9bea6ef004ce1d30a0df5771578cee93e449259d

Parents:

040ee808c6d9e77d6f896824154bf12c65cd0d97

Message:

*bricken: fixed memory leaks


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

File:

• kernel/fast_mult.cc (modified) (7 diffs)

kernel/fast_mult.cc

@@ -399 +399 @@
   return p;
 }
-static void buildTermAndAdd(int n,number* facult,poly* f_terms,int* exp,int f_len,kBucket_pt erg_bucket,ring r){
-  number denom=n_Init(1,r);
+static void buildTermAndAdd(int n,number* facult,poly* f_terms,int* exp,int f_len,kBucket_pt erg_bucket,ring r, number coef){
+ 
   int i;
   poly term=p_Init(r);
-  for(i=0;i<f_len;i++){
-    if(exp[i]!=0){
-      number trash=denom;
-      denom=n_Mult(denom,facult[exp[i]],r);
-      n_Delete(&trash,r);
-    }
+
+   //  number denom=n_Init(1,r);
+//   for(i=0;i<f_len;i++){
+//     if(exp[i]!=0){
+//       number trash=denom;
+//       denom=n_Mult(denom,facult[exp[i]],r);
+//       n_Delete(&trash,r);
+//     }
     
-  }
-  number coef=n_IntDiv(facult[n],denom,r);   //right function here?
-  n_Delete(&denom,r);
-  poly erg=p_NSet(coef,r);
+//   }
+//   number coef=n_IntDiv(facult[n],denom,r);   //right function here?
+//   n_Delete(&denom,r);
+//   poly erg=p_NSet(coef,r);
+  poly erg=p_NSet(n_Copy(coef,r),r);
   for(i=0;i<f_len;i++){
     if(exp[i]!=0){
@@ -424 +427 @@
     
   }
-  int pseudo_len=0;
+  int pseudo_len=1;
   kBucket_Add_q(erg_bucket,erg,&pseudo_len);
 }
@@ -430 +433 @@
 
 
-static void MC_iterate(poly f, int n, ring r, int f_len,number* facult, int* exp,poly* f_terms,kBucket_pt erg_bucket,int pos,int sum){
+static void MC_iterate(poly f, int n, ring r, int f_len,number* facult, int* exp,poly* f_terms,kBucket_pt erg_bucket,int pos,int sum, number coef){
   int i;
+
   if (pos<f_len-1){
     for(i=0;i<=n-sum;i++){
       exp[pos]=i;
-      MC_iterate(f, n, r, f_len,facult, exp,f_terms,erg_bucket,pos+1,sum+i);
+      number new_coef=n_IntDiv(coef,facult[i],r);
+      MC_iterate(f, n, r, f_len,facult, exp,f_terms,erg_bucket,pos+1,sum+i,new_coef);
+      n_Delete(& new_coef,r);
     }
     return;
@@ -442 +448 @@
     i=n-sum;
     exp[pos]=i;
-    buildTermAndAdd(n,facult,f_terms,exp,f_len,erg_bucket,r);
+    number new_coef=n_IntDiv(coef,facult[i],r);
+    buildTermAndAdd(n,facult,f_terms,exp,f_len,erg_bucket,r, new_coef);
+    n_Delete(& new_coef,r);
   }
   assume(pos<=f_len-1);
@@ -472 +480 @@
   }
   assume(f_iter==NULL);
-  MC_iterate(f,n,r,f_len,&facult[0], &exp[0], &f_terms[0],erg_bucket,0,0);
+  MC_iterate(f,n,r,f_len,&facult[0], &exp[0], &f_terms[0],erg_bucket,0,0,facult[n]);
 
 
@@ -483 +491 @@
   //free facult
   for(i=0;i<=n;i++){
-    nDelete(&facult[0]);
+    nDelete(&facult[i]);
   }
   omfree(exp);
@@ -491 +499 @@
   poly erg;
   kBucketClear(erg_bucket,&erg, &len);
+  kBucketDestroy(&erg_bucket);
   return erg;
 }