Changeset 88cceb in git

Timestamp:

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

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

642a254c3cd9870d56e7587e48237a9649b595d38f0728edc2d87e260893c1b9a488d65023bb0d2e

Parents:

b5d9340ceee76456a2eb1298e4089c556634b9e7

Message:

fix: n_Lcm is not n_NormalizeHelper

Files:

• Singular/dyn_modules/syzextra/syzextra.cc (modified) (1 diff)
• kernel/fglm/fglmvec.cc (modified) (1 diff)
• libpolys/coeffs/README.coeffs (modified) (2 diffs)
• libpolys/coeffs/coeffs.h (modified) (2 diffs)
• libpolys/coeffs/longrat.cc (modified) (2 diffs)
• libpolys/coeffs/longrat.h (modified) (1 diff)
• libpolys/coeffs/numbers.cc (modified) (2 diffs)
• libpolys/polys/coeffrings.h (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (7 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (6 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (4 diffs)

Singular/dyn_modules/syzextra/syzextra.cc

@@ -824 +824 @@
       const number& lc2 = p_GetCoeff(pp, r);
 
-      number g = n_Lcm( lc1, lc2, r );
+      number g = n_Lcm( lc1, lc2, r->cf );
 
       p_SetCoeff0(m ,       n_Div(g, lc1, r), r);

kernel/fglm/fglmvec.cc

@@ -507 +507 @@
     {
       isZero = FALSE;
-      number temp = n_Lcm (theLcm, rep->getconstelem (i), currRing->cf);
+      number temp = n_NormalizeHelper (theLcm, rep->getconstelem (i), currRing->cf);
       nDelete (&theLcm);
       theLcm = temp;

libpolys/coeffs/README.coeffs

@@ -66 +66 @@
 -cfParDeg (otherwise: -1 for 0, 0 for non-zero)
 -cfParameter (otherwise: error)
--cfInit_bigint (otherwise: error)
 
 automatic:
@@ -74 +73 @@
 to describe:
 -cfLcm
+-cfNormalizeHelper
 -cfQuotRem
 -cfRandom

libpolys/coeffs/coeffs.h

@@ -251 +251 @@
    number  (*cfQuotRem)(number a, number b, number *rem, const coeffs r);
    number  (*cfLcm)(number a, number b, const coeffs r);
+   number  (*cfNormalizeHelper)(number a, number b, const coeffs r);
    void    (*cfDelete)(number * a, const coeffs r);
 
@@ -674 +675 @@
 /// in Z/nZ, Z/2^kZ: computed as in the case Z
 /// in Z/pZ, C, R: not implemented
-/// in Q: return the lcm of the numerators of 'a' and the denominator of 'b'
 /// in K(a)/<p(a)>: not implemented
 /// in K(t_1, ..., t_n): not implemented
 static inline number n_Lcm(number a, number b, const coeffs r)
 { assume(r != NULL); assume(r->cfLcm!=NULL); return r->cfLcm(a,b,r); }
+
+/// assume that r is a quotient field (otherwise, return 1)
+/// for arguments (a1/a2,b1/b2) return (lcm(a1,b2)/1)
+static inline number n_NormalizeHelper(number a, number b, const coeffs r)
+{ assume(r != NULL); assume(r->cfNormalizeHelper!=NULL); return r->cfNormalizeHelper(a,b,r); }
 
 /// set the mapping function pointers for translating numbers from src to dst

libpolys/coeffs/longrat.cc

@@ -1252 +1252 @@
 * returns in result->z the lcm(a->z,b->n)
 */
-number nlLcm(number a, number b, const coeffs r)
+number nlNormalizeHelper(number a, number b, const coeffs r)
 {
   number result;
@@ -3091 +3091 @@
   r->cfGetNumerator = nlGetNumerator;
   r->cfExtGcd = nlExtGcd; // only for ring stuff and Z
-  r->cfLcm  = nlLcm;
+  r->cfNormalizeHelper  = nlNormalizeHelper;
   r->cfDelete= nlDelete;
   r->cfSetMap = nlSetMap;

libpolys/coeffs/longrat.h

@@ -106 +106 @@
 number   nlGcd(number a, number b, const coeffs r);
 number nlExtGcd(number a, number b, number *s, number *t, const coeffs);
-number   nlLcm(number a, number b, const coeffs r);   /*special routine !*/
+number   nlNormalizeHelper(number a, number b, const coeffs r);   /*special routine !*/
 BOOLEAN  nlGreater(number a, number b, const coeffs r);
 BOOLEAN  nlIsMOne(number a, const coeffs r);

libpolys/coeffs/numbers.cc

@@ -331 +331 @@
     n->cfNormalize=ndNormalize;
     n->cfGcd  = ndGcd;
+    n->cfNormalizeHelper  = ndGcd; /* tricky, isn't it ?*/
     n->cfLcm  = ndGcd; /* tricky, isn't it ?*/
     n->cfInitMPZ = ndInitMPZ;
@@ -430 +431 @@
     assume(n->cfGetNumerator!=NULL);
     assume(n->cfGcd!=NULL);
-    assume(n->cfLcm!=NULL);
+    assume(n->cfNormalizeHelper!=NULL);
     assume(n->cfDelete!=NULL);
     assume(n->cfSetMap!=NULL);

libpolys/polys/coeffrings.h

@@ -38 +38 @@
 static inline number n_ExactDiv(number a, number b, const ring r){ return n_ExactDiv(a,b, r->cf);}
 static inline number n_Gcd(number a, number b, const ring r){ return n_Gcd(a,b, r->cf);}
-static inline number n_Lcm(number a, number b, const ring r){ return n_Lcm(a,b, r->cf);}
 
 #ifdef HAVE_RINGS

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;

libpolys/polys/monomials/p_polys.cc

@@ -2329 +2329 @@
           while (c_n!=NULL)
           { // each monom: coeff in Q
-            d=n_Lcm(h,pGetCoeff(c_n),r->cf->extRing->cf);
+            d=n_NormalizeHelper(h,pGetCoeff(c_n),r->cf->extRing->cf);
             n_Delete(&h,r->cf->extRing->cf);
             h=d;
@@ -2764 +2764 @@
     {
       n_Normalize(pGetCoeff(p),r->cf);
-      d=n_Lcm(h,pGetCoeff(p),r->cf);
+      d=n_NormalizeHelper(h,pGetCoeff(p),r->cf);
       n_Delete(&h,r->cf);
       h=d;
@@ -2904 +2904 @@
     {
       n_Normalize(pGetCoeff(p),r->cf);
-      d=n_Lcm(h,pGetCoeff(p),r->cf);
+      d=n_NormalizeHelper(h,pGetCoeff(p),r->cf);
       n_Delete(&h,r->cf);
       h=d;
@@ -2940 +2940 @@
           while (p!=NULL)
           {
-            d=n_Lcm(h,pGetCoeff(p),r->cf);
+            d=n_NormalizeHelper(h,pGetCoeff(p),r->cf);
             n_Delete(&h,r->cf);
             h=d;