Changeset 78030c in git

Timestamp:

Feb 14, 2005, 5:15:53 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

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

Children:

49bfb1f50e3b7d2ed4c371ec6ee986a0d6f3d2ef

Parents:

2664d0fccb132e3077f9f8feee90ee2ce139ee26

Message:

+ ring as parameter


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

Location:

kernel

Files:

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

kernel/fast_mult.cc

@@ -1 +1 @@
 #include "fast_mult.h"
 #include "kbuckets.h"
-typedef poly fastmultrec(poly f, poly g);
+typedef poly fastmultrec(poly f, poly g, ring r);
 static const int pass_option=1;
-static void degsplit(poly p,int n,poly &p1,poly&p2, int vn){
+static void degsplit(poly p,int n,poly &p1,poly&p2, int vn, ring r){
   poly erg1_i, erg2_i;
   erg1_i=NULL;
   erg2_i=NULL;
   while(p){
-    if(pGetExp(p,vn)>=n){
+    if(p_GetExp(p,vn,r)>=n){
       if (p1==NULL){
         p1=p;
@@ -33 +33 @@
   
 }
-static void div_by_x_power_n(poly p, int n, int vn){
+static void div_by_x_power_n(poly p, int n, int vn, ring r){
   while(p){
-    assume(pGetExp(p,vn)>=n);
-    int e=pGetExp(p,vn);
-    pSetExp(p,vn,e-n);
+    assume(p_GetExp(p,vn,r)>=n);
+    int e=p_GetExp(p,vn,r);
+    p_SetExp(p,vn,e-n,r);
     p=pNext(p);
   }
 }
 
-static 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, ring r){
   int n=1;
   if ((f==NULL)||(g==NULL)) return NULL;
@@ -59 +59 @@
     }
   if(n==1){
-    return(ppMult_qq(f,g));
+    return(pp_Mult_qq(f,g,r));
   }
   
@@ -69 +69 @@
   poly f1=NULL;
   poly f0=NULL;//f-(x^(pot)*F1);
-  degsplit(pCopy(f),pot,f1,f0,vn);
-  div_by_x_power_n(f1,pot,vn);
+  degsplit(p_Copy(f,r),pot,f1,f0,vn,r);
+  div_by_x_power_n(f1,pot,vn,r);
 
   poly g1=NULL;
   poly g0=NULL;
-  degsplit(pCopy(g),pot,g1,g0,vn);
-  div_by_x_power_n(g1,pot,vn);
+  degsplit(p_Copy(g,r),pot,g1,g0,vn,r);
+  div_by_x_power_n(g1,pot,vn,r);
   
   //p00, p11
-  poly p00=rec(f0,g0);//unifastmult(f0,g0);
-  poly p11=rec(f1,g1);
+  poly p00=rec(f0,g0,r);//unifastmult(f0,g0);
+  poly p11=rec(f1,g1,r);
 
   //construct erg, factor
@@ -85 +85 @@
   poly factor=pOne();
 
-  pSetExp(factor,vn,n);
-  erg=ppMult_mm(p11,factor);
-  erg=pAdd(erg,pCopy(p00));
+  p_SetExp(factor,vn,n,r);
+  erg=pp_Mult_mm(p11,factor,r);
+  erg=p_Add_q(erg,p_Copy(p00,r),r);
 
   
@@ -96 +96 @@
     //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);
+    poly s1=p_Add_q(f0,f1,r);
+    poly s2=p_Add_q(g0,g1,r);
+    poly pbig=rec(s1,s2,r);
+    p_Delete(&s1,r);
+    p_Delete(&s2,r);
 
  
     //eat up pbig
     poly sum=pbig;
-    pSetExp(factor,vn,pot);
+    p_SetExp(factor,vn,pot,r);
   
     //eat up p00
-    sum=pAdd(sum,pNeg(p00));
+    sum=p_Add_q(sum,p_Neg(p00,r),r);
  
     //eat up p11
-    sum=pAdd(sum,pNeg(p11));
-
-  
-    sum=pMult_mm(sum,factor);
+    sum=p_Add_q(sum,p_Neg(p11,r),r);
+
+  
+    sum=p_Mult_mm(sum,factor,r);
 
 
     //eat up sum
-    erg=pAdd(sum,erg);
+    erg=p_Add_q(sum,erg,r);
   } else {
     //eat up f0,f1,g0,g1 
-    poly s1=unifastmult(f0,g1);
-    poly s2=unifastmult(g0,f1);
-    pSetExp(factor,vn,pot);
-    poly h=pMult_mm(((s1!=NULL)?s1:s2),factor);
+    poly s1=rec(f0,g1,r);
+    poly s2=rec(g0,f1,r);
+    p_SetExp(factor,vn,pot,r);
+    poly h=p_Mult_mm(((s1!=NULL)?s1:s2),factor,r);
     pDelete(&f1);
     pDelete(&f0);
     pDelete(&g0);
     pDelete(&g1);
-    erg=pAdd(erg,h);
-  }
-  
- 
-  pDelete(&factor);
+    erg=p_Add_q(erg,h,r);
+  }
+  
+ 
+  p_Delete(&factor,r);
                   
                   
@@ -230 +230 @@
   return (a>b)? b:a;
 }
-poly unifastmult(poly f,poly g){
+poly unifastmult(poly f,poly g, ring r){
   int vn=1;
   if((f==NULL)||(g==NULL)) return NULL;
-  int df=pGetExp(f,vn);
-  int dg=pGetExp(g,vn);
+  int df=p_GetExp(f,vn,r);
+  int dg=p_GetExp(g,vn,r);
   if ((df==0)||(dg==0))
-    return ppMult_qq(f,g);
+    return pp_Mult_qq(f,g,r);
   if (df*dg<100)
-    return ppMult_qq(f,g);
+    return pp_Mult_qq(f,g,r);
   // if (df*dg>10000)
   //  return
   //    do_unifastmult_buckets(f,g);
   //else
-  return do_unifastmult(f,df,g,dg,vn,unifastmult);
-
-}
-
-poly multifastmult(poly f, poly g){
+  return do_unifastmult(f,df,g,dg,vn,unifastmult,r);
+
+}
+
+poly multifastmult(poly f, poly g, ring r){
   if((f==NULL)||(g==NULL)) return NULL;
   if (pLength(f)*pLength(g)<100)
-    return ppMult_qq(f,g);
+    return pp_Mult_qq(f,g,r);
   //find vn
   //determine df,dg simultaneously
@@ -258 +258 @@
   int can_dg=0;
   int can_crit=0;
-  for(i=1;i<=pVariables;i++){
+  for(i=1;i<=rVar(r);i++){
     poly p;
     int df=0;
@@ -265 +265 @@
     p=f;
     while(p){
-      df=max(df,pGetExp(p,i));
+      df=max(df,p_GetExp(p,i,r));
       p=pNext(p);
     }
@@ -271 +271 @@
       p=g;
       while(p){
-        dg=max(dg,pGetExp(p,i));
+        dg=max(dg,p_GetExp(p,i,r));
         p=pNext(p);
       }
@@ -284 +284 @@
   }
   if(can_crit==0)
-    return ppMult_qq(f,g);
+    return pp_Mult_qq(f,g,r);
   else
-    return do_unifastmult(f,can_df,g,can_dg,can_i,multifastmult);
-}
+    {
+      poly erg=do_unifastmult(f,can_df,g,can_dg,can_i,multifastmult,r);
+      p_Normalize(erg,r);
+      return(erg);
+    }
+}

kernel/fast_mult.h

@@ -3 +3 @@
 #include "mod2.h"
 #include "polys.h"
-poly unifastmult(poly f,poly g);
-poly multifastmult(poly f, poly g);
+poly unifastmult(poly f,poly g, ring r);
+poly multifastmult(poly f, poly g, ring r);
 #endif