Changeset 23e8e2 in git for libpolys/polys/ext_fields/transext.cc

Timestamp:

Sep 27, 2013, 1:25:58 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

62393da950b3f0e2f7ae740773cd556f16a20bda

Parents:

12d61707b29797f7bf3e42e5b9f0a01e937da42be3572aeabbaf031b22dbbac237937700676a8248

Message:

Merge pull request #383 from mmklee/ff_transext

Ff transext

File:

• libpolys/polys/ext_fields/transext.cc (modified) (2 diffs)

libpolys/polys/ext_fields/transext.cc

@@ -1387 +1387 @@
        DEN(f), or both, due to previous arithmetics. The next call will
        remove those nested fractions, in case there are any. */
-    if (nCoeff_is_Zp(ntCoeffs) && p_IsConstant (DEN (f), ntRing))
+    if (nCoeff_is_Zp(ntCoeffs))
     {
       NUM (f) = p_Div_nn (NUM (f), p_GetCoeff (DEN(f),ntRing), ntRing);
-      p_Delete(&DEN (f), ntRing);
-      DEN (f) = NULL;
-      COM (f) = 0;
+      if (p_IsConstant (DEN (f), ntRing))
+      {
+        p_Delete(&DEN (f), ntRing);
+        DEN (f) = NULL;
+      }
+      else
+      {
+        p_Norm (DEN (f),ntRing);
+      }
     } else if (nCoeff_is_Q(ntCoeffs)) handleNestedFractionsOverQ(f, cf);
   }
@@ -1407 +1413 @@
     else
     {
-      if (nCoeff_is_Zp(ntCoeffs) && p_IsConstant (DEN (f), ntRing))
+      if (nCoeff_is_Zp(ntCoeffs))
       {
         NUM (f) = p_Div_nn (NUM (f), p_GetCoeff (DEN(f),ntRing), ntRing);
-        p_Delete(&DEN (f), ntRing);
-        DEN (f) = NULL;
-        COM (f) = 0;
+        if (p_IsConstant (DEN (f), ntRing))
+        {
+          p_Delete(&DEN (f), ntRing);
+          DEN (f) = NULL;
+        }
+        else
+        {
+          p_Norm (DEN (f),ntRing);
+        }
       }
     }