Changeset e5c9e5 in git for libpolys/polys/monomials/p_polys.cc

Timestamp:

Mar 5, 2013, 4:43:58 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '1d362c315e551a5b527ab0759f8839cf0e94f3a5')

Children:

803cb2d20d4037b513adf020767d48f6893fc9a2

Parents:

161e20729b9213f0aaa51ebeacdbd63260916ff6

Message:

fix: normalization for trans. ext.

File:

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

libpolys/polys/monomials/p_polys.cc

@@ -2061 +2061 @@
     assume( pNext(ph) != NULL );
 #if CLEARENUMERATORS
-    if( nCoeff_is_Q(r->cf) || nCoeff_is_Q_a(r->cf) )
+    if( nCoeff_is_Q(r->cf) )
     {
       // experimentall (recursive enumerator treatment) of alg. Ext!
@@ -2111 +2111 @@
         //  StringSetS("** div0:");nWrite(pGetCoeff(p));StringAppendS("/");
         //  nWrite(h);StringAppendS("=");nWrite(d);StringAppendS(" int:");
-        //  nWrite(tmp);Print(StringEndS("\n")); // NOTE/TODO: use StringAppendS("\n"); omFree(s); 
+        //  nWrite(tmp);Print(StringEndS("\n")); // NOTE/TODO: use StringAppendS("\n"); omFree(s);
         //}
         //nDelete(&tmp);
@@ -2424 +2424 @@
         //  StringSetS("** div0:");nWrite(pGetCoeff(p));StringAppendS("/");
         //  nWrite(h);StringAppendS("=");nWrite(d);StringAppendS(" int:");
-        //  nWrite(tmp);Print(StringEndS("\n")); // NOTE/TODO: use StringAppendS("\n"); omFree(s); 
+        //  nWrite(tmp);Print(StringEndS("\n")); // NOTE/TODO: use StringAppendS("\n"); omFree(s);
         //}
         //nDelete(&tmp);
@@ -2445 +2445 @@
 /* ---------------------------------------------------------------------------*/
 /* cleardenom suff                                                           */
-poly p_Cleardenom(poly ph, const ring r)
-{
-  if( ph == NULL )
+poly p_Cleardenom(poly p, const ring r)
+{
+  if( p == NULL )
     return NULL;
 
@@ -2455 +2455 @@
   if( 0 )
   {
-    CPolyCoeffsEnumerator itr(ph);
+    CPolyCoeffsEnumerator itr(p);
 
     n_ClearDenominators(itr, C);
@@ -2461 +2461 @@
     n_ClearContent(itr, C); // divide out the content
 
-    p_Test(ph, r); n_Test(pGetCoeff(ph), C);
-    assume(n_GreaterZero(pGetCoeff(ph), C)); // ??
-//    if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
-
-    return ph;
-  }
-#endif
-
-  poly start=ph;
+    p_Test(p, r); n_Test(pGetCoeff(p), C);
+    assume(n_GreaterZero(pGetCoeff(p), C)); // ??
+//    if(!n_GreaterZero(pGetCoeff(p),C)) p = p_Neg(p,r);
+
+    return p;
+  }
+#endif
+
+  poly start=p;
 
   number d, h;
-  poly p;
 
 #ifdef HAVE_RINGS
   if (rField_is_Ring(r))
   {
-    p_Content(ph,r);
-    assume( n_GreaterZero(pGetCoeff(ph),C) );
-    if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
+    p_Content(p,r);
+    assume( n_GreaterZero(pGetCoeff(p),C) );
+    if(!n_GreaterZero(pGetCoeff(p),C)) p = p_Neg(p,r);
     return start;
   }
@@ -2486 +2485 @@
   if (rField_is_Zp(r) && TEST_OPT_INTSTRATEGY)
   {
-    if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
+    if(!n_GreaterZero(pGetCoeff(p),C)) p = p_Neg(p,r);
     return start;
   }
-  p = ph;
 
   assume(p != NULL);
@@ -2511 +2509 @@
       p_SetCoeff(p,n_Init(1,r->cf),r);
 
-    assume( n_GreaterZero(pGetCoeff(ph),C) );
-    if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
+    assume( n_GreaterZero(pGetCoeff(p),C) );
+    if(!n_GreaterZero(pGetCoeff(p),C)) p = p_Neg(p,r);
 
     return start;
@@ -2521 +2519 @@
 #if 0 && CLEARENUMERATORS
 //CF: does not seem to work that well..
-  
+
   if( nCoeff_is_Q(C) || nCoeff_is_Q_a(C) )
   {
-    CPolyCoeffsEnumerator itr(ph);
+    CPolyCoeffsEnumerator itr(p);
 
     n_ClearDenominators(itr, C);
@@ -2530 +2528 @@
     n_ClearContent(itr, C); // divide out the content
 
-    p_Test(ph, r); n_Test(pGetCoeff(ph), C);
-    assume(n_GreaterZero(pGetCoeff(ph), C)); // ??
-//    if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
+    p_Test(p, r); n_Test(pGetCoeff(p), C);
+    assume(n_GreaterZero(pGetCoeff(p), C)); // ??
+//    if(!n_GreaterZero(pGetCoeff(p),C)) p = p_Neg(p,r);
 
     return start;
@@ -2552 +2550 @@
     if(!n_IsOne(h,r->cf))
     {
-      p = ph;
+      p = start;
       while (p!=NULL)
       {
@@ -2572 +2570 @@
       }
       n_Delete(&h,r->cf);
-      if (n_GetChar(r->cf)==1)
-      {
-        loop
-        {
-          h = n_Init(1,r->cf);
-          p=ph;
-          while (p!=NULL)
-          {
-            d=n_Lcm(h,pGetCoeff(p),r->cf);
-            n_Delete(&h,r->cf);
-            h=d;
-            pIter(p);
-          }
-          /* contains the 1/lcm of all denominators */
-          if(!n_IsOne(h,r->cf))
-          {
-            p = ph;
-            while (p!=NULL)
-            {
-              /* should be:
-              * number hh;
-              * nGetDenom(p->coef,&hh);
-              * nMult(&h,&hh,&d);
-              * nNormalize(d);
-              * nDelete(&hh);
-              * nMult(d,p->coef,&hh);
-              * nDelete(&d);
-              * nDelete(&(p->coef));
-              * p->coef =hh;
-              */
-              d=n_Mult(h,pGetCoeff(p),r->cf);
-              n_Normalize(d,r->cf);
-              p_SetCoeff(p,d,r);
-              pIter(p);
-            }
-            n_Delete(&h,r->cf);
-          }
-          else
-          {
-            n_Delete(&h,r->cf);
-            break;
-          }
-        }
-      }
     }
     if (h!=NULL) n_Delete(&h,r->cf);
-
-    p_Content(ph,r);
+    p=start;
+
+    p_Content(p,r);
 #ifdef HAVE_RATGRING
     if (rIsRatGRing(r))
     {
       /* quick unit detection in the rational case is done in gr_nc_bba */
-      pContentRat(ph);
-      start=ph;
-    }
-#endif
-  }
-
-  assume( n_GreaterZero(pGetCoeff(ph),C) );
-  if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
+      pContentRat(p);
+      start=p;
+    }
+#endif
+  }
+
+  assume( n_GreaterZero(pGetCoeff(p),C) );
+  if(!n_GreaterZero(pGetCoeff(p),C)) p = p_Neg(p,r);
 
   return start;
@@ -2844 +2799 @@
     assume( n_GreaterZero(pGetCoeff(ph),C) );
     if(!n_GreaterZero(pGetCoeff(ph),C)) ph = p_Neg(ph,r);
-    return; 
+    return;
   }
   p = ph;