Changeset 8d5f05 in git

Timestamp:

Jun 11, 2014, 7:47:46 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

38a53c048e362151c5c6f95afd4ff65bb32f577c

Parents:

8ddc7cdebf2fd739ad88aa6464fcf904707cd2f1

Message:

removed n_IntDiv/cfIntDiv etc.

Files:

• kernel/fast_mult.cc (modified) (1 diff)
• libpolys/coeffs/OPAE.cc (modified) (2 diffs)
• libpolys/coeffs/OPAE.h (modified) (1 diff)
• libpolys/coeffs/OPAEQ.cc (modified) (2 diffs)
• libpolys/coeffs/OPAEQ.h (modified) (1 diff)
• libpolys/coeffs/OPAEp.cc (modified) (2 diffs)
• libpolys/coeffs/OPAEp.h (modified) (1 diff)
• libpolys/coeffs/README.coeffs (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (4 diffs)
• libpolys/coeffs/ffields.cc (modified) (1 diff)
• libpolys/coeffs/gnumpc.cc (modified) (1 diff)
• libpolys/coeffs/longrat.cc (modified) (18 diffs)
• libpolys/coeffs/numbers.cc (modified) (2 diffs)
• libpolys/coeffs/rintegers.cc (modified) (2 diffs)
• libpolys/coeffs/rintegers.h (modified) (1 diff)
• libpolys/coeffs/rmodulo2m.cc (modified) (1 diff)
• libpolys/coeffs/rmodulon.cc (modified) (1 diff)
• libpolys/polys/coeffrings.h (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (4 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (4 diffs)
• libpolys/polys/ext_fields/transext.h (modified) (1 diff)

kernel/fast_mult.cc

@@ -546 +546 @@
         number i_number=n_Init(i,r->cf);
         old=new_coef;
-        new_coef=n_IntDiv(new_coef,i_number,r->cf);
+        new_coef=n_Div(new_coef,i_number,r->cf);
+        n_Normalize(new_coef,r->cf);
         n_Delete(&old,r->cf);
         n_Delete(&i_number,r->cf);

libpolys/coeffs/OPAE.cc

@@ -70 +70 @@
 
 
-number  nAEIntDiv(number a, number b, const coeffs)
-{
-
-    int_poly* f=reinterpret_cast<int_poly*> (a);
-    mpz_t* i= reinterpret_cast<mpz_t*> (b);
-    int_poly *res=new int_poly;
-    res->poly_set(*f);
-    res->poly_scalar_div_to(*i);
-    return (number) res;
-}
-
 number  nAEIntMod(number a, number, const coeffs)
 {
@@ -317 +306 @@
     r->cfAdd   = nAEAdd;
     r->cfDiv   = nAEDiv;
-    r->cfIntDiv= nAEIntDiv;
     r->cfIntMod= nAEIntMod;
     r->cfExactDiv= nAEExactDiv;

libpolys/coeffs/OPAE.h

@@ -14 +14 @@
 number  nAEAdd         (number a, number b, const coeffs r);
 number  nAEDiv         (number a, number b, const coeffs r);
-number  nAEIntDiv      (number a, number b, const coeffs r); //Hir wollte wir was gucken
 number  nAEIntMod      (number a, number b, const coeffs r);// Hir wollte wir was gucken
 number  nAEExactDiv    (number a, number b, const coeffs r);

libpolys/coeffs/OPAEQ.cc

@@ -72 +72 @@
 
 
-number  nAEQIntDiv(number a, number b, const coeffs)
-{
-
-    Q_poly* f=reinterpret_cast<Q_poly*> (a);
-    mpz_t* i= reinterpret_cast<mpz_t*> (b);
-    Q_poly *res=new Q_poly;
-    res->Q_poly_set(*f);
-    res->Q_poly_scalar_div_to(*i);
-    return (number) res;
-}
-
 number  nAEQIntMod(number a, number, const coeffs)
 {
@@ -310 +299 @@
     r->cfAdd   = nAEQAdd;
     r->cfDiv   = nAEQDiv;
-    r->cfIntDiv= nAEQIntDiv;
     r->cfIntMod= nAEQIntMod;
     r->cfExactDiv= nAEQExactDiv;

libpolys/coeffs/OPAEQ.h

@@ -14 +14 @@
 number  nAEQAdd         (number a, number b, const coeffs r);
 number  nAEQDiv         (number a, number b, const coeffs r);
-number  nAEQIntDiv      (number a, number b, const coeffs r); //Hir wollte wir was gucken
 number  nAEQIntMod      (number a, number b, const coeffs r);// Hir wollte wir was gucken
 number  nAEQExactDiv    (number a, number b, const coeffs r);

libpolys/coeffs/OPAEp.cc

@@ -72 +72 @@
 
 
-number  nAEpIntDiv(number a, number b, const coeffs)
-{
-
-    p_poly* f=reinterpret_cast<p_poly*> (a);
-    mpz_t* i= reinterpret_cast<mpz_t*> (b);
-    p_poly *res=new p_poly;
-    res->p_poly_set(*f);
-    res->p_poly_scalar_div_to(*i);
-    return (number) res;
-}
-
 number  nAEpIntMod(number a, number, const coeffs)
 {
@@ -339 +328 @@
     r->cfAdd   = nAEpAdd;
     r->cfDiv   = nAEpDiv;
-    r->cfIntDiv= nAEpIntDiv;
     r->cfIntMod= nAEpIntMod;
     r->cfExactDiv= nAEpExactDiv;

libpolys/coeffs/OPAEp.h

@@ -14 +14 @@
 number  nAEpAdd         (number a, number b, const coeffs r);
 number  nAEpDiv         (number a, number b, const coeffs r);
-number  nAEpIntDiv      (number a, number b, const coeffs r); //Hir wollte wir was gucken
 number  nAEpIntMod      (number a, number b, const coeffs r);// Hir wollte wir was gucken
 number  nAEpExactDiv    (number a, number b, const coeffs r);

libpolys/coeffs/README.coeffs

@@ -37 +37 @@
 -cfKillChar: if additional initializations have to be undone (data, etc)
 -cfSetChar: if additional initializations to use numbers from this coeffs is needed (should not be needed)
--cfIntDiv, cfIntMod: if the ring has a meaningful Euclidean structure
+-cfIntMod: if the ring has a meaningful Euclidean structure
 -cfGcd, cfExtGcd,cfXExtGcd,cfEucNorm: if the ring (or a subring)  has a meaningful Euclidean structure
 -cfAnn: in a principal ideal ring (with zero divisors)

libpolys/coeffs/coeffs.h

@@ -23 +23 @@
 {
   n_unknown=0,
-  n_Zp, /**< \F{p < ?} */
+  n_Zp, /**< \F{p < 2^31} */
   n_Q,  /**< rational (GMP) numbers */
   n_R,  /**< single prescision (6,6) real numbers */
-  n_GF, /**< \GF{p^n < 32001?} */
-  n_long_R, /**< real (GMP) numbers */
+  n_GF, /**< \GF{p^n < 2^16} */
+  n_long_R, /**< real floating point (GMP) numbers */
   n_algExt,  /**< used for all algebraic extensions, i.e.,
                 the top-most extension in an extension tower
@@ -34 +34 @@
                   the top-most extension in an extension tower
                   is transcendental */
-  n_long_C, /**< complex (GMP) numbers */
+  n_long_C, /**< complex floating point (GMP) numbers */
   n_Z, /**< only used if HAVE_RINGS is defined: ? */
   n_Zn, /**< only used if HAVE_RINGS is defined: ? */
@@ -140 +140 @@
    //   cfExactDiv does an exact division, but no error checking
    //   (I'm not sure I understant and even less that this makes sense)
-   numberfunc cfMult, cfSub ,cfAdd ,cfDiv, cfIntDiv, cfIntMod, cfExactDiv;
+   numberfunc cfMult, cfSub ,cfAdd ,cfDiv, cfIntMod, cfExactDiv;
 
    /// init with an integer
@@ -619 +619 @@
 { assume(r != NULL); assume(r->cfDiv!=NULL); return r->cfDiv(a,b,r); }
 
-static inline number n_IntDiv(number a, number b, const coeffs r)
-{ assume(r != NULL); assume(r->cfIntDiv!=NULL); return r->cfIntDiv(a,b,r); }
-
 /// for r a field, return n_Init(0,r)
 /// otherwise: n_Div(a,b,r)*b+n_IntMod(a,b,r)==a

libpolys/coeffs/ffields.cc

@@ -841 +841 @@
   r->cfAdd   = nfAdd;
   r->cfDiv   = nfDiv;
-  r->cfIntDiv= nfDiv;
   //r->cfIntMod= ndIntMod;
   r->cfExactDiv= nfDiv;

libpolys/coeffs/gnumpc.cc

@@ -530 +530 @@
   r->cfAdd   = nlAdd;
   r->cfDiv   = nlDiv;
-  r->cfIntDiv= nlIntDiv;
   r->cfIntMod= nlIntMod;
   r->cfExactDiv= nlExactDiv;

libpolys/coeffs/longrat.cc

@@ -85 +85 @@
 #define MPZ_EXACTDIV(A,B,C) mpz_divexact((A),(B),(C))
 
-/// Our Type!
-static const n_coeffType ID = n_Q;
-
 void    _nlDelete_NoImm(number *a);
 
@@ -120 +117 @@
 static number nlMapP(number from, const coeffs src, const coeffs dst)
 {
-  assume( getCoeffType(dst) == ID );
   assume( getCoeffType(src) == n_Zp );
 
@@ -339 +335 @@
 static number nlMapR(number from, const coeffs src, const coeffs dst)
 {
-  assume( getCoeffType(dst) == ID );
   assume( getCoeffType(src) == n_R );
 
@@ -370 +365 @@
 static number nlMapLongR(number from, const coeffs src, const coeffs dst)
 {
-  assume( getCoeffType(dst) == ID );
   assume( getCoeffType(src) == n_long_R );
 
@@ -1238 +1232 @@
 number nlModP(number q, const coeffs Q, const coeffs Zp)
 {
-  assume( getCoeffType(Q) == ID );
-
   const int p = n_GetChar(Zp);
   assume( p > 0 );
@@ -1251 +1243 @@
   {
     long i = SR_TO_INT(q);
-    if (i<0L)
-      return n_Init( static_cast<int>( P - ((-i)%P) ), Zp);
-    else
-      return n_Init( static_cast<int>( i % P ), Zp );
+    return n_Init( i, Zp );
   }
 
@@ -1260 +1249 @@
 
   // numerator modulo char. should fit into int
-  number z = n_Init( static_cast<int>(mpz_fdiv_ui(q->z, PP)), Zp );
+  number z = n_Init( static_cast<long>(mpz_fdiv_ui(q->z, PP)), Zp );
 
   // denominator != 1?
@@ -1266 +1255 @@
   {
     // denominator modulo char. should fit into int
-    number n = n_Init( static_cast<int>(mpz_fdiv_ui(q->n, PP)), Zp );
+    number n = n_Init( static_cast<long>(mpz_fdiv_ui(q->n, PP)), Zp );
 
     number res = n_Div( z, n, Zp );
@@ -2110 +2099 @@
 number nlCopyMap(number a, const coeffs src, const coeffs dst)
 {
-  assume( getCoeffType(dst) == ID );
-  assume( getCoeffType(src) == ID );
   if ((SR_HDL(a) & SR_INT)||(a==NULL))
   {
@@ -2121 +2108 @@
 nMapFunc nlSetMap(const coeffs src, const coeffs dst)
 {
-  assume( getCoeffType(dst) == ID );
-//  assume( getCoeffType(src) == ID );
-
   if (nCoeff_is_Q(src))
   {
@@ -2441 +2425 @@
 static void nlMPZ(mpz_t m, number &n, const coeffs r)
 {
-  assume( getCoeffType(r) == ID );
-
   nlTest(n, r);
   nlNormalize(n, r);
@@ -2661 +2643 @@
 {
   assume(cf != NULL);
-  assume(getCoeffType(cf) == ID);
 
   numberCollectionEnumerator.Reset();
@@ -2667 +2648 @@
   if( !numberCollectionEnumerator.MoveNext() ) // empty zero polynomial?
   {
-    c = n_Init(1, cf);
+    c = nlInit(1, cf);
     return;
   }
@@ -2753 +2734 @@
 {
   assume(cf != NULL);
-  assume(getCoeffType(cf) == ID);
 
   numberCollectionEnumerator.Reset();
@@ -2759 +2739 @@
   if( !numberCollectionEnumerator.MoveNext() ) // empty zero polynomial?
   {
-    c = n_Init(1, cf);
+    c = nlInit(1, cf);
 //    assume( n_GreaterZero(c, cf) );
     return;
@@ -2840 +2820 @@
   {
     number &n = numberCollectionEnumerator.Current();
-    n_InpMult(n, cand, cf);
+    nlInpMult(n, cand, cf);
   }
 
@@ -2979 +2959 @@
   r->is_domain=TRUE;
 
-  assume( getCoeffType(r) == ID );
   //const int ch = (int)(long)(p);
 
@@ -2994 +2973 @@
   if (p==NULL) r->cfDiv   = nlDiv;
   else         r->cfDiv   = nlIntDiv;
-  r->cfIntDiv= nlIntDiv;
   r->cfIntMod= nlIntMod;
   r->cfExactDiv= nlExactDiv;

libpolys/coeffs/numbers.cc

@@ -382 +382 @@
     // post init settings:
     if (n->cfRePart==NULL) n->cfRePart=n->cfCopy;
-    if (n->cfIntDiv==NULL) n->cfIntDiv=n->cfDiv;
     if (n->cfExactDiv==NULL) n->cfExactDiv=n->cfDiv;
     
@@ -399 +398 @@
     assume(n->cfAdd!=NULL);
     assume(n->cfDiv!=NULL);
-    assume(n->cfIntDiv!=NULL);
     assume(n->cfIntMod!=NULL);
     assume(n->cfExactDiv!=NULL);

libpolys/coeffs/rintegers.cc

@@ -224 +224 @@
 }
 
-number nrzIntDiv (number a,number b, const coeffs)
+number nrzExactDiv (number a,number b, const coeffs)
 {
   int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
@@ -416 +416 @@
   r->cfAdd   = nrzAdd;
   r->cfDiv   = nrzDiv;
-  r->cfIntDiv= nrzDiv;
   r->cfIntMod= nrzIntMod;
-  r->cfExactDiv= nrzDiv;
+  r->cfExactDiv= nrzExactDiv;
   r->cfInit = nrzInit;
   r->cfSize  = nrzSize;

libpolys/coeffs/rintegers.h

@@ -30 +30 @@
 number  nrzGetUnit     (number a, const coeffs r);
 number  nrzDiv         (number a, number b, const coeffs r);
-number  nrzIntDiv      (number a, number b, const coeffs r);
+number  nrzExactDiv    (number a, number b, const coeffs r);
 number  nrzIntMod      (number a, number b, const coeffs r);
 number  nrzNeg         (number c, const coeffs r);

libpolys/coeffs/rmodulo2m.cc

@@ -126 +126 @@
   r->cfMult        = nr2mMult;
   r->cfDiv         = nr2mDiv;
-  r->cfIntDiv      = nr2mIntDiv;
   r->cfAnn         = nr2mAnn;
   r->cfIntMod      = nr2mMod;

libpolys/coeffs/rmodulon.cc

@@ -133 +133 @@
   r->cfMult        = nrnMult;
   r->cfDiv         = nrnDiv;
-  r->cfIntDiv      = nrnIntDiv;
   r->cfAnn         = nrnAnn;
   r->cfIntMod      = nrnMod;

libpolys/polys/coeffrings.h

@@ -36 +36 @@
 static inline number n_Add(number a, number b, const ring r){ return n_Add(a, b, r->cf);}
 static inline number n_Div(number a, number b, const ring r){ return n_Div(a,b, r->cf);}
-static inline number n_IntDiv(number a, number b, const ring r){ return n_IntDiv(a,b, r->cf);}
 static inline number n_ExactDiv(number a, number b, const ring r){ return n_ExactDiv(a,b, r->cf);}
 static inline number n_Gcd(number a, number b, const ring r){ return n_Gcd(a,b, r->cf);}

libpolys/polys/ext_fields/algext.cc

@@ -1474 +1474 @@
   cf->nCoeffIsEqual  = naCoeffIsEqual;
   cf->cfInvers       = naInvers;
-  cf->cfIntDiv       = naDiv; // ???
   cf->convFactoryNSingN=naConvFactoryNSingN;
   cf->convSingNFactoryN=naConvSingNFactoryN;
@@ -1520 +1519 @@
 }
 
+void npolyPower(number a, int exp, number *b, const coeffs cf)
+{
+  naTest(a);
+
+  /* special cases first */
+  if (a == NULL)
+  {
+    if (exp >= 0) *b = NULL;
+    else          WerrorS(nDivBy0);
+    return;
+  }
+  else if (exp ==  0) { *b = naInit(1, cf); return; }
+  else if (exp ==  1) { *b = naCopy(a, cf); return; }
+  else if (exp == -1) { *b = naInvers(a, cf); return; }
+
+  int expAbs = exp; if (expAbs < 0) expAbs = -expAbs;
+
+  /* now compute a^expAbs */
+  poly pow; poly aAsPoly = (poly)a;
+  if (expAbs <= 7)
+  {
+    pow = p_Copy(aAsPoly, naRing);
+    for (int i = 2; i <= expAbs; i++)
+    {
+      pow = p_Mult_q(pow, p_Copy(aAsPoly, naRing), naRing);
+    }
+  }
+  else
+  {
+    pow = p_ISet(1, naRing);
+    poly factor = p_Copy(aAsPoly, naRing);
+    while (expAbs != 0)
+    {
+      if (expAbs & 1)
+      {
+        pow = p_Mult_q(pow, p_Copy(factor, naRing), naRing);
+      }
+      expAbs = expAbs / 2;
+      if (expAbs != 0)
+      {
+        factor = p_Mult_q(factor, p_Copy(factor, naRing), naRing);
+      }
+    }
+    p_Delete(&factor, naRing);
+  }
+
+  /* invert if original exponent was negative */
+  number n = (number)pow;
+  if (exp < 0)
+  {
+    number m = npolyInvers(n, cf);
+    naDelete(&n, cf);
+    n = m;
+  }
+  *b = n;
+}
+
 number npolyDiv(number a, number b, const coeffs cf)
 {
@@ -1549 +1605 @@
      directly accessible in cf: */
   cf->ch = R->cf->ch;
+  cf->is_field=FALSE;
+  cf->is_domain=TRUE;
 
   cf->cfCoeffString = naCoeffString;
@@ -1595 +1653 @@
   cf->nCoeffIsEqual  = naCoeffIsEqual;
   cf->cfInvers       = npolyInvers;
-  cf->cfIntDiv       = npolyDiv;
   cf->convFactoryNSingN=naConvFactoryNSingN;
   cf->convSingNFactoryN=naConvSingNFactoryN;

libpolys/polys/ext_fields/transext.cc

@@ -130 +130 @@
 void     ntDelete(number * a, const coeffs cf);
 void     ntCoeffWrite(const coeffs cf, BOOLEAN details);
-number   ntIntDiv(number a, number b, const coeffs cf);
 const char * ntRead(const char *s, number *a, const coeffs cf);
 static BOOLEAN ntCoeffIsEqual(const coeffs cf, n_coeffType n, void * param);
@@ -1197 +1196 @@
       {
         c = p_GetCoeff(p, ntRing);
-        tmp = n_Gcd(c, gcdOfCoefficients, ntCoeffs);
+        tmp = nlGcd(c, gcdOfCoefficients, ntCoeffs);
         n_Delete(&gcdOfCoefficients, ntCoeffs);
         gcdOfCoefficients = tmp;
@@ -1206 +1205 @@
       {
         c = p_GetCoeff(p, ntRing);
-        tmp = n_Gcd(c, gcdOfCoefficients, ntCoeffs);
+        tmp = nlGcd(c, gcdOfCoefficients, ntCoeffs);
         n_Delete(&gcdOfCoefficients, ntCoeffs);
         gcdOfCoefficients = tmp;
@@ -2468 +2467 @@
   cf->nCoeffIsEqual  = ntCoeffIsEqual;
   cf->cfInvers       = ntInvers;
-  cf->cfIntDiv       = ntDiv;
   cf->cfKillChar     = ntKillChar;
 

libpolys/polys/ext_fields/transext.h

@@ -127 +127 @@
 void     ntDelete(number * a, const coeffs cf);
 void     ntCoeffWrite(const coeffs cf, BOOLEAN details);
-number   ntIntDiv(number a, number b, const coeffs cf);
 const char * ntRead(const char *s, number *a, const coeffs cf);
 static BOOLEAN ntCoeffIsEqual(const coeffs cf, n_coeffType n, void * param);