Skip to content

Fix TerminalExpr #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yguclu wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Fix TerminalExpr #129

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cdddd1
Update TerminalExpr.eval()
yguclu Jun 12, 2023
5f6044c
Do not use exp as a variable
yguclu Jun 12, 2023
0a1e038
general trigonometric function -test
Jun 22, 2023
51e6af4
add generic hyperbolic or trigonometric function in eval
Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions sympde/expr/evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@
from sympy import Abs, S, cacheit
from sympy import Indexed, Matrix, ImmutableDenseMatrix
from sympy import expand
from sympy import exp, sin, cos
from sympy.core import Basic, Symbol
from sympy.core import Add, Mul, Pow
from sympy.core.expr import AtomicExpr
from sympy.core.containers import Tuple
from sympy.simplify.simplify import simplify
from sympy.functions.elementary.trigonometric import TrigonometricFunction
from sympy.functions.elementary.hyperbolic import HyperbolicFunction

from sympde.core.basic import _coeffs_registery
from sympde.core.basic import CalculusFunction
Expand Down Expand Up @@ -543,9 +546,14 @@ def eval(cls, expr, domain):
return Abs(cls.eval(expr.args[0], domain=domain))

elif isinstance(expr, Pow):
base = cls.eval(expr.base, domain=domain)
exp = cls.eval(expr.exp, domain=domain)
return base**exp
b = cls.eval(expr.base, domain=domain)
e = cls.eval(expr.exp , domain=domain)
return b ** e

elif isinstance(expr, (TrigonometricFunction,HyperbolicFunction)): # TODO [YG 12.06.2023]: use generic SymPy type

args = [cls.eval(a, domain=domain) for a in expr.args]
return type(expr)(*args)

elif isinstance(expr, JacobianSymbol):
axis = expr.axis
Expand Down