Changeset 28216f in git

Timestamp:

Mar 14, 2012, 11:19:32 AM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

6621678a043e06f4fb93c00a54b03b07aa6bfe29

Parents:

90f57ed16ec2e3fabfc8a64db7f2a9cb9bc85330

git-author:

Martin Lee <martinlee84@web.de>2012-03-14 11:19:32+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-03-14 14:53:43+01:00

Message:

fix: ntGetDenom & ntGetNumerator

File:

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

libpolys/polys/ext_fields/transext.cc

@@ -247 +247 @@
   if (IS0(a)) return NULL;
   fraction f = (fraction)a;
-  poly g = p_Copy(NUM(f), ntRing);
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
-  NUM(result) = g;
-  DEN(result) = NULL;
-  COM(result) = 0;
+  BOOLEAN denis1= DENIS1 (f);
+  if (getCoeffType (ntCoeffs) == n_Q && !denis1)
+    handleNestedFractionsOverQ (f, cf);
+  NUM (result)= p_Copy (NUM (f), ntRing);
+  DEN (result) = NULL;
+  COM (result) = 0;
+  if (getCoeffType (ntCoeffs) == n_Q && denis1)
+  {
+    if (!p_IsConstant (NUM (result), ntRing) && pNext (NUM(result)) != NULL)
+      p_Cleardenom (NUM(result), ntRing);
+    else
+    {
+      number g= p_GetAllDenom (NUM (result), ntRing);
+      NUM (result)= p_Mult_nn (NUM (result), g, ntRing);
+    }
+  }
   return (number)result;
 }
@@ -260 +272 @@
   definiteGcdCancellation(a, cf, FALSE);
   fraction f = (fraction)a;
-  poly g;
-  if (IS0(f) || DENIS1(f)) g = p_One(ntRing);
-  else g = p_Copy(DEN(f), ntRing);
   fraction result = (fraction)omAlloc0Bin(fractionObjectBin);
-  NUM(result) = g;
-  DEN(result) = NULL;
-  COM(result) = 0;
+  number g;
+  if (IS0(f) || (DENIS1 (f) && getCoeffType (ntCoeffs) != n_Q))
+  {
+    NUM (result)= p_One(ntRing);
+    DEN (result)= NULL;
+    COM (result)= 0;
+  }
+  else if (DENIS1 (f))
+  {
+    poly num= p_Copy (NUM (f), ntRing);
+    if (!p_IsConstant (num, ntRing) && pNext(num) != NULL)
+      p_Cleardenom_n (num, ntRing, g);
+    else
+      g= p_GetAllDenom (num, ntRing);
+    result= (fraction) ntSetMap (ntRing->cf, cf) (g, ntRing->cf, cf);
+  }
+  else
+  {
+    if (getCoeffType (ntCoeffs) == n_Q)
+      handleNestedFractionsOverQ (f, cf);
+    NUM (result)= p_Copy (DEN (f), ntRing);
+    DEN (result) = NULL;
+    COM (result) = 0;
+  }
   return (number)result;
 }
@@ -1049 +1079 @@
   if (n_IsZero(a, src)) return NULL;
   assume(src == dst->extRing->cf);
-  poly p = p_One(dst->extRing);
+  poly p = p_Init(dst->extRing);
   number na=n_Copy(a, src);
   n_Normalize(na, src);
-  p_SetCoeff(p, na, dst->extRing);
+  p_SetCoeff0(p, na, dst->extRing);
   fraction f = (fraction)omAlloc0Bin(fractionObjectBin);
   NUM(f) = p; DEN(f) = NULL; COM(f) = 0;