Changeset 2a4231 in git for libpolys

Timestamp:

Jun 29, 2015, 4:40:07 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

74dcead93fa7d8032514e5919362facbb50b1c0e

Parents:

8e18ccc9b499f7dc190d8295d0c3f12184a9f764

Message:

fix: tr. #723

Location:

libpolys/polys

Files:

• ext_fields/transext.cc (modified) (10 diffs)
• monomials/p_polys.cc (modified) (10 diffs)

libpolys/polys/ext_fields/transext.cc

@@ -193 +193 @@
   {
     p_Test(den, ntRing);
-
     if(p_IsConstant(den, ntRing) && (n_IsOne(pGetCoeff(den), ntCoeffs)))
     {
@@ -199 +198 @@
       return FALSE;
     }
-
     if( !n_GreaterZero(pGetCoeff(den), ntCoeffs) )
     {
@@ -205 +203 @@
       return FALSE;
     }
-
     // test that den is over integers!?
-
-  } else
+  }
+  else
   {  // num != NULL // den == NULL
-
 //    if( COM(t) != 0 )
 //    {
@@ -343 +339 @@
   if (IS0(a)) return NULL;
   fraction f = (fraction)a;
-  poly g = p_Copy(NUM(f), ntRing);
-  poly h = NULL; if (!DENIS1(f)) h = p_Copy(DEN(f), ntRing);
-  fraction result = (fraction)omAllocBin(fractionObjectBin);
-  NUM(result) = g;
-  DEN(result) = h;
+  poly g = NUM(f);
+  poly h = NULL;
+  h =DEN(f);
+  fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
+  NUM(result) = p_Copy(g,cf->extRing);
+  DEN(result) = p_Copy(h,cf->extRing);
   COM(result) = COM(f);
   ntTest((number)result);
@@ -384 +381 @@
     if( !n_GreaterZero(g, ntCoeffs) )
     {
-      NUM (f) = p_Neg(NUM (f), ntRing); // Ugly :(((
+      NUM (f) = p_Neg(NUM (f), ntRing);
       g = n_InpNeg(g, ntCoeffs);
     }
@@ -393 +390 @@
     if( !n_IsOne(g, ntCoeffs) )
     {
-      DEN (f) = p_NSet(g, ntRing); // update COM(f)???
+      DEN (f) = p_NSet(g, ntRing);
       COM (f) ++;
       assume( DEN (f) != NULL );
@@ -1250 +1247 @@
 
   if (IS0(a)) return;
+  if (DENIS1(f) || NUMIS1(f)) { COM(f) = 0; return; }
   if (!simpleTestsHaveAlreadyBeenPerformed)
   {
-    if (DENIS1(f) || NUMIS1(f)) { COM(f) = 0; return; }
 
     /* check whether NUM(f) = DEN(f), and - if so - replace 'a' by 1 */
@@ -1260 +1257 @@
       p_Delete(&DEN(f), ntRing); DEN(f) = NULL;
       COM(f) = 0;
-      ntTest(a); // !!!!
+      ntTest(a);
       return;
     }
@@ -1455 +1452 @@
     //PrintS(" den=");p_wrp(DEN(a),ntRing);PrintLn();
     definiteGcdCancellation(a, cf, FALSE);
-    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;
+    if ((DEN((fraction)a)!=NULL)
+    &&(!n_GreaterZero(pGetCoeff(DEN((fraction)a)),ntCoeffs)))
+    {
+      NUM((fraction)a)=p_Neg(NUM((fraction)a),ntRing);
+      DEN((fraction)a)=p_Neg(DEN((fraction)a),ntRing);
     }
   }
@@ -1843 +1838 @@
   fraction f = (fraction)a;
   poly g = prMapR(NUM(f), nMap, rSrc, rDst);
+  /* g may contain summands with coeff 0 */
+  poly hh=g;
+  poly prev=NULL;
+  while(hh!=NULL)
+  {
+    if (n_IsZero(pGetCoeff(hh),rDst->cf))
+    {
+      if (prev==NULL)
+      {
+        g=p_LmFreeAndNext(g,rDst);
+        hh=g;
+      }
+      else
+      {
+        prev->next=p_LmFreeAndNext(prev->next,rDst);
+        hh=prev->next;
+      }
+    }
+    else
+    {
+      prev=hh;
+      pIter(hh);
+    }
+  }
+  if (g==NULL) return NULL;
 
   poly h = NULL;
 
   if (!DENIS1(f))
+  {
      h = prMapR(DEN(f), nMap, rSrc, rDst);
+     /* h may contain summands with coeff 0 */
+    hh=h;
+    prev=NULL;
+    while(hh!=NULL)
+    {
+      if (n_IsZero(pGetCoeff(hh),rDst->cf))
+      {
+        if (prev==NULL)
+        {
+          h=p_LmFreeAndNext(h,rDst);
+          hh=h;
+        }
+        else
+        {
+          prev->next=p_LmFreeAndNext(prev->next,rDst);
+          hh=prev->next;
+        }
+      }
+      else
+      {
+        prev=hh;
+        pIter(hh);
+      }
+    }
+    if (h==NULL) WerrorS("mapping to */0");
+  }
 
   fraction result = (fraction)omAllocBin(fractionObjectBin);

libpolys/polys/monomials/p_polys.cc

@@ -3905 +3905 @@
     PrintS("\np_PermPoly::p: "); p_Write(p, oldRing, oldRing); PrintLn();
 #endif
-
   const int OldpVariables = rVar(oldRing);
   poly result = NULL;
@@ -3911 +3910 @@
   poly aq = NULL; /* the map coefficient */
   poly qq; /* the mapped monomial */
-
   assume(dst != NULL);
   assume(dst->cf != NULL);
-
   while (p != NULL)
   {
@@ -3922 +3919 @@
       qq = p_Init(dst);
       assume( nMap != NULL );
-
       number n = nMap(p_GetCoeff(p, oldRing), oldRing->cf, dst->cf);
-
       n_Test (n,dst->cf);
-
       if ( nCoeff_is_algExt(dst->cf) )
         n_Normalize(n, dst->cf);
-
       p_GetCoeff(qq, dst) = n;// Note: n can be a ZERO!!!
-      // coef may be zero:
-//      p_Test(qq, dst);
     }
     else
     {
       qq = p_One(dst);
-
 //      aq = naPermNumber(p_GetCoeff(p, oldRing), par_perm, OldPar, oldRing); // no dst???
 //      poly    n_PermNumber(const number z, const int *par_perm, const int P, const ring src, const ring dst)
       aq = n_PermNumber(p_GetCoeff(p, oldRing), par_perm, OldPar, oldRing, dst);
-
       p_Test(aq, dst);
-
       if ( nCoeff_is_algExt(dst->cf) )
         p_Normalize(aq,dst);
-
       if (aq == NULL)
         p_SetCoeff(qq, n_Init(0, dst->cf),dst); // Very dirty trick!!!
-
       p_Test(aq, dst);
     }
-
     if (rRing_has_Comp(dst))
        p_SetComp(qq, p_GetComp(p, oldRing), dst);
-
     if ( n_IsZero(pGetCoeff(qq), dst->cf) )
     {
@@ -3981 +3965 @@
               assume( dst->cf->extRing == NULL );
               number ee = n_Param(1, dst);
-
               number eee;
               n_Power(ee, e, &eee, dst->cf); //nfDelete(ee,dst);
-
               ee = n_Mult(c, eee, dst->cf);
               //nfDelete(c,dst);nfDelete(eee,dst);
@@ -3993 +3975 @@
               const int par = -perm[i];
               assume( par > 0 );
-
 //              WarnS("longalg missing 3");
 #if 1
               const coeffs C = dst->cf;
               assume( C != NULL );
-
               const ring R = C->extRing;
               assume( R != NULL );
-
               assume( par <= rVar(R) );
-
               poly pcn; // = (number)c
-
               assume( !n_IsZero(c, C) );
-
               if( nCoeff_is_algExt(C) )
                  pcn = (poly) c;
                else //            nCoeff_is_transExt(C)
                  pcn = NUM((fraction)c);
-
               if (pNext(pcn) == NULL) // c->z
                 p_AddExp(pcn, -perm[i], e, R);
@@ -4020 +3995 @@
                 p_SetExp(mmc, -perm[i], e, R);
                 p_Setm(mmc, R);
-
                 number nnc;
                 // convert back to a number: number nnc = mmc;
@@ -4027 +4001 @@
                 else //            nCoeff_is_transExt(C)
                   nnc = ntInit(mmc, C);
-
                 p_GetCoeff(qq, dst) = n_Mult((number)c, nnc, C);
                 n_Delete((number *)&c, C);
                 n_Delete((number *)&nnc, C);
               }
-
               mapped_to_par=1;
 #endif
@@ -4075 +4047 @@
       if (aq!=NULL)
          qq=p_Mult_q(aq,qq,dst);
-
       aq = qq;
-
       while (pNext(aq) != NULL) pIter(aq);
-
       if (result_last==NULL)
       {
@@ -4096 +4065 @@
     }
   }
-
   result=p_SortAdd(result,dst);
 #else
@@ -4127 +4095 @@
 #endif
   p_Test(result,dst);
-
 #if 0
   p_Test(result,dst);