Changeset 1a3437 in git for libpolys/polys/ext_fields

Timestamp:

Jun 16, 2014, 2:21:49 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

9434d56e8ef4f81efbcce8576989b9e7dba52103

Parents:

754c38259f235b42412a9c3cd9338b6e5151aa8a

Message:

change mod for numbers to mod for bigint, p5

Location:

libpolys/polys/ext_fields

Files:

• algext.cc (modified) (3 diffs)
• transext.cc (modified) (11 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -699 +699 @@
       while (xx!=NULL)
       {
-        bt = n_Gcd(t, pGetCoeff(xx), naRing->cf);
+        bt = n_SubringGcd(t, pGetCoeff(xx), naRing->cf);
         rr = n_Mult(t, pGetCoeff(xx), naRing->cf);
         n_Delete(&pGetCoeff(xx),naRing->cf);
@@ -833 +833 @@
       {
         pIter(ax);
-        number y = n_Gcd(x, pGetCoeff(ax), naRing->cf);
+        number y = n_SubringGcd(x, pGetCoeff(ax), naRing->cf);
         n_Delete(&x,naRing->cf);
         x = y;
@@ -841 +841 @@
       do
       {
-        number y = n_Gcd(x, pGetCoeff(bx), naRing->cf);
+        number y = n_SubringGcd(x, pGetCoeff(bx), naRing->cf);
         n_Delete(&x,naRing->cf);
         x = y;

libpolys/polys/ext_fields/transext.cc

@@ -1561 +1561 @@
     {
       pGcd = pa;
-      p_SetCoeff (pGcd, n_Gcd (pGetCoeff(pGcd), pGetCoeff(pb), ntCoeffs), ntRing);
+      p_SetCoeff (pGcd, nlGcd (pGetCoeff(pGcd), pGetCoeff(pb), ntCoeffs), ntRing);
     }
     else
@@ -1571 +1571 @@
       while (pb != NULL)
       {
-        tmp = n_Gcd(contentpb, p_GetCoeff(pb, ntRing) , ntCoeffs);
+        tmp = n_SubringGcd(contentpb, p_GetCoeff(pb, ntRing) , ntCoeffs);
         n_Delete(&contentpb, ntCoeffs);
         contentpb = tmp;
@@ -1581 +1581 @@
       while (pa != NULL)
       {
-        tmp = n_Gcd(contentpa, p_GetCoeff(pa, ntRing), ntCoeffs);
+        tmp = n_SubringGcd(contentpa, p_GetCoeff(pa, ntRing), ntCoeffs);
         n_Delete(&contentpa, ntCoeffs);
         contentpa = tmp;
@@ -1587 +1587 @@
       }
 
-      tmp= n_Gcd (contentpb, contentpa, ntCoeffs);
+      tmp= n_SubringGcd (contentpb, contentpa, ntCoeffs);
       n_Delete(&contentpa, ntCoeffs);
       n_Delete(&contentpb, ntCoeffs);
@@ -1650 +1650 @@
     {
       pGcd = pa;
-      p_SetCoeff (pGcd, n_Gcd (pGetCoeff(pGcd), pGetCoeff(pb), ntCoeffs), ntRing);
+      p_SetCoeff (pGcd, n_SubringGcd (pGetCoeff(pGcd), pGetCoeff(pb), ntCoeffs), ntRing);
     }
     else
@@ -1660 +1660 @@
       while (pb != NULL)
       {
-        tmp = n_Gcd(contentpb, p_GetCoeff(pb, ntRing) , ntCoeffs);
+        tmp = n_SubringGcd(contentpb, p_GetCoeff(pb, ntRing) , ntCoeffs);
         n_Delete(&contentpb, ntCoeffs);
         contentpb = tmp;
@@ -1670 +1670 @@
       while (pa != NULL)
       {
-        tmp = n_Gcd(contentpa, p_GetCoeff(pa, ntRing), ntCoeffs);
+        tmp = n_SubringGcd(contentpa, p_GetCoeff(pa, ntRing), ntCoeffs);
         n_Delete(&contentpa, ntCoeffs);
         contentpa = tmp;
@@ -1676 +1676 @@
       }
 
-      tmp= n_Gcd (contentpb, contentpa, ntCoeffs);
+      tmp= n_SubringGcd (contentpb, contentpa, ntCoeffs);
       n_Delete(&contentpa, ntCoeffs);
       n_Delete(&contentpb, ntCoeffs);
@@ -1701 +1701 @@
   return (number)result;
 }
+//number ntGcd_dummy(number a, number b, const coeffs cf)
+//{
+//  extern char my_yylinebuf[80];
+//  Print("ntGcd in >>%s<<\n",my_yylinebuf);
+//  return ntGcd(a,b,cf);
+//}
 
 int ntSize(number a, const coeffs cf)
@@ -2269 +2275 @@
       if (nCoeff_is_Q (Q))
       {
-        number LcGcd= n_Gcd (p_GetCoeff (cand, R), p_GetCoeff(den, R), Q);
+        number LcGcd= n_SubringGcd (p_GetCoeff (cand, R), p_GetCoeff(den, R), Q);
         gcd = p_Mult_nn(gcd, LcGcd, R);
         n_Delete(&LcGcd,Q);
@@ -2462 +2468 @@
   cf->cfDBTest       = ntDBTest;
 #endif
-  cf->cfGcd          = ntGcd;
+  //cf->cfGcd          = ntGcd_dummy;
+  cf->cfSubringGcd   = ntGcd;
   cf->cfLcm          = ntLcm;
   cf->cfSize         = ntSize;