Changeset 0b0bc3 in git for kernel/ideals.cc

Timestamp:

Feb 8, 2013, 6:03:33 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

c462b60ab56fe1781c7f591d40ccd2799acd6c92

Parents:

67242b64d178faf65f7a6059740248dcfbf15c53

Message:

chg: n_Farey, p_Farey, p_ChineseRemainder

from master

File:

• kernel/ideals.cc (modified) (4 diffs)

kernel/ideals.cc

@@ -2400 +2400 @@
 #endif
 
+#ifdef HAVE_FACTORY
 /*2
 * xx,q: arrays of length 0..rl-1
@@ -2407 +2408 @@
 * destroys xx
 */
-#ifdef HAVE_FACTORY
 ideal id_ChineseRemainder(ideal *xx, number *q, int rl, const ring R)
 {
@@ -2415 +2415 @@
   result->ncols=xx[0]->ncols; // for lifting matrices
   int i,j;
-  poly r,h,hh,res_p;
   number *x=(number *)omAlloc(rl*sizeof(number));
+  poly *p=(poly *)omAlloc(rl*sizeof(poly));
   for(i=cnt-1;i>=0;i--)
   {
-    res_p=NULL;
-    loop
-    {
-      r=NULL;
-      for(j=rl-1;j>=0;j--)
-      {
-        h=xx[j]->m[i];
-        if ((h!=NULL)
-        &&((r==NULL)||(p_LmCmp(r,h,R)==-1)))
-          r=h;
-      }
-      if (r==NULL) break;
-      h=p_Head(r,R);
-      for(j=rl-1;j>=0;j--)
-      {
-        hh=xx[j]->m[i];
-        if ((hh!=NULL) && (p_LmCmp(r,hh,R)==0))
-        {
-          x[j]=pGetCoeff(hh);
-          hh=p_LmFreeAndNext(hh,R);
-          xx[j]->m[i]=hh;
-        }
-        else
-          x[j]=n_Init(0, R->cf);
-      }
-      number n=n_ChineseRemainder(x,q,rl,R->cf);
-      for(j=rl-1;j>=0;j--)
-      {
-        x[j]=NULL; // nlInit(0...) takes no memory
-      }
-      if (n_IsZero(n,R->cf)) p_Delete(&h,R);
-      else
-      {
-        p_SetCoeff(h,n,R);
-        //Print("new mon:");pWrite(h);
-        res_p=p_Add_q(res_p,h,R);
-      }
-    }
-    result->m[i]=res_p;
-  }
-  omFree(x);
+    for(j=rl-1;j>=0;j--)
+    {
+      p[j]=xx[j]->m[i];
+    }
+    result->m[i]=p_ChineseRemainder(p,x,q,rl,R);
+    for(j=rl-1;j>=0;j--)
+    {
+      xx[j]->m[i]=p[j];
+    }
+  }
+  omFreeSize(p,rl*sizeof(poly));
+  omFreeSize(x,rl*sizeof(number));
   for(i=rl-1;i>=0;i--) id_Delete(&(xx[i]),R);
-  omFree(xx);
+  omFreeSize(xx,rl*sizeof(ideal));
   return result;
 }
@@ -2561 +2532 @@
   for(i=cnt-1;i>=0;i--)
   {
-    poly h=p_Copy(x->m[i],r);
-    result->m[i]=h;
-    while(h!=NULL)
-    {
-      number c=pGetCoeff(h);
-      pSetCoeff0(h,n_Farey(c,N,r->cf));
-      n_Delete(&c,r->cf);
-      pIter(h);
-    }
-    while((result->m[i]!=NULL)&&(n_IsZero(pGetCoeff(result->m[i]),r->cf)))
-    {
-      p_LmDelete(&(result->m[i]),r);
-    }
-    h=result->m[i];
-    while((h!=NULL) && (pNext(h)!=NULL))
-    {
-      if(n_IsZero(pGetCoeff(pNext(h)),r->cf))
-      {
-        p_LmDelete(&pNext(h),r);
-      }
-      else pIter(h);
-    }
+    result->m[i]=p_Farey(x->m[i],N,r);
   }
   return result;