Changeset de27d8 in git for libpolys/coeffs

Timestamp:

Feb 18, 2013, 7:27:17 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

7d1ce3ef53e17b72b36010a52fcfbdbde745a3e7afc974f80049f26666102bf7d90f3aa6c1dfd957

Parents:

77ed18101c07cdbb767d8703e5ea1d0f7c8b05f6

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-02-18 19:27:17+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-02-18 19:27:55+01:00

Message:

fix: intdiv/intmod/chinrem copied from master

Location:

libpolys/coeffs

Files:

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

libpolys/coeffs/coeffs.h

@@ -201 +201 @@
    /// chinese remainder
    /// returns X with X mod q[i]=x[i], i=0..rl-1
-   number  (*cfChineseRemainder)(number *x, number *q,int rl, const coeffs);
+   number  (*cfChineseRemainder)(number *x, number *q,int rl, BOOLEAN sym,const coeffs);
 
    /// degree for coeffcients: -1 for 0, 0 for "constants", ...
@@ -654 +654 @@
 }
 
-static inline number n_ChineseRemainder(number *a, number *b, int rl, const coeffs r)
-{
-  assume(r != NULL); assume(r->cfChineseRemainder != NULL); return r->cfChineseRemainder(a,b,rl,r);
+static inline number n_ChineseRemainderSym(number *a, number *b, int rl, BOOLEAN sym,const coeffs r)
+{
+  assume(r != NULL); assume(r->cfChineseRemainder != NULL); return r->cfChineseRemainder(a,b,rl,sym,r);
 }
 

libpolys/coeffs/longrat.cc

@@ -722 +722 @@
     long aa=SR_TO_INT(a);
     long bb=SR_TO_INT(b);
-    //return INT_TO_SR((aa-(aa%bb))/bb);
     return INT_TO_SR(aa/bb);
   }
@@ -760 +759 @@
     bb->debug=654324;
 #endif
-    FREE_RNUMBER(bb); // omFreeBin((void *)bb, rnumber_bin);
+    FREE_RNUMBER(bb);
   }
   u=nlShort3(u);
-  nlTest(u, r);
+  nlTest(u,r);
   return u;
 }
@@ -782 +781 @@
   if (SR_HDL(a) & SR_HDL(b) & SR_INT)
   {
-    //return INT_TO_SR(SR_TO_INT(a)%SR_TO_INT(b));
-    if ((long)a>0L)
-    {
-      if ((long)b>0L)
-        return INT_TO_SR(SR_TO_INT(a)%SR_TO_INT(b));
-      else
-        return INT_TO_SR(SR_TO_INT(a)%(-SR_TO_INT(b)));
-    }
-    else
-    {
-      if ((long)b>0L)
-      {
-        long i=(-SR_TO_INT(a))%SR_TO_INT(b);
-        if ( i != 0L ) i = (SR_TO_INT(b))-i;
-        return INT_TO_SR(i);
-      }
-      else
-      {
-        long i=(-SR_TO_INT(a))%(-SR_TO_INT(b));
-        if ( i != 0L ) i = (-SR_TO_INT(b))-i;
-        return INT_TO_SR(i);
-      }
-    }
+    LONG bb=SR_TO_INT(b);
+    LONG c=SR_TO_INT(a)%bb;
+    return INT_TO_SR(c);
   }
   if (SR_HDL(a) & SR_INT)
   {
-    /* a is a small and b is a large int: -> a or (a+b) or (a-b) */
-    if ((long)a<0L)
-    {
-      if (mpz_isNeg(b->z))
-        return nlSub(a,b,r);
-      /*else*/
-        return nlAdd(a,b,r);
-    }
-    /*else*/
-      return a;
-
     /* a is a small and b is a large int: -> a */
-    //return a;
+    return a;
   }
   number bb=NULL;
@@ -841 +809 @@
     bb->debug=654324;
 #endif
-    FREE_RNUMBER(bb); // omFreeBin((void *)bb, rnumber_bin);
+    FREE_RNUMBER(bb);
   }
   if (mpz_isNeg(u->z))
@@ -851 +819 @@
   }
   u=nlShort3(u);
-  nlTest(u, r);
+  nlTest(u,r);
   return u;
 }
@@ -2632 +2600 @@
 }
 
-number   nlChineseRemainder(number *x, number *q,int rl, const coeffs C)
+number   nlChineseRemainderSym(number *x, number *q,int rl, BOOLEAN sym, const coeffs CF)
 // elemenst in the array are x[0..(rl-1)], q[0..(rl-1)]
 {
 #ifdef HAVE_FACTORY
   setCharacteristic( 0 ); // only in char 0
+  Off(SW_RATIONAL);
   CFArray X(rl), Q(rl);
   int i;
   for(i=rl-1;i>=0;i--)
   {
-    X[i]=C->convSingNFactoryN(x[i],FALSE,C); // may be larger MAX_INT
-    Q[i]=C->convSingNFactoryN(q[i],FALSE,C); // may be larger MAX_INT
+    X[i]=CF->convSingNFactoryN(x[i],FALSE,CF); // may be larger MAX_INT
+    Q[i]=CF->convSingNFactoryN(q[i],FALSE,CF); // may be larger MAX_INT
   }
   CanonicalForm xnew,qnew;
   chineseRemainder(X,Q,xnew,qnew);
-  number n=C->convFactoryNSingN(xnew,C);
-  number p=C->convFactoryNSingN(qnew,C);
-  number p2=nlIntDiv(p,nlInit(2, C),C);
-  if (nlGreater(n,p2,C))
-  {
-     number n2=nlSub(n,p,C);
-     nlDelete(&n,C);
-     n=n2;
-  }
-  nlDelete(&p,C);
-  nlDelete(&p2,C);
+  number n=CF->convFactoryNSingN(xnew,CF);
+  if (sym)
+  {
+    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);
+       n=n2;
+    }
+    nlDelete(&p2,CF);
+    nlDelete(&p,CF);
+  }
   return n;
 #else
   WerrorS("not implemented");
-  return nlInit(0, C);
-#endif
+  return nlInit(0,CF);
+#endif
+}
+number   nlChineseRemainder(number *x, number *q,int rl, const coeffs C)
+{
+  return nlChineseRemainderSym(x,q,rl,TRUE,C);
 }
 
@@ -2875 +2851 @@
   r->cfInt  = nlInt;
 
-  r->cfChineseRemainder=nlChineseRemainder;
+  r->cfChineseRemainder=nlChineseRemainderSym;
   r->cfFarey=nlFarey;
   #ifdef HAVE_RINGS

libpolys/coeffs/numbers.cc

@@ -77 +77 @@
   return NULL;
 }
-number ndChineseRemainder(number *,number *,int,const coeffs r)
+number ndChineseRemainder(number *,number *,int,BOOLEAN,const coeffs r)
 {
   Werror("ChineseRemainder not implemented for (c=%d)",getCoeffType(r));