Crizomb/Python-symbolic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimization of expand in basic_modif.py

Browse source 
Making Expr immutable, and then optimize __hash__ with this
This commit is contained in:
Clément Barthélemy 2024-02-24 02:57:07 +01:00
parent c27d706a26
commit 948e4da10c
6 changed files with 92 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

15
python_symb/TreeModification/basic_modif.py
View file

@ -8,6 +8,7 @@ Number = Union[int, float]
def expand(expr: Expr) -> Expr:
"""
Expand an expression
@ -23,14 +24,22 @@ def expand(expr: Expr) -> Expr:
return expr
match expr:
case Expr(BinOperator() as Op1, [Expr(BinOperator() as Op2, op2_children), right]) if Op2.name in Op1.properties.left_distributive:
return expand(Expr(Op2, [Expr(Op1, [expand(op2_child), expand(right)]) for op2_child in op2_children]))
expanded_right = expand(right)
return expand(Expr(Op2, [Expr(Op1, [op2_child, expanded_right]) for op2_child in op2_children]))
case Expr(BinOperator() as Op1, [left, Expr(BinOperator() as Op2, op2_children)]) if Op2.name in Op1.properties.right_distributive:
return expand(Expr(Op2, [Expr(Op1, [expand(left), expand(op2_child)]) for op2_child in op2_children]))
expanded_left = expand(left)
return expand(Expr(Op2, [Expr(Op1, [expanded_left, op2_child]) for op2_child in op2_children]))
case Expr(BinOperator() as Op, [left, right]):
return Expr(Op, [expand(left), expand(right)])
left_leaf, right_leaf = left.is_leaf, right.is_leaf
if not left_leaf:
left = expand(left)
if not right_leaf:
right = expand(right)
return Expr(Op, [left, right])
return expr