Changeset cfb500 in git for libpolys/polys/monomials

Timestamp:

May 20, 2011, 1:07:49 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

502f5f6f3100e91a41cf8b3762727582bcdcc2fa

Parents:

09ed7738e7d4dd96c01950a6f0736d8581f333d2

git-author:

Frank Seelisch <seelisch@mathematik.uni-kl.de>2011-05-20 13:07:49+02:00

git-committer:

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

Message:

ending tests for alg field ext impl (all tests ok)

File:

• libpolys/polys/monomials/p_polys.cc (modified) (7 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -1445 +1445 @@
 poly p_PolyDiv(poly &p, poly divisor, BOOLEAN needResult, ring r)
 {
-//printf("p_PolyDiv:\n");
   assume(divisor != NULL);
   if (p == NULL) return NULL;
@@ -1452 +1451 @@
   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)))
   {
@@ -1462 +1460 @@
     p_SetExp(t, 1, e, r);
     p_Setm(t, r);
-//printf("t\n");
-//p_Write(t, r);
     if (needResult) result = p_Add_q(result, p_Copy(t, r), r);
     p = p_Add_q(p, p_Neg(p_Mult_q(t, p_Copy(divisor, r), r), r), r);
-//printf("p\n");
-//p_Write(p, r);
   }
   return result;
@@ -1483 +1477 @@
   number lc = p_GetCoeff(p, r);
   if (n_IsOne(lc, r->cf)) return;
-
-  if( pNext(p) == NULL )
-  { 
-     p_SetCoeff(p, n_Init(1, r->cf), r); // will delete the leading coeff 1st!
-     return;
-  }
-   
-  // TODO: consider unsing 1xn_Inverse + n_Mult instead of multiple n_Div
-  p_SetCoeff0(p, n_Init(1, r->cf), r); // no coeff destruction!
-   
+  number lcInverse = n_Invers(lc, r->cf);
+  number n = n_Init(1, r->cf);
+  p_SetCoeff(p, n, r);   // destroys old leading coefficient!
   p = pIter(p);
-   
   while (p != NULL)
   {
-    number c = p_GetCoeff(p, r);
-    number n = n_Div(c, lc, r->cf);
-    n_Delete(&c, r->cf);
-    p_SetCoeff(p, n, r);
+    number n = n_Mult(p_GetCoeff(p, r), lcInverse, r->cf);
+    p_SetCoeff(p, n, r);   // destroys old leading coefficient!
     p = pIter(p);
   }
-  n_Delete(&lc, r->cf);
+  n_Delete(&lcInverse, r->cf);
   p = pp;
 }
@@ -1552 +1536 @@
     qFactor = NULL;
     pFactor = p_ISet(1, r);
-    number n = p_GetCoeff(pFactor, r);
-//printf("p_ExtGcdHelper0:\n");
-//p_Write(p, r);
     p_SetCoeff(pFactor, n_Invers(p_GetCoeff(p, r), r->cf), r);
-    n_Delete(&n, r->cf);
     p_Monic(p, r);
     return p;
@@ -1562 +1542 @@
   else
   {
-//printf("p_ExtGcdHelper1:\n");
-//p_Write(p, r); p_Write(q, r);
     poly pDivQ = p_PolyDiv(p, q, TRUE, r);
     poly ppFactor = NULL; poly qqFactor = NULL;
-//printf("p_ExtGcdHelper2:\n");
-//p_Write(p, r); p_Write(ppFactor, r);
-//p_Write(q, r); p_Write(qqFactor, r);
     poly theGcd = p_ExtGcdHelper(q, qqFactor, p, ppFactor, r);
-//printf("p_ExtGcdHelper3:\n");
-//p_Write(q, r); p_Write(qqFactor, r);
-//p_Write(p, r); p_Write(ppFactor, r);
-//p_Write(theGcd, r);
     pFactor = ppFactor;
     qFactor = p_Add_q(qqFactor,
                       p_Neg(p_Mult_q(pDivQ, p_Copy(ppFactor, r), r), r),
                       r);
-//printf("p_ExtGcdHelper4:\n");
-//p_Write(pFactor, r); p_Write(qFactor, r);
     return theGcd;
   }
@@ -1594 +1563 @@
 poly p_ExtGcd(poly p, poly &pFactor, poly q, poly &qFactor, ring r)
 {
-//printf("p_ExtGcd1:\n");
-//p_Write(p, r); p_Write(q, r);
   assume((p != NULL) || (q != NULL));  
   poly a = p; poly b = q; BOOLEAN aCorrespondsToP = TRUE;