[PATCH 2/3] Make a stronger normalisation for expressions with exponents.

[ginac.git] / ginac / power.h

diff --git a/ginac/power.h b/ginac/power.h
index 0d8eb49e3965ecff5e4ae7d9bee72d475c07701c..f431b7c25c3e412022d662ba01d0f6150b369d63 100644 (file)
--- a/ginac/power.h
+++ b/ginac/power.h
@@ -3,7 +3,7 @@
  *  Interface to GiNaC's symbolic exponentiation (basis^exponent). */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2020 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -59,13 +59,13 @@ public:
        int degree(const ex & s) const override;
        int ldegree(const ex & s) const override;
        ex coeff(const ex & s, int n = 1) const override;
-       ex eval(int level=0) const override;
-       ex evalf(int level=0) const override;
+       ex eval() const override;
+       ex evalf() const override;
        ex evalm() const override;
        ex series(const relational & s, int order, unsigned options = 0) const override;
        ex subs(const exmap & m, unsigned options = 0) const override;
        bool has(const ex & other, unsigned options = 0) const override;
-       ex normal(exmap & repl, exmap & rev_lookup, int level = 0) const override;
+       ex normal(exmap & repl, exmap & rev_lookup, lst & modifier) const override;
        ex to_rational(exmap & repl) const override;
        ex to_polynomial(exmap & repl) const override;
        ex conjugate() const override;
@@ -115,12 +115,12 @@ GINAC_DECLARE_UNARCHIVER(power);
  *  @param e the exponent expression */
 inline ex pow(const ex & b, const ex & e)
 {
-       return power(b, e);
+       return dynallocate<power>(b, e);
 }
 template<typename T1, typename T2>
 inline ex pow(const T1 & b, const T2 & e)
 {
-       return power(ex(b), ex(e));
+       return dynallocate<power>(ex(b), ex(e));
 }
 
 /** Square root expression.  Returns a power-object with exponent 1/2. */