Changeset 0fb5991 in git

Timestamp:

May 9, 2011, 12:44:46 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

abb478768b4e6470e8184a28c8fd2546f40af8de

Parents:

3b0ba67abd225a2bb2c09c675cfe3085aaf67f12

git-author:

Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-05-09 12:44:46+02:00

git-committer:

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

Message:

fixes so that libpoly builds without compiler errors in algext.cc (make check may be broken)

Location:

libpolys

Files:

• coeffs/longrat.h (modified) (1 diff)
• polys/ext_fields/algext.cc (modified) (22 diffs)
• polys/ext_fields/algext.h (modified) (1 diff)

libpolys/coeffs/longrat.h

@@ -84 +84 @@
 const char *   nlRead (const char *s, number *a, const coeffs r);
 void     nlWrite(number &a, const coeffs r);
-int      nlModP(number n, int p);
+int      nlModP(number n, int p, const coeffs r);
 int      nlSize(number n, const coeffs r);
 number   nlGetDenom(number &n, const coeffs r);

libpolys/polys/ext_fields/algext.cc

@@ -30 +30 @@
 #include <coeffs/coeffs.h>
 #include <coeffs/numbers.h>
+#include <coeffs/longrat.h>
 
 #include <polys/monomials/ring.h>
@@ -58 +59 @@
 number   naRePart(number a, const coeffs cf);
 number   naImPart(number a, const coeffs cf);
-number   naGetDenom(number a, const coeffs cf);
-number   naGetNumerator(number a, const coeffs cf);
+number   naGetDenom(number &a, const coeffs cf);
+number   naGetNumerator(number &a, const coeffs cf);
 number   naGcd(number a, number b, const coeffs cf);
 number   naLcm(number a, number b, const coeffs cf);
@@ -120 +121 @@
 }
 
-number naCopy(number &a, const coeffs cf)
+number naCopy(number a, const coeffs cf)
 {
   naTest(a);
   if (a == NULL) return NULL;
   return (number)p_Copy((poly)a, naRing);
+}
+
+number naGetNumerator(number &a, const coeffs cf)
+{
+  return naCopy(a, cf);
 }
 
@@ -221 +227 @@
   poly aPlusB = p_Add_q(p_Copy((poly)a, naRing),
                         p_Copy((poly)b, naRing), naRing);
-  definiteReduce(aPlusB, naMinpoly);
-  return (number)aMinusB;
+  definiteReduce(aPlusB, naMinpoly, cf);
+  return (number)aPlusB;
 }
 
@@ -230 +236 @@
   if (b == NULL) return naCopy(a, cf);
   poly minusB = p_Neg(p_Copy((poly)b, naRing), naRing);
-  if (a == NULL) return minusB;
+  if (a == NULL) return (number)minusB;
   poly aMinusB = p_Add_q(p_Copy((poly)a, naRing), minusB, naRing);
-  definiteReduce(aMinusB, naMinpoly);
+  definiteReduce(aMinusB, naMinpoly, cf);
   return (number)aMinusB;
 }
@@ -243 +249 @@
   poly aTimesB = p_Mult_q(p_Copy((poly)a, naRing),
                           p_Copy((poly)b, naRing), naRing);
-  definiteReduce(aTimesB, naMinpoly);
-  return (number)aMinusB;
+  definiteReduce(aTimesB, naMinpoly, cf);
+  return (number)aTimesB;
 }
 
@@ -254 +260 @@
   poly bInverse = (poly)naInvers(b, cf);
   poly aDivB = p_Mult_q(p_Copy((poly)a, naRing), bInverse, naRing);
-  definiteReduce(aDivB, naMinpoly);
-  return (number)aMinusB;
+  definiteReduce(aDivB, naMinpoly, cf);
+  return (number)aDivB;
 }
 
@@ -273 +279 @@
   if (a == NULL)
   {
-    if (exp >= 0) return NULL;
+    if (exp >= 0) *b = NULL;
     else          WerrorS(nDivBy0);
   }
-  else if (exp ==  0) return naInit(1, cf);
-  else if (exp ==  1) return naCopy(a, cf);
-  else if (exp == -1) return naInvers(a, cf);
+  else if (exp ==  0) *b = naInit(1, cf);
+  else if (exp ==  1) *b = naCopy(a, cf);
+  else if (exp == -1) *b = naInvers(a, cf);
   
   int expAbs = exp; if (expAbs < 0) expAbs = -expAbs;
@@ -312 +318 @@
       }
     }
-    p_Delete(factor, naRing);
+    p_Delete(&factor, naRing);
     definiteReduce(pow, naMinpoly, cf);
   }
@@ -378 +384 @@
      but the final division will take care of the necessary reduction */
   number theGcd = naGcd(a, b, cf);
-  return naDiv(product, theGcd);
+  return naDiv(theProduct, theGcd, cf);
 }
 
@@ -409 +415 @@
     noOfTerms++;
     int d = 0;
-    for (int i = 1; i <= rVar(r); i++) d += p_GetExp(aAsPoly, i, naRing);
+    for (int i = 1; i <= rVar(naRing); i++)
+      d += p_GetExp(aAsPoly, i, naRing);
     if (d > theDegree) theDegree = d;
     pIter(aAsPoly);
@@ -423 +430 @@
   omCheckAddr(p); omCheckAddr(reducer);
   #endif
-  p_PolyDiv(*p, reducer, FALSE, naRing);
+  p_PolyDiv(&p, reducer, FALSE, naRing);
 }
 
@@ -438 +445 @@
   if (a == NULL) WerrorS(nDivBy0);
   poly *aFactor; poly *mFactor;
-  poly theGcd = p_ExtGcd((poly)a, *aFactor, naMinpoly, *mFactor, naRing);
+  poly theGcd = p_ExtGcd((poly)a, aFactor, naMinpoly, mFactor, naRing);
   /* the gcd must be one since naMinpoly is irreducible and a != NULL: */
-  assume(naIsOne(theGcd, cf));      
-  pDelete(&theGcd, naRing);
-  pDelete(mFactor, naRing);
-  return aInverse = (number)(*aFactor);
+  assume(naIsOne((number)theGcd, cf));      
+  p_Delete(&theGcd, naRing);
+  p_Delete(mFactor, naRing);
+  return (number)(*aFactor);
 }
 
@@ -450 +457 @@
 {
   assume(src == dst->algring->cf);
-  poly result = p_Init(1, dst->algring);
-  p_SetCoeff(result, naCopy(a, src), dst->algRing);
+  poly result = p_One(dst->algring);
+  p_SetCoeff(result, naCopy(a, src), dst->algring);
   return (number)result;
 }
@@ -461 +468 @@
   int n = n_Int(a, src);
   number q = n_Init(n, dst->algring->cf);
-  poly result = p_Init(1, dst->algring);
-  p_SetCoeff(result, q, dst->algRing);
+  poly result = p_One(dst->algring);
+  p_SetCoeff(result, q, dst->algring);
   return (number)result;
 }
@@ -476 +483 @@
 number naMap0P(number a, const coeffs src, const coeffs dst)
 {
-  int p = rChar(dst);
+  int p = rChar(dst->algring);
   int n = nlModP(a, p, src);
   number q = n_Init(n, dst->algring->cf);
-  poly result = p_Init(1, dst->algring);
-  p_SetCoeff(result, q, dst->algRing);
+  poly result = p_One(dst->algring);
+  p_SetCoeff(result, q, dst->algring);
   return (number)result;
 }
@@ -488 +495 @@
 {
   assume(src == dst->algring->cf);
-  poly result = p_Init(1, dst->algring);
-  p_SetCoeff(result, naCopy(a, src), dst->algRing);
+  poly result = p_One(dst->algring);
+  p_SetCoeff(result, naCopy(a, src), dst->algring);
   return (number)result;
 }
@@ -499 +506 @@
   int n = n_Int(a, src);
   number q = n_Init(n, dst->algring->cf);
-  poly result = p_Init(1, dst->algring);
-  p_SetCoeff(result, q, dst->algRing);
+  poly result = p_One(dst->algring);
+  p_SetCoeff(result, q, dst->algring);
   return (number)result;
 }
@@ -507 +514 @@
 {
   /* dst->cf is expected to be an (algebraic) extension field */
-  assume(dst->type == n_Ext);
+  assume(dst->cf->type == n_Ext);
   
   if (rField_is_Q(src) && rField_is_Q_a(dst))
@@ -517 +524 @@
   if (rField_is_Q_a(src) && rField_is_Q_a(dst))
   {
-    if (strcmp(src->parameter[0], dst->parameter[0]) == 0)
+    if (strcmp(rParameter(src)[0], rParameter(dst)[0]) == 0)
       return naCopyMap;                                  /// Q(a)   --> Q(a)
     else
@@ -534 +541 @@
   if (rField_is_Zp_a(src) && rField_is_Zp_a(dst))
   {
-    if (strcmp(src->parameter[0], dst->parameter[0]) == 0)
+    if (strcmp(rParameter(src)[0], rParameter(dst)[0]) == 0)
       return naCopyMap;                                  /// Z/p(a) --> Z/p(a)
     else
@@ -583 +590 @@
   cf->cfSetMap       = naSetMap;
   cf->cfGetDenom     = naGetDenom;
-  cf->cfGetNumerator = naCopy;
+  cf->cfGetNumerator = naGetNumerator;
   cf->cfRePart       = naCopy;
   cf->cfImPart       = naImPart;

libpolys/polys/ext_fields/algext.h

@@ -64 +64 @@
 number   naRePart(number a, const coeffs cf);
 number   naImPart(number a, const coeffs cf);
-number   naGetDenom(number a, const coeffs cf);
-number   naGetNumerator(number a, const coeffs cf);
+number   naGetDenom(number &a, const coeffs cf);
+number   naGetNumerator(number &a, const coeffs cf);
 number   naGcd(number a, number b, const coeffs cf);
 number   naLcm(number a, number b, const coeffs cf);