Changeset 1c4e9a in git for kernel/fast_mult.cc

Timestamp:

Jul 19, 2011, 5:36:57 PM (12 years ago)

Author:

mlee <martinlee84@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

a2174ab573b7b58a5ee6a6c293035fc8ecbd45ab

Parents:

1f637e0cf55bac728426f222f498b81de378e159

git-author:

mlee <martinlee84@web.de>2011-07-19 17:36:57+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:52:40+01:00

Message:

put r->cf at appropiate places

File:

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

kernel/fast_mult.cc

@@ -3 +3 @@
 ****************************************/
 /* $Id$ */
-#include <kernel/mod2.h>
+#include "mod2.h"
 #include <polys/monomials/ring.h>
 #include <kernel/fast_mult.h>
@@ -438 +438 @@
 
   y = p_GetCoeff(p,r);
-  x = n_Mult(y,pGetCoeff(q),r);
-  n_Delete(&y,r);
+  x = n_Mult(y,pGetCoeff(q),r->cf);
+  n_Delete(&y,r->cf);
   p_SetCoeff0(p,x,r);
   //for (i=(currRing->N); i!=0; i--)
@@ -458 +458 @@
   poly res = p_Init(r,lm_bin);
 
-  x = n_Mult(p_GetCoeff(p,r),p_GetCoeff(q,r),r);
+  x = n_Mult(p_GetCoeff(p,r),p_GetCoeff(q,r),r->cf);
   p_SetCoeff0(res,x,r);
   p_ExpVectorSum(res,p, q,r);
@@ -467 +467 @@
   int i;
 
-  if(!n_IsOne(p_GetCoeff(p,r),r))
+  if(!n_IsOne(p_GetCoeff(p,r),r->cf))
   {
     number x, y;
     y = p_GetCoeff(p,r);
-    n_Power(y,exp,&x,r);
-    n_Delete(&y,r);
+    n_Power(y,exp,&x,r->cf);
+    n_Delete(&y,r->cf);
     p_SetCoeff0(p,x,r);
   }
@@ -535 +535 @@
       if(i==0)
       {
-        new_coef=n_Copy(coef,r);
+        new_coef=n_Copy(coef,r->cf);
       }
       else
       {
         number old=new_coef;
-        number old_rest=n_Init(n-sum-(i-1),r);
-        new_coef=n_Mult(new_coef,old_rest,r);
-        n_Delete(&old_rest,r);
-        n_Delete(&old,r);
-        number i_number=n_Init(i,r);
+        number old_rest=n_Init(n-sum-(i-1),r->cf);
+        new_coef=n_Mult(new_coef,old_rest,r->cf);
+        n_Delete(&old_rest,r->cf);
+        n_Delete(&old,r->cf);
+        number i_number=n_Init(i,r->cf);
         old=new_coef;
-        new_coef=n_IntDiv(new_coef,i_number,r);
-        n_Delete(&old,r);
-        n_Delete(&i_number,r);
+        new_coef=n_IntDiv(new_coef,i_number,r->cf);
+        n_Delete(&old,r->cf);
+        n_Delete(&i_number,r->cf);
       }
       //new_coef is
@@ -562 +562 @@
         zw_l=zw_real;
       }
-      //n_Delete(& new_coef,r);
-    }
-    n_Delete(&new_coef,r);
+      //n_Delete(& new_coef,r->cf);
+    }
+    n_Delete(&new_coef,r->cf);
     if (pos==f_len-2)
     {
@@ -576 +576 @@
     i=n-sum;
     exp[pos]=i;
-    number new_coef=nCopy(coef);//n_IntDiv(coef,facult[i],r); //really consumed???????
+    number new_coef=n_Copy(coef,r->cf);//n_IntDiv(coef,facult[i],r); //really consumed???????
     buildTermAndAdd(n,facult,f_terms,exp,f_len,erg_bucket,r, new_coef,zw, tmp,term_pot);
     // n_Delete(& new_coef,r);
@@ -594 +594 @@
   //  number null_number=n_Init(0,r);
   number* facult=(number*) omAlloc((n+1)*sizeof(number));
-  facult[0]=n_Init(1,r);
+  facult[0]=n_Init(1,r->cf);
   int i;
   for(i=1;i<=n;i++)
   {
-    number this_n=n_Init(i,r);
-    facult[i]=n_Mult(this_n,facult[i-1],r);
-    n_Delete(&this_n,r);
+    number this_n=n_Init(i,r->cf);
+    facult[i]=n_Mult(this_n,facult[i-1],r->cf);
+    n_Delete(&this_n,r->cf);
   }
 
@@ -631 +631 @@
   poly zw=NULL;
   poly tmp=p_Init(r);
-  number one=n_Init(1,r);
+  number one=n_Init(1,r->cf);
   MC_iterate(f,n,r,f_len,&facult[0], &exp[0], &f_terms[0],erg_bucket,0,0,one/*facult[n]*/,zw,tmp, term_potences);
 
 
-  n_Delete(&one,r);
+  n_Delete(&one,r->cf);
 
 
@@ -644 +644 @@
   for(i=0;i<=n;i++)
   {
-    n_Delete(&facult[i],r);
+    n_Delete(&facult[i],r->cf);
   }
   int i2;