Changeset aa07a0 in git for kernel/fast_mult.cc

Timestamp:

Feb 14, 2005, 1:31:34 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9cb26468351fcd4a821d55df6f9e83599d693eb9

Parents:

c70e58e289e0fb70ec18f904a7b46f4640a32101

Message:

*bricken: removed memory leak


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

File:

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

kernel/fast_mult.cc

@@ -1 +1 @@
 #include "fast_mult.h"
 #include "kbuckets.h"
+typedef poly fastmultrec(poly f, poly g);
 static const int pass_option=1;
 static void degsplit(poly p,int n,poly &p1,poly&p2, int vn){
@@ -41 +42 @@
 }
 
-poly do_unifastmult(poly f,int df,poly g,int dg, int vn){
+poly do_unifastmult(poly f,int df,poly g,int dg, int vn, fastmultrec rec){
   int n=1;
   if ((f==NULL)||(g==NULL)) return NULL;
@@ -77 +78 @@
   
   //p00, p11
-  poly p00=unifastmult(f0,g0);
-  poly p11=unifastmult(f1,g1);
+  poly p00=rec(f0,g0);//unifastmult(f0,g0);
+  poly p11=rec(f1,g1);
 
   //construct erg, factor
@@ -92 +93 @@
 
   
-  //  if((f1!=NULL) &&(f0!=NULL) &&(g0!=NULL) && (g1!=NULL)){
-  if(true){
-//eat up f0,f1,g0,g1 
-  poly pbig=unifastmult(pAdd(f0,f1),pAdd(g0,g1));
-  
+  if((f1!=NULL) &&(f0!=NULL) &&(g0!=NULL) && (g1!=NULL)){
+  //if(true){
+//eat up f0,f1,g0,g1
+    poly s1=pAdd(f0,f1);
+    poly s2=pAdd(g0,g1);
+  poly pbig=rec(s1,s2);
+  pDelete(&s1);
+  pDelete(&s2);
 
  
@@ -232 +236 @@
   //    do_unifastmult_buckets(f,g);
   //else
-  return do_unifastmult(f,df,g,dg,vn);
-
-}
-
+  return do_unifastmult(f,df,g,dg,vn,unifastmult);
+
+}
+