Changeset 529fa4 in git

Timestamp:

May 11, 2011, 7:18:28 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6137945778b99e12da0ed42de11464a71e637602

Parents:

686f468cd2868ccd3c847dc0cd0b1417fc7fb0e1

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-05-11 19:18:28+02:00

git-committer:

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

Message:

add: nChineseRemainder/idChineseRemainder

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (1 diff)
• polys/clapsing.cc (modified) (1 diff)
• polys/clapsing.h (modified) (1 diff)
• polys/simpleideals.cc (modified) (5 diffs)

libpolys/coeffs/coeffs.h

@@ -281 +281 @@
 static inline BOOLEAN n_GreaterZero(number n, const coeffs r)
 { assume(r != NULL); assume(r->cfGreaterZero!=NULL); return r->cfGreaterZero(n,r); }
-// cfGreater?
+static inline BOOLEAN n_Greater(number a, number b, const coeffs r)
+{ assume(r != NULL); assume(r->cfGreater!=NULL); return r->cfGreater(a,b,r); }
 
 #ifdef HAVE_RINGS

libpolys/polys/clapsing.cc

@@ -1356 +1356 @@
 #endif
 #endif
+
+number   nChineseRemainder(number *x, number *q,int rl, const coeffs r)
+// elemenst in the array are x[0..(rl-1)], q[0..(rl-1)]
+{
+#ifdef HAVE_FACTORY
+  if (r->type!=n_Q)
+  { Werror("nChineseRemainder only for integers"); return NULL; }
+  setCharacteristic( 0 ); // only in char 0
+  CFArray X(rl), Q(rl);
+  int i;
+  for(i=rl-1;i>=0;i--)
+  {
+    X[i]=r->convSingNFactoryN(x[i],FALSE,r); // may be larger MAX_INT
+    Q[i]=r->convSingNFactoryN(q[i],FALSE,r); // may be larger MAX_INT
+  }
+  CanonicalForm xnew,qnew;
+  chineseRemainder(X,Q,xnew,qnew);
+  number n=r->convFactoryNSingN(xnew,r);
+  number p=r->convFactoryNSingN(qnew,r);
+  number p2=n_IntDiv(p,n_Init(2, r),r);
+  if (n_Greater(n,p2,r))
+  {
+     number n2=n_Sub(n,p,r);
+     n_Delete(&n,r);
+     n=n2;
+  }
+  n_Delete(&p,r);
+  n_Delete(&p2,r);
+  return n;
+#else
+  WerrorS("not implemented");
+  return n_Init(0,r);
+#endif
+}

libpolys/polys/clapsing.h

@@ -62 +62 @@
 */
 
-number   nlChineseRemainder(number *x, number *q,int rl);
+number   nChineseRemainder(number *x, number *q,int rl, const coeffs r);
 
 #endif /* INCL_FACTORYSING_H */

libpolys/polys/simpleideals.cc

@@ -24 +24 @@
 #include "simpleideals.h"
 #include "sbuckets.h"
+#include "clapsing.h"
 
 omBin sip_sideal_bin = omGetSpecBin(sizeof(sip_sideal));
@@ -1698 +1699 @@
 */
 #ifdef HAVE_FACTORY
-#if 0
 ideal id_ChineseRemainder(ideal *xx, number *q, int rl, const ring R)
 {
@@ -1736 +1736 @@
       }
        
-      number n=nlChineseRemainder(x,q,rl); // kernel/clapconv.cc
+      number n=nChineseRemainder(x,q,rl, R->cf);
 
       for(j=rl-1;j>=0;j--)
@@ -1742 +1742 @@
         x[j]=NULL; // nlInit(0...) takes no memory
       }
-      if (nlIsZero(n, R->cf)) p_Delete(&h, R);
+      if (n_IsZero(n, R->cf)) p_Delete(&h, R);
       else
       {
@@ -1757 +1757 @@
   return result;
 }
-#endif
 #endif