Changeset 486864 in git

Timestamp:

Mar 7, 2014, 3:58:07 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

dbcaa4dc36f3331ba9316e072d2c4c61347c0957

Parents:

36914e05c0ccbede3cb5e25cf2aec8fb52db5905

git-author:

Martin Lee <martinlee84@web.de>2014-03-07 15:58:07+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-03-17 18:31:54+01:00

Message:

chg: added evaluation function that keeps poly integral

File:

• factory/libfac/charset/alg_factor.cc (modified) (1 diff)

factory/libfac/charset/alg_factor.cc

@@ -517 +517 @@
   numt= t1;
   return pi;
+}
+
+CanonicalForm
+evaluate (const CanonicalForm& f, const CanonicalForm& g, const CanonicalForm& h, const CanonicalForm& powH)
+{
+  if (f.inCoeffDomain())
+    return f;
+  CFIterator i= f;
+  int lastExp = i.exp();
+  CanonicalForm result = i.coeff()*powH;
+  i++;
+  while (i.hasTerms())
+  {
+    int i_exp= i.exp();
+    if ((lastExp - i_exp) == 1)
+    {
+      result *= g;
+      result /= h;
+    }
+    else
+    {
+      result *= power (g, lastExp - i_exp);
+      result /= power (h, lastExp - i_exp);
+    }
+    result += i.coeff()*powH;
+    lastExp = i_exp;
+    i++;
+  }
+  if (lastExp != 0)
+  {
+    result *= power (g, lastExp);
+    result /= power (h, lastExp);
+  }
+  return result;
+}
+
+
+/// evaluate f at g/h at v such that powH*f is integral i.e. powH is assumed to be h^degree(f,v)
+CanonicalForm
+evaluate (const CanonicalForm& f, const CanonicalForm& g,
+          const CanonicalForm& h, const CanonicalForm& powH,
+          const Variable& v)
+{
+  if (f.inCoeffDomain())
+  {
+    return f*powH;
+  }
+
+  Variable x = f.mvar();
+  if ( v > x )
+    return f*powH;
+  else  if ( v == x )
+    return evaluate (f, g, h, powH);
+
+  // v is less than main variable of f
+  CanonicalForm result= 0;
+  for (CFIterator i= f; i.hasTerms(); i++)
+    result += evaluate (i.coeff(), g, h, powH, v)*power (x, i.exp());
+  return result;
 }