Changeset f0b01f in git

Timestamp:

May 19, 2011, 10:30:09 AM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

c28ecf1b368527a9ec9e39a3db43a7b75040f036

Parents:

c5484888248231a7dfff33b9693cdd46980c1448

git-author:

Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-05-19 10:30:09+02:00

git-committer:

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

Message:

alg ext fields: further development

Location:

libpolys/polys

Files:

• ext_fields/algext.cc (modified) (3 diffs)
• monomials/p_polys.cc (modified) (3 diffs)
• monomials/p_polys.h (modified) (2 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -74 +74 @@
 {
   assume(getCoeffType(cf) == naID);
-  #ifdef LDEBUG
-  omCheckAddr(&a);
-  #endif
+  if (a == NULL) return TRUE;
+  p_Test((poly)a, naRing); // cannot use omCheckAddrSize(a, sizeof(*a)) here
   assume(p_Deg((poly)a, naRing) <= p_Deg(naMinpoly, naRing));
   return TRUE;
@@ -430 +429 @@
   omCheckAddr(p); omCheckAddr(reducer);
   #endif
-  p_PolyDiv(&p, reducer, FALSE, naRing);
+  p_PolyDiv(p, reducer, FALSE, naRing);
 }
 
@@ -444 +443 @@
   naTest(a);
   if (a == NULL) WerrorS(nDivBy0);
-  poly *aFactor; poly *mFactor;
+  poly aFactor; poly mFactor;
   poly theGcd = p_ExtGcd((poly)a, aFactor, naMinpoly, mFactor, naRing);
   /* the gcd must be one since naMinpoly is irreducible and a != NULL: */
   assume(naIsOne((number)theGcd, cf));      
   p_Delete(&theGcd, naRing);
-  p_Delete(mFactor, naRing);
-  return (number)(*aFactor);
+  p_Delete(&mFactor, naRing);
+  return (number)(aFactor);
 }
 

libpolys/polys/monomials/p_polys.cc

@@ -1430 +1430 @@
 }
 
-/* assumes that *p and divisor are univariate polynomials in r,
+/* assumes that p and divisor are univariate polynomials in r,
    mentioning the same variable;
    assumes divisor != NULL;
-   *p may be NULL;
+   p may be NULL;
    assumes a global monomial ordering in r;
-   performs polynomial division of *p by divisor:
-     - afterwards *p contains the remainder of the division, i.e.,
-       *p_before = result * divisor + *p_afterwards;
+   performs polynomial division of p by divisor:
+     - afterwards p contains the remainder of the division, i.e.,
+       p_before = result * divisor + p_afterwards;
      - if needResult == TRUE, then the method computes and returns 'result',
        otherwise NULL is returned (This parametrization can be used when
        one is only interested in the remainder of the division. In this
-       case, the method will be faster.) */
-poly p_PolyDiv(poly * p, poly divisor, BOOLEAN needResult, ring r)
-{
+       case, the method will be slightly faster.)
+   leaves divisor unmodified */
+poly p_PolyDiv(poly &p, poly divisor, BOOLEAN needResult, ring r)
+{
+//printf("p_PolyDiv:\n");
   assume(divisor != NULL);
-  if (*p == NULL) return NULL;
+  if (p == NULL) return NULL;
   
   poly result = NULL;
-  number divisorLT = p_GetCoeff(divisor, r);
-  int divisorExp = p_GetExp(divisor, 1, r);
-  while (p_Deg(*p, r) > p_Deg(divisor, r))
-  {
-    /* determine t = LT(*p) / LT(divisor) */
+  number divisorLC = p_GetCoeff(divisor, r);
+  int divisorLE = p_GetExp(divisor, 1, r);
+//p_Write(p, r); p_Write(divisor, r);
+  while ((p != NULL) && (p_Deg(p, r) > p_Deg(divisor, r)))
+  {
+    /* determine t = LT(p) / LT(divisor) */
     poly t = p_ISet(1, r);
-    number c = n_Div(p_GetCoeff(*p, r), divisorLT, r->cf);
+    number c = n_Div(p_GetCoeff(p, r), divisorLC, r->cf);
     p_SetCoeff(t, c, r);
-    int e = p_GetExp(*p, 1, r) - divisorExp;
+    int e = p_GetExp(p, 1, r) - divisorLE;
     p_SetExp(t, 1, e, r);
     p_Setm(t, r);
-    result = p_Add_q(result, p_Copy(t, r), r);
-    *p = p_Add_q(*p, p_Neg(t, r), r);
-  }
-  n_Delete(&divisorLT, r->cf);
+//printf("t\n"); p_Write(t, r);
+    if (needResult) result = p_Add_q(result, p_Copy(t, r), r);
+//t = p_Mult_q(t, p_Copy(divisor, r), r); p_Write(t, r);
+//t = p_Neg(t, r); p_Write(t, r);
+//printf("p\n"); p_Write(p, r);
+//t = p_Add_q(p, t, r); p_Write(t, r);
+//p = t;
+    p = p_Add_q(p, p_Neg(p_Mult_q(t, p_Copy(divisor, r), r), r), r);
+//printf("EXECUTION STOPPED\n"); while (1) { };
+  }
+  n_Delete(&divisorLC, r->cf);
   return result;
 }
 
 /* see p_Gcd;
-   additional assumption: deg(*p) >= deg(*q);
-   must destroy *p and *q (unless one of them is returned) */
-poly p_GcdHelper(poly * p, poly * q, ring r)
-{
-  if (q == NULL) return *p;
+   additional assumption: deg(p) >= deg(q);
+   must destroy p and q (unless one of them is returned) */
+poly p_GcdHelper(poly &p, poly &q, ring r)
+{
+  if (q == NULL) return p;
   else
   {
-    p_PolyDiv(p, *q, FALSE, r);
+    p_PolyDiv(p, q, FALSE, r);
     return p_GcdHelper(q, p, r);
   }
@@ -1492 +1502 @@
   if (p_Deg(a, r) < p_Deg(b, r)) { a = q; b = p; }
   a = p_Copy(a, r); b = p_Copy(b, r);
-  return p_GcdHelper(&a, &b, r);
+  return p_GcdHelper(a, b, r);
 }
 
 /* see p_ExtGcd;
-   additional assumption: deg(*p) >= deg(*q);
-   must destroy *p and *q (unless one of them is returned) */
-poly p_ExtGcdHelper(poly * p, poly * pFactor, poly * q, poly * qFactor,
+   additional assumption: deg(p) >= deg(q);
+   must destroy p and q (unless one of them is returned) */
+poly p_ExtGcdHelper(poly &p, poly &pFactor, poly &q, poly &qFactor,
                     ring r)
 {
+//printf("p_ExtGcdHelper:\n");
   if (q == NULL)
   {
-    *qFactor = NULL; *pFactor = p_ISet(1, r); return *p;
+    qFactor = NULL; pFactor = p_ISet(1, r); return p;
   }
   else
   {
-    poly pDivQ = p_PolyDiv(p, *q, TRUE, r);
-    poly * ppFactor; poly * qqFactor;
+//p_Write(p, r); p_Write(q, r);
+    poly pDivQ = p_PolyDiv(p, q, TRUE, r);
+    poly ppFactor; poly qqFactor;
     poly theGcd = p_ExtGcdHelper(q, ppFactor, p, qqFactor, r);
     pFactor = qqFactor;
-    *qFactor = p_Add_q(*ppFactor,
-                       p_Neg(p_Mult_q(pDivQ, p_Copy(*qqFactor, r), r), r),
-                       r);
+    qFactor = p_Add_q(ppFactor,
+                      p_Neg(p_Mult_q(pDivQ, p_Copy(qqFactor, r), r), r),
+                      r);
     return theGcd;
   }
@@ -1523 +1535 @@
    assumes that not both p and q are NULL;
    returns the gcd of p and q;
-   moreover, afterwards *pFactor and *qFactor contain appropriate
-   factors such that gcd(p, q) = p * (*pFactor) + q * (*qFactor);
+   moreover, afterwards pFactor and qFactor contain appropriate
+   factors such that gcd(p, q) = p * pFactor + q * qFactor;
    leaves p and q unmodified */
-poly p_ExtGcd(poly p, poly * pFactor, poly q, poly * qFactor, ring r)
-{
-  assume((p != NULL) || (q != NULL));
-  
+poly p_ExtGcd(poly p, poly &pFactor, poly q, poly &qFactor, ring r)
+{
+//printf("p_ExtGcd:\n");
+//p_Write(p, r); p_Write(q, r);
+  assume((p != NULL) || (q != NULL));  
   poly a = p; poly b = q;
-  poly * aFactor = pFactor; poly * bFactor = qFactor; 
+  poly aFactor = pFactor; poly bFactor = qFactor; 
   if (p_Deg(a, r) < p_Deg(b, r))
   { a = q; b = p; aFactor = qFactor, bFactor = pFactor; }
   a = p_Copy(a, r); b = p_Copy(b, r);
-  return p_ExtGcdHelper(&a, aFactor, &b, bFactor, r);
+  return p_ExtGcdHelper(a, aFactor, b, bFactor, r);
 }
 

libpolys/polys/monomials/p_polys.h

@@ -1824 +1824 @@
 int       p_Weight(int c, const ring r);
 
-/* assumes that *p and divisor are univariate polynomials in r,
+/* assumes that p and divisor are univariate polynomials in r,
    mentioning the same variable;
    assumes divisor != NULL;
-   *p may be NULL;
+   p may be NULL;
    assumes a global monomial ordering in r;
-   performs polynomial division of *p by divisor:
-     - afterwards *p contains the remainder of the division, i.e.,
-       *p_before = result * divisor + *p_afterwards;
+   performs polynomial division of p by divisor:
+     - afterwards p contains the remainder of the division, i.e.,
+       p_before = result * divisor + p_afterwards;
      - if needResult == TRUE, then the method computes and returns 'result',
        otherwise NULL is returned (This parametrization can be used when
        one is only interested in the remainder of the division. In this
-       case, the method will be faster.) */
-poly      p_PolyDiv(poly *p, poly divisor, BOOLEAN needResult, ring r);
-
-/* assumes that p and q are univariate polynomials in r,
-   mentioning the same variable;
-   assumes a global monomial ordering in r;
-   assumes that not both p and q are NULL;
-   returns the gcd of p and q */
-poly      p_Gcd(poly p, poly q, ring r);
+       case, the method will be slightly faster.)
+   leaves divisor unmodified */
+poly      p_PolyDiv(poly &p, poly divisor, BOOLEAN needResult, ring r);
 
 /* assumes that p and q are univariate polynomials in r,
@@ -1850 +1844 @@
    assumes that not both p and q are NULL;
    returns the gcd of p and q;
-   moreover, afterwards *pFactor and *qFactor contain appropriate
-   factors such that gcd(p, q) = p * (*pFactor) + q * (*qFactor) */
-poly      p_ExtGcd(poly p, poly *pFactor, poly q, poly *qFactor, ring r);
+   leaves p and q unmodified */
+poly      p_Gcd(poly p, poly q, ring r);
+
+/* assumes that p and q are univariate polynomials in r,
+   mentioning the same variable;
+   assumes a global monomial ordering in r;
+   assumes that not both p and q are NULL;
+   returns the gcd of p and q;
+   moreover, afterwards pFactor and qFactor contain appropriate
+   factors such that gcd(p, q) = p * pFactor + q * qFactor;
+   leaves p and q unmodified */
+poly      p_ExtGcd(poly p, poly &pFactor, poly q, poly &qFactor, ring r);
 
 /* syszygy stuff */