Changeset e79e26 in git

Timestamp:

Jan 23, 2014, 1:41:47 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

616d68556ae75bb7c49364150bb827162c506899

Parents:

190da3f8a1812ae3bf31c5c7fe7a441c0452abea

Message:

add: chinese remainder for alg./trans. extensions

Location:

libpolys/polys

Files:

• ext_fields/algext.cc (modified) (2 diffs)
• ext_fields/transext.cc (modified) (2 diffs)
• monomials/p_polys.h (modified) (1 diff)

libpolys/polys/ext_fields/algext.cc

@@ -1379 +1379 @@
 }
 
+number  naChineseRemainder(number *x, number *q,int rl, BOOLEAN sym,const coeffs cf)
+{
+  poly *P=(poly*)omAlloc(rl*sizeof(poly*));
+  number *X=(number *)omAlloc(rl*sizeof(number));
+  int i;
+  for(i=0;i<rl;i++) P[i]=p_Copy((poly)(x[i]),cf->extRing);
+  poly result=p_ChineseRemainder(P,X,q,rl,cf->extRing);
+  omFreeSize(X,rl*sizeof(number));
+  omFreeSize(P,rl*sizeof(poly*));
+  return ((number)result);
+}
+
+
 BOOLEAN naInitChar(coeffs cf, void * infoStruct)
 {
@@ -1419 +1432 @@
   cf->cfInit         = naInit;
   cf->cfInit_bigint  = naInit_bigint;
+  // cf->cfFarey
+  cf->cfChineseRemainder= naChineseRemainder;
   cf->cfInt          = naInt;
   cf->cfNeg          = naNeg;

libpolys/polys/ext_fields/transext.cc

@@ -2363 +2363 @@
 }
 
+number  ntChineseRemainder(number *x, number *q,int rl, BOOLEAN sym,const coeffs cf)
+{
+  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  int i;
+
+  poly *P=(poly*)omAlloc(rl*sizeof(poly*));
+  number *X=(number *)omAlloc(rl*sizeof(number));
+
+  for(i=0;i<rl;i++) P[i]=p_Copy(NUM((fraction)(x[i])),cf->extRing);
+  NUM(result)=p_ChineseRemainder(P,X,q,rl,cf->extRing);
+
+  for(i=0;i<rl;i++)
+  {
+    P[i]=p_Copy(DEN((fraction)(x[i])),cf->extRing);
+    if (P[i]==NULL) P[i]=p_One(cf->extRing);
+  }
+  DEN(result)=p_ChineseRemainder(P,X,q,rl,cf->extRing);
+
+  omFreeSize(X,rl*sizeof(number));
+  omFreeSize(P,rl*sizeof(poly*));
+  return ((number)result);
+}
+
 BOOLEAN ntInitChar(coeffs cf, void * infoStruct)
 {
@@ -2398 +2421 @@
   cf->cfInit         = ntInit;
   cf->cfInit_bigint  = ntInit_bigint;
+  //cf->cfFarey
+  cf->cfChineseRemainder = ntChineseRemainder;
   cf->cfInt          = ntInt;
   cf->cfNeg          = ntNeg;

libpolys/polys/monomials/p_polys.h

@@ -234 +234 @@
 {
   p_LmCheckPolyRing2(p, r);
-  pAssume2(rRing_has_Comp(r));
   if (r->pCompIndex>=0) __p_GetComp(p,r) = c;
   return c;