Changeset 9614bb in git for factory/facFqBivarUtil.cc

Timestamp:

Mar 13, 2013, 4:19:09 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')

Children:

4dafdf52cf2d705ceadc92ee5814b9066fee4125

Parents:

a601d5555bc411c2f00957c8f324951e8d88085f

git-author:

Martin Lee <martinlee84@web.de>2013-03-13 16:19:09+01:00

git-committer:

Martin Lee <martinlee84@web.de>2013-03-22 15:51:38+01:00

Message:

chg: some optimizations to computation of logarithmic derivatives

File:

• factory/facFqBivarUtil.cc (modified) (2 diffs)

factory/facFqBivarUtil.cc

@@ -454 +454 @@
   logDeriv= mulMod2 (q, deriv (G, y), xToL);
 
-  logDeriv= swapvar (logDeriv, x, y);
-  int j= degree (logDeriv) + 1;
+  int j= degree (logDeriv, y) + 1;
   CFArray result= CFArray (j);
+  CFIterator ii;
   for (CFIterator i= logDeriv; i.hasTerms() && !logDeriv.isZero(); i++)
   {
-    if (i.exp() == j - 1)
-    {
-      result [j - 1]= swapvar (i.coeff(), x, y);
-      j--;
-    }
-    else
-    {
-      for (; i.exp() < j - 1; j--)
-        result [j - 1]= 0;
-      result [j - 1]= swapvar (i.coeff(), x, y);
-      j--;
-    }
-  }
-  for (; j > 0; j--)
-    result [j - 1]= 0;
+    for (ii= i.coeff(); ii.hasTerms(); ii++)
+      result[ii.exp()] += ii.coeff()*power (x,i.exp());
+  }
   Q= q;
   return result;
@@ -533 +521 @@
   logDeriv= mulMod2 (q, deriv (G, y), xToL);
 
-  logDeriv= swapvar (logDeriv, x, y);
-  int j= degree (logDeriv) + 1;
+  int j= degree (logDeriv,y) + 1;
   CFArray result= CFArray (j);
+  CFIterator ii;
   for (CFIterator i= logDeriv; i.hasTerms() && !logDeriv.isZero(); i++)
   {
-    if (i.exp() == j - 1)
-    {
-      result [j - 1]= swapvar (i.coeff(), x, y);
-      j--;
-    }
-    else
-    {
-      for (; i.exp() < j - 1; j--)
-        result [j - 1]= 0;
-      result [j - 1]= swapvar (i.coeff(), x, y);
-      j--;
-    }
-  }
-  for (; j > 0; j--)
-    result [j - 1]= 0;
+    for (ii= i.coeff(); ii.hasTerms(); ii++)
+      result[ii.exp()] += ii.coeff()*power (x,i.exp());
+  }
   Q= q;
   return result;