Changeset 8887b4 in git for libpolys

Timestamp:

Dec 2, 2016, 1:23:40 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fe25daf21a9ab3493a097c012583fa47485393df

Parents:

b0c4944a4b9999bd38a271be9f2c1b1821edeb44

Message:

chg: make nlChineseRemainderSym usable for Q.Z. bigint

Location:

libpolys/coeffs

Files:

• longrat.cc (modified) (2 diffs)
• longrat.h (modified) (1 diff)

libpolys/coeffs/longrat.cc

@@ -73 +73 @@
 
 void     nlCoeffWrite(const coeffs r, BOOLEAN details);
-number   nlChineseRemainder(number *x, number *q,int rl, const coeffs C);
 number   nlFarey(number nN, number nP, const coeffs CF);
 
@@ -2942 +2941 @@
   {
     number p=CF->convFactoryNSingN(qnew,CF);
-    number p2=nlIntDiv(p,nlInit(2, CF),CF);
-    if (nlGreater(n,p2,CF))
-    {
-       number n2=nlSub(n,p,CF);
-       nlDelete(&n,CF);
+    number p2;
+    if (getCoeffType(CF) == n_Q) p2=nlIntDiv(p,nlInit(2, CF),CF);
+    else                         p2=CF->cfDiv(p,CF->cfInit(2, CF),CF);
+    if (CF->cfGreater(n,p2,CF))
+    {
+       number n2=CF->cfSub(n,p,CF);
+       CF->cfDelete(&n,CF);
        n=n2;
     }
-    nlDelete(&p2,CF);
-    nlDelete(&p,CF);
-  }
-  nlNormalize(n,CF);
+    CF->cfDelete(&p2,CF);
+    CF->cfDelete(&p,CF);
+  }
+  CF->cfNormalize(n,CF);
   return n;
 }
-number   nlChineseRemainder(number *x, number *q,int rl, const coeffs C)
+#if 0
+number nlChineseRemainder(number *x, number *q,int rl, const coeffs C)
 {
   CFArray inv(rl);
   return nlChineseRemainderSym(x,q,rl,TRUE,inv,C);
 }
+#endif
 
 static void nlClearContent(ICoeffsEnumerator& numberCollectionEnumerator, number& c, const coeffs cf)

libpolys/coeffs/longrat.h

@@ -131 +131 @@
 number nlMapGMP(number from, const coeffs src, const coeffs dst);
 #  endif
+// for ring similiar to Q/Z (char 0 required):
+number   nlChineseRemainderSym(number *x, number *q,int rl, BOOLEAN sym, CFArray &inv_cache,const coeffs CF);
+
 
 #endif