Changeset 2de7b0 in git for libpolys/polys

Timestamp:

Sep 13, 2013, 10:38:22 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

57f6787143191ee820fea3fb30b759d7708dc7fc

Parents:

7627f67da8dc2c135f659c4e3f2ef25e3de4f00e

Message:

chg: improve definiteGcdCancellation by using singclap_gcd_and_divide

Location:

libpolys/polys

Files:

• clapsing.cc (modified) (5 diffs)
• clapsing.h (modified) (1 diff)
• ext_fields/transext.cc (modified) (5 diffs)

libpolys/polys/clapsing.cc

@@ -147 +147 @@
 }
 
-void singclap_gcd_and_divide ( poly& f, poly& g, const ring r)
+poly singclap_gcd_and_divide ( poly& f, poly& g, const ring r)
 {
   poly res=NULL;
 
-  if (f!=NULL) p_Cleardenom(f, r);
-  if (g!=NULL) p_Cleardenom(g, r);
-  else         return; // g==0 => but do a p_Cleardenom(f)
-  if (f==NULL) return; // f==0 => but do a p_Cleardenom(g)
+  if (g == NULL)
+  {
+    res= p_Copy (f,r);
+    p_Delete (&f, r);
+    f=p_One (r);
+    return res;
+  }
+  if (f==NULL)
+  {
+    res= p_Copy (g,r);
+    p_Delete (&g, r);
+    g=p_One (r);
+    return res;
+  }
 
   Off(SW_RATIONAL);
@@ -169 +179 @@
       p_Delete(&f,r);
       p_Delete(&g,r);
+      if (getCharacteristic() == 0)
+        On (SW_RATIONAL);
       f=convFactoryPSingP( F/GCD, r);
       g=convFactoryPSingP( G/GCD, r);
     }
+    res=convFactoryPSingP( GCD , r);
     if (!b1) Off (SW_USE_EZGCD_P);
   }
@@ -193 +206 @@
         p_Delete(&f,r);
         p_Delete(&g,r);
+        if (getCharacteristic() == 0)
+          On (SW_RATIONAL);
         f= convFactoryAPSingAP( F/GCD,r );
         g= convFactoryAPSingAP( G/GCD,r );
       }
+      res= convFactoryAPSingAP( GCD,r );
       if (!b1) Off(SW_USE_QGCD);
     }
@@ -207 +223 @@
         p_Delete(&f,r);
         p_Delete(&g,r);
+        if (getCharacteristic() == 0)
+          On (SW_RATIONAL);
         f= convFactoryPSingTrP( F/GCD,r );
         g= convFactoryPSingTrP( G/GCD,r );
       }
+      res= convFactoryPSingTrP( GCD,r );
     }
   }
@@ -215 +234 @@
     WerrorS( feNotImplemented );
   Off(SW_RATIONAL);
+  return res;
 }
 

libpolys/polys/clapsing.h

@@ -33 +33 @@
 
 /// clears denominators of f and g, divides by gcd(f,g)
-void singclap_gcd_and_divide ( poly& f, poly& g, const ring r);
+poly singclap_gcd_and_divide ( poly& f, poly& g, const ring r);
 
 // commented out!

libpolys/polys/ext_fields/transext.cc

@@ -1377 +1377 @@
 
 #ifdef HAVE_FACTORY
-  poly pGcd;
   /* here we assume: NUM(f), DEN(f) !=NULL, in Z_a reqp. Z/p_a */
-    pGcd = singclap_gcd_r(NUM(f), DEN(f), ntRing);
+  poly pGcd = singclap_gcd_and_divide(NUM(f), DEN(f), ntRing);
   if (p_IsConstant(pGcd, ntRing)
   && n_IsOne(p_GetCoeff(pGcd, ntRing), ntCoeffs)
@@ -1391 +1390 @@
     {
       NUM (f) = p_Div_nn (NUM (f), p_GetCoeff (DEN(f),ntRing), ntRing);
-      //poly newNum= singclap_pdivide (NUM(f), DEN (f), ntRing);
-      //p_Delete(&NUM (f), ntRing);
-      //NUM (f)= newNum;
       p_Delete(&DEN (f), ntRing);
       DEN (f) = NULL;
@@ -1402 +1398 @@
   { /* We divide both NUM(f) and DEN(f) by the gcd which is known
        to be != 1. */
-    poly newNum = singclap_pdivide(NUM(f), pGcd, ntRing);
-    p_Delete(&NUM(f), ntRing);
-    NUM(f) = newNum;
-    poly newDen = singclap_pdivide(DEN(f), pGcd, ntRing);
-    p_Delete(&DEN(f), ntRing);
-    DEN(f) = newDen;
     if (p_IsConstant(DEN(f), ntRing) &&
         n_IsOne(p_GetCoeff(DEN(f), ntRing), ntCoeffs))
@@ -1413 +1403 @@
       /* DEN(f) = 1 needs to be represented by NULL! */
       p_Delete(&DEN(f), ntRing);
-      newDen = NULL;
+      DEN(f) = NULL;
     }
     else
@@ -1420 +1410 @@
          call will remove those nested fractions, in case there are
          any. */
-      if (nCoeff_is_Q(ntCoeffs)) handleNestedFractionsOverQ(f, cf);
+      if (nCoeff_is_Zp(ntCoeffs) && p_IsConstant (DEN (f), ntRing))
+      {
+        NUM (f) = p_Div_nn (NUM (f), p_GetCoeff (DEN(f),ntRing), ntRing);
+        p_Delete(&DEN (f), ntRing);
+        DEN (f) = NULL;
+        COM (f) = 0;
+      } else if (nCoeff_is_Q(ntCoeffs)) handleNestedFractionsOverQ(f, cf);
     }
   }