Changeset c4e9ea in git for libpolys/polys/monomials/p_polys.cc

Timestamp:

Oct 7, 2013, 9:30:14 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

ecf4a6aec8765816e4b84c145f473f1ff6555d71

Parents:

0b4a87ab19d7bd751e10156552aa4184fbff4ea7

git-author:

Martin Lee <martinlee84@web.de>2013-10-07 21:30:14+02:00

git-committer:

Martin Lee <martinlee84@web.de>2013-10-08 11:14:43+02:00

Message:

chg: put make monic into p_ProjectiveUnique

File:

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

libpolys/polys/monomials/p_polys.cc

@@ -2212 +2212 @@
         n_Delete(&h,r->cf->extRing->cf);
       }*/
-    }
-
-    /* normalize ph over a transcendental extension s.t.
-       lead (ph) is > 0 if extRing->cf == Q
-       or lead (ph) is monic if extRing->cf == Zp*/
-    const coeffs C = r->cf;
-    if (nCoeff_is_transExt(C))
-    {
-      p= ph;
-      h= p_GetCoeff (p, C);
-      fraction f = (fraction) h;
-      poly g = NUM(f);
-      number n=p_GetCoeff (g,C->extRing->cf);
-      if (rField_is_Q (C->extRing))
-      {
-        if (!n_GreaterZero(n,C->extRing->cf))
-        {
-          p=p_Neg (p,r);
-        }
-      }
-      else if (rField_is_Zp(C->extRing))
-      {
-        if (!n_IsOne (n, C->extRing->cf))
-        {
-          n=n_Invers (n,C->extRing->cf);
-          nMapFunc nMap;
-          nMap= n_SetMap (C->extRing->cf, C);
-          number ninv= nMap (n,C->extRing->cf, C);
-          p=p_Mult_nn (p, ninv, r);
-          n_Delete (&ninv, C);
-          n_Delete (&n, C->extRing->cf);
-        }
-      }
-      p= ph;
     }
   }
@@ -2905 +2871 @@
 
   p_Cleardenom(ph, r); //performs also a p_Content
+  
+  
+    /* normalize ph over a transcendental extension s.t.
+       lead (ph) is > 0 if extRing->cf == Q
+       or lead (ph) is monic if extRing->cf == Zp*/
+    if (nCoeff_is_transExt(C))
+    {
+      p= ph;
+      h= p_GetCoeff (p, C);
+      fraction f = (fraction) h;
+      poly g = NUM(f);
+      number n=p_GetCoeff (g,C->extRing->cf);
+      if (rField_is_Q (C->extRing))
+      {
+        if (!n_GreaterZero(n,C->extRing->cf))
+        {
+          p=p_Neg (p,r);
+        }
+      }
+      else if (rField_is_Zp(C->extRing))
+      {
+        if (!n_IsOne (n, C->extRing->cf))
+        {
+          n=n_Invers (n,C->extRing->cf);
+          nMapFunc nMap;
+          nMap= n_SetMap (C->extRing->cf, C);
+          number ninv= nMap (n,C->extRing->cf, C);
+          p=p_Mult_nn (p, ninv, r);
+          n_Delete (&ninv, C);
+          n_Delete (&n, C->extRing->cf);
+        }
+      }
+      p= ph;
+    }
+    
   return;
 }