Changeset 9cb2646 in git

Timestamp:

Feb 14, 2005, 4:29:33 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

2664d0fccb132e3077f9f8feee90ee2ce139ee26

Parents:

aa07a05c3a08e7bfc7d1e1326b8bfe6f74ab6430

Message:

*bricken: + multivariate


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

Location:

kernel

Files:

• fast_mult.cc (modified) (5 diffs)
• fast_mult.h (modified) (1 diff)

kernel/fast_mult.cc

@@ -27 +27 @@
   if(erg2_i){
     pNext(erg2_i)=NULL;
-      }
+  }
   if (erg1_i){
     pNext(erg1_i)=NULL;
@@ -42 +42 @@
 }
 
-poly do_unifastmult(poly f,int df,poly g,int dg, int vn, fastmultrec rec){
+static 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;
@@ -94 +94 @@
   
   if((f1!=NULL) &&(f0!=NULL) &&(g0!=NULL) && (g1!=NULL)){
-  //if(true){
-//eat up f0,f1,g0,g1
+    //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);
-
- 
-  //eat up pbig
-  poly sum=pbig;
-  pSetExp(factor,vn,pot);
-  
-  //eat up p00
-  sum=pAdd(sum,pNeg(p00));
- 
-  //eat up p11
-  sum=pAdd(sum,pNeg(p11));
-
-  
-  sum=pMult_mm(sum,factor);
-
-
-  //eat up sum
-  erg=pAdd(sum,erg);
+    poly pbig=rec(s1,s2);
+    pDelete(&s1);
+    pDelete(&s2);
+
+ 
+    //eat up pbig
+    poly sum=pbig;
+    pSetExp(factor,vn,pot);
+  
+    //eat up p00
+    sum=pAdd(sum,pNeg(p00));
+ 
+    //eat up p11
+    sum=pAdd(sum,pNeg(p11));
+
+  
+    sum=pMult_mm(sum,factor);
+
+
+    //eat up sum
+    erg=pAdd(sum,erg);
   } else {
     //eat up f0,f1,g0,g1 
@@ -223 +223 @@
 //   return erg;
 // }
+
+static inline int max(int a, int b){
+  return (a>b)? a:b;
+}
+static inline int min(int a, int b){
+  return (a>b)? b:a;
+}
 poly unifastmult(poly f,poly g){
   int vn=1;
@@ -240 +247 @@
 }
 
+poly multifastmult(poly f, poly g){
+  if((f==NULL)||(g==NULL)) return NULL;
+  if (pLength(f)*pLength(g)<100)
+    return ppMult_qq(f,g);
+  //find vn
+  //determine df,dg simultaneously
+  int i;
+  int can_i=-1;
+  int can_df=0;
+  int can_dg=0;
+  int can_crit=0;
+  for(i=1;i<=pVariables;i++){
+    poly p;
+    int df=0;
+    int dg=0;
+    //max min max Strategie
+    p=f;
+    while(p){
+      df=max(df,pGetExp(p,i));
+      p=pNext(p);
+    }
+    if(df>can_crit){
+      p=g;
+      while(p){
+        dg=max(dg,pGetExp(p,i));
+        p=pNext(p);
+      }
+      int crit=min(df,dg);
+      if (crit>can_crit){
+        can_crit=crit;
+        can_i=i;
+        can_df=df;
+        can_dg=dg;
+      }
+    }
+  }
+  if(can_crit==0)
+    return ppMult_qq(f,g);
+  else
+    return do_unifastmult(f,can_df,g,can_dg,can_i,multifastmult);
+}

kernel/fast_mult.h

@@ -4 +4 @@
 #include "polys.h"
 poly unifastmult(poly f,poly g);
-
+poly multifastmult(poly f, poly g);
 #endif