Changeset 6105f4f in git

Timestamp:

Jun 5, 2015, 11:32:30 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')

Children:

237216757140038ef41b344e53b79feabb7002c4

Parents:

ab23dcda702726a207b05ce2427acc7936ba4cd0

Message:

transext.cc: NUM/DEN do not include type cast any more

Files:

• Singular/maps_ip.cc (modified) (3 diffs)
• libpolys/polys/clapconv.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/transext.h (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (2 diffs)

Singular/maps_ip.cc

@@ -264 +264 @@
 
       number d = n_GetDenom(p_GetCoeff(p, currRing), currRing);
-      p_Test((poly)NUM(d), R);
+      p_Test((poly)NUM((fraction)d), R);
 
       if ( n_IsOne (d, currRing->cf) )
@@ -270 +270 @@
         n_Delete(&d, currRing); d = NULL;
       }
-      else if (!p_IsConstant((poly)NUM(d), R))
+       else if (!p_IsConstant((poly)NUM((fraction)d), R))
       {
         WarnS("ignoring denominators of coefficients...");
@@ -279 +279 @@
       memset(&tmpW,0,sizeof(sleftv));
       tmpW.rtyp = POLY_CMD;
-      p_Test((poly)NUM(num), R);
-
-      tmpW.data = NUM (num); // a copy of this poly will be used
-
-      p_Normalize(NUM(num),R);
+      p_Test((poly)NUM((fraction)num), R);
+
+      tmpW.data = NUM ((fraction)num); // a copy of this poly will be used
+
+      p_Normalize(NUM((fraction)num),R);
       if (maApplyFetch(MAP_CMD,theMap,v,&tmpW,R,NULL,NULL,0,nMap))
       {

libpolys/polys/clapconv.cc

@@ -297 +297 @@
 
     // test if denominator is constant
-    if (!p_IsConstantPoly(DEN (p_GetCoeff (p,r)),r->cf->extRing) && !errorreported)
+    if (!p_IsConstantPoly(DEN ((fraction)p_GetCoeff (p,r)),r->cf->extRing) && !errorreported)
       WerrorS("conversion error: denominator!= 1");
 
-    CanonicalForm term=convSingPFactoryP(NUM (p_GetCoeff(p, r)),r->cf->extRing);
+    CanonicalForm term=convSingPFactoryP(NUM ((fraction)p_GetCoeff(p, r)),r->cf->extRing);
 
     // if denominator is not NULL it should be a constant at this point
-    if (DEN (p_GetCoeff(p,r)) != NULL)
-    {
-      CanonicalForm den= convSingPFactoryP(DEN (p_GetCoeff(p, r)),r->cf->extRing);
+    if (DEN ((fraction)p_GetCoeff(p,r)) != NULL)
+    {
+      CanonicalForm den= convSingPFactoryP(DEN ((fraction)p_GetCoeff(p, r)),r->cf->extRing);
       if (rChar (r) == 0)
         On (SW_RATIONAL);

libpolys/polys/ext_fields/transext.cc

@@ -1455 +1455 @@
     //PrintS(" den=");p_wrp(DEN(a),ntRing);PrintLn();
     definiteGcdCancellation(a, cf, FALSE);
-    if ((DEN(a)!=NULL)
-    &&(!n_GreaterZero(pGetCoeff(DEN(a)),ntCoeffs)))
-    {
-      NUM(a)=p_Neg(NUM(a),ntRing);
-      DEN(a)=p_Neg(DEN(a),ntRing);
+    fraction f=(fraction)a;
+    if ((DEN(f)!=NULL)
+    &&(!n_GreaterZero(pGetCoeff(DEN(f)),ntCoeffs)))
+    {
+      NUM(f)=p_Neg(NUM(f),ntRing);
+      DEN(f)=p_Neg(DEN(f),ntRing);
+      a=(number)f;
     }
   }
@@ -2320 +2322 @@
     }
 
-    NUM(c) = p_Mult_nn(NUM(c), d, R);
+    NUM((fraction)c) = p_Mult_nn(NUM((fraction)c), d, R);
     n_Delete(&d, Q);
   }

libpolys/polys/ext_fields/transext.h

@@ -73 +73 @@
 
 
-#define NUM(f) (((fraction)f)->numerator)
-#define DEN(f) (((fraction)f)->denominator)
+#define NUM(f) ((f)->numerator)
+#define DEN(f) ((f)->denominator)
 
 /* some useful accessors for fractions: */

libpolys/polys/monomials/p_polys.cc

@@ -3841 +3841 @@
     assume( !IS0(z) );
 
-    zz = NUM(z);
+    zz = NUM((fraction)z);
     p_Test (zz, srcExtRing);
 
     if( zz == NULL ) return NULL;
-    if( !DENIS1(z) )
-    {
-      if (p_IsConstant(DEN(z),srcExtRing))
-      {
-        number n=pGetCoeff(DEN(z));
+    if( !DENIS1((fraction)z) )
+    {
+      if (p_IsConstant(DEN((fraction)z),srcExtRing))
+      {
+        number n=pGetCoeff(DEN((fraction)z));
         zz=p_Div_nn(zz,n,srcExtRing);
         p_Normalize(zz,srcExtRing);
@@ -4011 +4011 @@
                  pcn = (poly) c;
                else //            nCoeff_is_transExt(C)
-                 pcn = NUM(c);
+                 pcn = NUM((fraction)c);
 
               if (pNext(pcn) == NULL) // c->z