Changeset ed95e6 in git for libpolys/polys

Timestamp:

May 2, 2013, 1:24:58 PM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2391e43dac272afc25f70e4de19ef94ec0950d2b

Parents:

121d2ae145e99602da1f3d3014e3f2c045d7185a

Message:

chg: sing->factory conversion, allow fractions in Q

File:

• libpolys/polys/clapconv.cc (modified) (1 diff)

libpolys/polys/clapconv.cc

@@ -319 +319 @@
   {
     n_Normalize(p_GetCoeff(p, r), r->cf);
-    CanonicalForm term=convSingPFactoryP(NUM(p_GetCoeff(p, r)),r->cf->extRing);
-
-    if ((DEN(p_GetCoeff(p,r))!=NULL)
-    && (!errorreported))
-    {
+
+    // test if denominator is constant
+    if (!p_IsConstantPoly(DEN (p_GetCoeff (p,r)),r) && !errorreported)
       WerrorS("conversion error: denominator!= 1");
+
+    CanonicalForm term=convSingPFactoryP(NUM (p_GetCoeff(p, r)),r->cf->extRing);
+
+    // if denominator is not NULL it should be a constant at this point
+    if (DEN (p_GetCoeff(p,r)) != NULL)
+    {
+      CanonicalForm den= convSingPFactoryP(DEN (p_GetCoeff(p, r)),r->cf->extRing);
+      if (rChar (r) == 0)
+        On (SW_RATIONAL);
+      term /= den;
     }