Changeset 2b2e08 in git

Timestamp:

Jul 19, 2013, 11:32:30 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

24d28c126eeee4f3f659e22340b915e485fbbcf1

Parents:

9713eea80d019296cc6a670a2d19b267b228d562

Message:

fix: tr. #496 (imap:Q(a)->Q[a] via p_PermPoly)

File:

• libpolys/polys/monomials/p_polys.cc (modified) (5 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -2170 +2170 @@
         while (p!=NULL)
         { // each monom: coeff in Q_a
-          fraction f=(fraction)pGetCoeff(p); 
+          fraction f=(fraction)pGetCoeff(p);
           poly c_n=NUM(f);
           if (hzz==NULL)
-          {
-            hzz=n_Copy(pGetCoeff(c_n),r->cf->extRing->cf); 
-            pIter(c_n);
-          }
+          {
+            hzz=n_Copy(pGetCoeff(c_n),r->cf->extRing->cf);
+            pIter(c_n);
+          }
           while ((c_n!=NULL)&&(!n_IsOne(hzz,r->cf->extRing->cf)))
           { // each monom: coeff in Q
@@ -2195 +2195 @@
           while (p!=NULL)
           { // each monom: coeff in Q_a
-            fraction f=(fraction)pGetCoeff(p);
+            fraction f=(fraction)pGetCoeff(p);
             NUM(f)=p_Mult_nn(NUM(f),h,r->cf->extRing);
-            p_Normalize(NUM(f),r->cf->extRing);
-            pIter(p);
+            p_Normalize(NUM(f),r->cf->extRing);
+            pIter(p);
           }
         }
@@ -3622 +3622 @@
   {
     zz = (poly) z;
-
-    if( zz == NULL )
-       return NULL;
-
-  } else if (nCoeff_is_transExt(srcCf))
+    if( zz == NULL ) return NULL;
+  }
+  else if (nCoeff_is_transExt(srcCf))
   {
     assume( !IS0(z) );
@@ -3633 +3631 @@
     p_Test (zz, srcExtRing);
 
-    if( zz == NULL )
-       return NULL;
-
-    //if( !DENIS1(z) )
-      //WarnS("Not implemented yet: Cannot permute a rational fraction and make a polynomial out of it! Ignorring the denumerator.");
-  } else
-     {
-        assume (FALSE);
-        Werror("Number permutation is not implemented for this data yet!");
-        return NULL;
-     }
+    if( zz == NULL ) return NULL;
+    if( !DENIS1(z) )
+    {
+      if (p_IsConstant(DEN(z),srcExtRing))
+      {
+        number n=pGetCoeff(DEN(z));
+        zz=p_Div_nn(zz,n,srcExtRing);
+      }
+      //else
+      //  WarnS("Not implemented yet: Cannot permute a rational fraction and make a polynomial out of it! Ignorring the denumerator.");
+    }
+  }
+  else
+  {
+    assume (FALSE);
+    Werror("Number permutation is not implemented for this data yet!");
+    return NULL;
+  }
 
   assume( zz != NULL );
   p_Test (zz, srcExtRing);
 
-
   nMapFunc nMap = n_SetMap(srcExtRing->cf, dstCf);
 
@@ -3654 +3658 @@
 
   poly qq;
-
   if ((par_perm == NULL) && (rPar(dst) != 0 && rVar (srcExtRing) > 0))
   {