Changeset af598e in git for libpolys/polys/simpleideals.cc

Timestamp:

May 4, 2011, 7:50:23 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

107b6a63f83a561264dff51b21ba9a08c2b381f8

Parents:

02c42db0b19db524ec869930bffc30346b16abed

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-04 19:50:23+02:00

git-committer:

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

Message:

ADD: factory-related wrappers (clapsing.cc/.h)
FIX: ring-dependent fixes for some factory-dependent code
TODO: finish fixing clapsing.cc/.h

File:

• libpolys/polys/simpleideals.cc (modified) (7 diffs)

libpolys/polys/simpleideals.cc

@@ -11 +11 @@
 #include "config.h"
 #include <misc/auxiliary.h>
+
+#include <omalloc/omalloc.h>
+
 #include <misc/options.h>
-#include <omalloc/omalloc.h>
-#include <polys/monomials/p_polys.h>
-#include <polys/weight.h>
-#include <polys/matpol.h>
 #include <misc/intvec.h>
-#include <polys/simpleideals.h>
+
+#include <coeffs/longrat.h>
+  
+#include "monomials/p_polys.h"
+#include "weight.h"
+#include "matpol.h"
+#include "simpleideals.h"
 #include "sbuckets.h"
 
@@ -1664 +1669 @@
 
 #ifdef HAVE_FACTORY
+#if 0
 poly id_GCD(poly f, poly g, const ring r)
 {
@@ -1670 +1676 @@
   ideal I=idInit(2,1); I->m[0]=f; I->m[1]=g;
   intvec *w = NULL;
+
   ideal S=idSyzygies(I,testHomog,&w);
+
   if (w!=NULL) delete w;
   poly gg=pTakeOutComp(&(S->m[0]),2);
@@ -1680 +1688 @@
 }
 #endif
+#endif
 
 /*2
@@ -1689 +1698 @@
 */
 #ifdef HAVE_FACTORY
-ideal idChineseRemainder(ideal *xx, number *q, int rl, const ring r)
+ideal id_ChineseRemainder(ideal *xx, number *q, int rl, const ring R)
 {
   int cnt=IDELEMS(xx[0])*xx[0]->nrows;
@@ -1708 +1717 @@
         h=xx[j]->m[i];
         if ((h!=NULL)
-        &&((r==NULL)||(pLmCmp(r,h)==-1)))
+        &&((r==NULL)||(p_LmCmp(r,h,R)==-1)))
           r=h;
       }
       if (r==NULL) break;
-      h=pHead(r);
+      h=p_Head(r, R);
       for(j=rl-1;j>=0;j--)
       {
         hh=xx[j]->m[i];
-        if ((hh!=NULL) && (pLmCmp(r,hh)==0))
+        if ((hh!=NULL) && (p_LmCmp(r,hh, R)==0))
         {
-          x[j]=pGetCoeff(hh);
-          hh=pLmFreeAndNext(hh);
+          x[j]=p_GetCoeff(hh, R);
+          hh=p_LmFreeAndNext(hh, R);
           xx[j]->m[i]=hh;
         }
         else
-          x[j]=nlInit(0, r);
-      }
-      number n=nlChineseRemainder(x,q,rl);
+          x[j]=nlInit(0, R->cf); // is R->cf really n_Q???
+      }
+       
+      number n=nlChineseRemainder(x,q,rl); // kernel/clapconv.cc
+
       for(j=rl-1;j>=0;j--)
       {
         x[j]=NULL; // nlInit(0...) takes no memory
       }
-      if (nlIsZero(n)) pDelete(&h);
+      if (nlIsZero(n, R->cf)) p_Delete(&h, R);
       else
       {
-        pSetCoeff(h,n);
+        p_SetCoeff(h,n, R);
         //Print("new mon:");pWrite(h);
-        res_p=pAdd(res_p,h);
+        res_p=p_Add_q(res_p, h, R);
       }
     }
@@ -1741 +1752 @@
   }
   omFree(x);
-  for(i=rl-1;i>=0;i--) idDelete(&(xx[i]));
+  for(i=rl-1;i>=0;i--) id_Delete(&(xx[i]), R);
   omFree(xx);
   return result;