Changeset 8d341e in git

Timestamp:

Sep 10, 2012, 2:31:22 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

fff61504bea4abfcad24fecfcec903e476caa188

Parents:

9952bd4644408a55960f0436312937dc4ea343e8

Message:

Switchable use of n_ClearContent&n_ClearDenominators for p_Content&p_Cleardenom (/Q!)

chg: p_Cleardenom(_n) should call clear content after clearing denominators, i.e. n_ClearContent is to be called after n_ClearDenominators
chg: old handling of a single term: clear the coeff.
add: assume positive leading coeff for results of p_Content&p_Cleardenom


NOTE: CLEARENUMERATORS is false here!

File:

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

libpolys/polys/monomials/p_polys.cc

@@ -2023 +2023 @@
 static number p_InitContent(poly ph, const ring r);
 
+#define CLEARENUMERATORS 0
+
 void p_Content(poly ph, const ring r)
 {
-#if 0
-  if( ph != NULL )
+#if CLEARENUMERATORS
+  if( (ph != NULL) && nCoeff_is_Q(r->cf) )
   {
     CPolyCoeffsEnumerator itr(ph);
     n_ClearContent(itr, r->cf);
-//    return;
-  }
-#endif
-
-  
+
+    assume( n_GreaterZero(pGetCoeff(ph),r->cf) );
+    
+    return;
+  }
+#endif
+
 #ifdef HAVE_RINGS
   if (rField_is_Ring(r))
@@ -2053 +2057 @@
           pIter(h);
         }
+        assume( n_GreaterZero(pGetCoeff(ph),r->cf) );
       }
       n_Delete(&k,r->cf);
@@ -2069 +2074 @@
   else
   {
+#if CLEARENUMERATORS
+    if( (ph != NULL) && nCoeff_is_Q(r->cf) )
+    {
+      CPolyCoeffsEnumerator itr(ph);
+      n_ClearContent(itr, r->cf);
+      assume( n_GreaterZero(pGetCoeff(ph),r->cf) );
+      return;
+    }
+#endif
+    
     n_Normalize(pGetCoeff(ph),r->cf);
     if(!n_GreaterZero(pGetCoeff(ph),r->cf)) ph = p_Neg(ph,r);
@@ -2441 +2456 @@
 poly p_Cleardenom(poly ph, const ring r)
 {
+  const coeffs C = r->cf;
+
   poly start=ph;
 
-#if 0
-  if( ph != NULL )
+#if CLEARENUMERATORS
+  if( (ph != NULL) && nCoeff_is_Q(C) )
   {
     CPolyCoeffsEnumerator itr(ph);
-    n_ClearDenominators(itr, r->cf);
-    //  return start;
-  }
-#endif
-
+    n_ClearDenominators(itr, C);
+    n_ClearContent(itr, C); // divide out the content
+
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
+    
+    return start;
+  }
+#endif
+  
   number d, h;
   poly p;
@@ -2459 +2480 @@
   {
     p_Content(ph,r);
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
     return start;
   }
 #endif
-  if (rField_is_Zp(r) && TEST_OPT_INTSTRATEGY) return start;
+
+  if (rField_is_Zp(r) && TEST_OPT_INTSTRATEGY)
+  {
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
+    return start;
+  }
   p = ph;
+
+  assume(p != NULL);
+  
   if(pNext(p)==NULL)
   {
@@ -2479 +2509 @@
     else
       p_SetCoeff(p,n_Init(1,r->cf),r);
-  }
-  else
+
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
+    
+    return start;
+  }
+
+#if CLEARENUMERATORS
+  if( (ph != NULL) && nCoeff_is_Q(C) )
+  {
+    CPolyCoeffsEnumerator itr(ph);
+    n_ClearDenominators(itr, C);
+    n_ClearContent(itr, C); // divide out the content
+
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
+    
+    return start;
+  }
+#endif
+
+  if(1)
   {
     h = n_Init(1,r->cf);
@@ -2571 +2619 @@
 #endif
   }
+
+  assume( n_GreaterZero(pGetCoeff(ph),C) );
+  
   return start;
 }
@@ -2576 +2627 @@
 void p_Cleardenom_n(poly ph,const ring r,number &c)
 {
-#if 0
-  if( ph != NULL )
-  {
-    CPolyCoeffsEnumerator itr(ph);
-    n_ClearDenominators(itr, c, r->cf);
-//    return;
-  }
-#endif
-  
+  const coeffs C = r->cf;
   number d, h;
   poly p;
 
   p = ph;
+
+  assume(ph != NULL);
+
+
+
+#if CLEARENUMERATORS
+  if( (ph != NULL) && nCoeff_is_Q(C) )
+  {
+    CPolyCoeffsEnumerator itr(ph);
+    n_ClearDenominators(itr, d, C); // multiply with common denom. d
+    n_ClearContent(itr, h, C); // divide by the content h 
+
+    c = n_Div(d, h, C); // d/h 
+
+    n_Delete(&d, C);
+    n_Delete(&h, C);
+
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
+    
+    return;
+  }
+#endif
+  
   if(pNext(p)==NULL)
   {
-    c=n_Invers(pGetCoeff(p),r->cf);
-    p_SetCoeff(p,n_Init(1,r->cf),r);
-  }
-  else
+    c=n_Invers(pGetCoeff(p), C);
+    p_SetCoeff(p, n_Init(1, C), r);
+
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
+    
+    return;
+  }
+
+#if CLEARENUMERATORS
+  if( (ph != NULL) && nCoeff_is_Q(C) )
+  {
+    CPolyCoeffsEnumerator itr(ph);
+    n_ClearDenominators(itr, d, C); // multiply with common denom. d
+    n_ClearContent(itr, h, C); // divide by the content h 
+
+    c = n_Div(d, h, C); // d/h 
+
+    n_Delete(&d, C);
+    n_Delete(&h, C);
+
+    assume( n_GreaterZero(pGetCoeff(ph),C) );
+    
+    return;
+  }
+#endif
+
+  
+  
+
+  if(1)
   {
     h = n_Init(1,r->cf);
@@ -2676 +2768 @@
     }
   }
+
+  assume( n_GreaterZero(pGetCoeff(ph),C) );
 }