Changeset 2f6b737 in git

Timestamp:

Mar 20, 2012, 11:47:05 AM (11 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

92add1cbf7a1569ca2508231958e203c89782aa3

Parents:

f531208030784e843b7f5770d9d741e9ebc8260a

git-author:

Martin Lee <martinlee84@web.de>2012-03-20 11:47:05+01:00

git-committer:

Martin Lee <martinlee84@web.de>2012-04-04 14:42:27+02:00

Message:

fix: getTerms2 and patch for coeffs

File:

• factory/facSparseHensel.h (modified) (3 diffs)

factory/facSparseHensel.h

@@ -412 +412 @@
 getTerms2 (const CanonicalForm& F)
 {
+  if (F.inCoeffDomain())
+  {
+    CFArray result= CFArray (1);
+    result[0]= F;
+    return result;
+  }
   CFArray result= CFArray (size (F));
   int j= 0;
@@ -419 +425 @@
   for (CFIterator i= F; i.hasTerms(); i++)
   {
-    for (k= i.coeff(); k.hasTerms(); k++, j++)
-      result[j]= k.coeff()*power (x,i.exp())*power (y,k.exp());
+    if (i.coeff().inCoeffDomain())
+    {
+      result[j]= i.coeff()*power (x,i.exp());
+      j++;
+    }
+    else
+    {
+      for (k= i.coeff(); k.hasTerms(); k++, j++)
+        result[j]= k.coeff()*power (x,i.exp())*power (y,k.exp());
+    }
   }
   sort (result);
@@ -485 +499 @@
 {
   CanonicalForm result= F1;
-  if (F2.level() != 1)
+  if (F2.level() != 1 && !F2.inCoeffDomain())
   {
     int d= degree (F2);