Changeset a5071b9 in git

Timestamp:

Sep 26, 2011, 5:38:26 PM (13 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '98550b669234b32be762076c32b3be2c35188ac4')

Children:

a195edd4d149b8454ad5aea3c914d9bf579f93b4

Parents:

4eb485635d45ce52dc829f85b42fe078e603df55

git-author:

Burcin Erocal <burcin@erocal.org>2011-09-26 17:38:26+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:13:33+01:00

Message:

Fix printing of coefficients in transcendental extensions.

The new logic, taken from legacy Singular for compatibility in test
output, is to omit parenthesis around the denominator and the
numerator if the denominator is 1 and the numerator is a constant.

File:

• libpolys/polys/ext_fields/transext.cc (modified) (1 diff)

libpolys/polys/ext_fields/transext.cc

@@ -829 +829 @@
   {
     fraction f = (fraction)a;
-    BOOLEAN useBrackets = (!p_IsConstant(NUM(f), ntRing)) ||
-                          (!n_GreaterZero(p_GetCoeff(NUM(f), ntRing),
-                                          ntCoeffs));
-    if (useBrackets) StringAppendS("(");
+    // stole logic from napWrite from kernel/longtrans.cc of legacy singular
+    BOOLEAN omitBrackets = p_IsConstant(NUM(f), ntRing) && DENIS1(f);
+    if (!omitBrackets) StringAppendS("(");
     p_String0(NUM(f), ntRing, ntRing);
-    if (useBrackets) StringAppendS(")");
+    if (!omitBrackets) StringAppendS(")");
     if (!DENIS1(f))
     {
       StringAppendS("/");
-      useBrackets = (!p_IsConstant(DEN(f), ntRing)) ||
-                    (!n_GreaterZero(p_GetCoeff(DEN(f), ntRing), ntCoeffs));
-      if (useBrackets) StringAppendS("(");
+      StringAppendS("(");
       p_String0(DEN(f), ntRing, ntRing);
-      if (useBrackets) StringAppendS(")");
+      StringAppendS(")");
     }
   }