Changeset 88cceb in git for libpolys/polys/ext_fields

Timestamp:

Jul 12, 2014, 5:56:31 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

642a254c3cd9870d56e7587e48237a9649b595d38f0728edc2d87e260893c1b9a488d65023bb0d2e

Parents:

b5d9340ceee76456a2eb1298e4089c556634b9e7

Message:

fix: n_Lcm is not n_NormalizeHelper

Location:

libpolys/polys/ext_fields

Files:

• algext.cc (modified) (7 diffs)
• transext.cc (modified) (6 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -101 +101 @@
 number   naGetNumerator(number &a, const coeffs cf);
 number   naGcd(number a, number b, const coeffs cf);
-//number   naLcm(number a, number b, const coeffs cf);
 int      naSize(number a, const coeffs cf);
 void     naDelete(number *a, const coeffs cf);
@@ -642 +641 @@
 }
 #endif
-number napLcm(number b, const coeffs cf)
+number napNormalizeHelper(number b, const coeffs cf)
 {
   number h=n_Init(1,naRing->cf);
@@ -649 +648 @@
   while(bb!=NULL)
   {
-    d=n_Lcm(h,pGetCoeff(bb), naRing->cf);
+    d=n_NormalizeHelper(h,pGetCoeff(bb), naRing->cf);
     n_Delete(&h,naRing->cf);
     h=d;
@@ -667 +666 @@
   {
     a=(number)p_Copy((poly)a,naRing);
-    number t=napLcm(b,cf);
+    number t=napNormalizeHelper(b,cf);
     if(!n_IsOne(t,naRing->cf))
     {
@@ -1284 +1283 @@
           while (c_n!=NULL)
           { // each monom: coeff in Q
-            d=n_Lcm(hzz,pGetCoeff(c_n),r->cf->extRing->cf);
+            d=n_NormalizeHelper(hzz,pGetCoeff(c_n),r->cf->extRing->cf);
             n_Delete(&hzz,r->cf->extRing->cf);
             hzz=d;
@@ -1461 +1460 @@
 #endif
   cf->cfGcd          = naGcd;
-  cf->cfLcm          = naLcmContent;
+  cf->cfNormalizeHelper          = naLcmContent;
   cf->cfSize         = naSize;
   cf->nCoeffIsEqual  = naCoeffIsEqual;
@@ -1639 +1638 @@
 #endif
   cf->cfGcd          = naGcd;
-  cf->cfLcm          = naLcmContent;
+  cf->cfNormalizeHelper          = naLcmContent;
   cf->cfSize         = naSize;
   cf->nCoeffIsEqual  = naCoeffIsEqual;

libpolys/polys/ext_fields/transext.cc

@@ -126 +126 @@
 number   ntGetNumerator(number &a, const coeffs cf);
 number   ntGcd(number a, number b, const coeffs cf);
-number   ntLcm(number a, number b, const coeffs cf);
+number   ntNormalizeHelper(number a, number b, const coeffs cf);
 int      ntSize(number a, const coeffs cf);
 void     ntDelete(number * a, const coeffs cf);
@@ -1113 +1113 @@
     number c; number tmp;
     poly p = NUM(f);
-    /* careful when using n_Lcm!!! It computes the lcm of the numerator
+    /* careful when using n_NormalizeHelper!!! It computes the lcm of the numerator
        of the 1st argument and the denominator of the 2nd!!! */
     while (p != NULL)
     {
       c = p_GetCoeff(p, ntRing);
-      tmp = n_Lcm(lcmOfDenominators, c, ntCoeffs);
+      tmp = n_NormalizeHelper(lcmOfDenominators, c, ntCoeffs);
       n_Delete(&lcmOfDenominators, ntCoeffs);
       lcmOfDenominators = tmp;
@@ -1127 +1127 @@
     {
       c = p_GetCoeff(p, ntRing);
-      tmp = n_Lcm(lcmOfDenominators, c, ntCoeffs);
+      tmp = n_NormalizeHelper(lcmOfDenominators, c, ntCoeffs);
       n_Delete(&lcmOfDenominators, ntCoeffs);
       lcmOfDenominators = tmp;
@@ -1496 +1496 @@
 }
 
-number ntLcm(number a, number b, const coeffs cf)
+number ntNormalizeHelper(number a, number b, const coeffs cf)
 {
   ntTest(a);
@@ -2291 +2291 @@
       else
       {
-        number g = n_Lcm(d, pGetCoeff(den), Q);
+        number g = n_NormalizeHelper(d, pGetCoeff(den), Q);
         n_Delete(&d, Q); d = g;
       }
@@ -2437 +2437 @@
   //cf->cfGcd          = ntGcd_dummy;
   cf->cfSubringGcd   = ntGcd;
-  cf->cfLcm          = ntLcm;
+  cf->cfNormalizeHelper = ntNormalizeHelper;
   cf->cfSize         = ntSize;
   cf->nCoeffIsEqual  = ntCoeffIsEqual;