expr-codegen 0.8.1__tar.gz → 0.8.2__tar.gz

{expr_codegen-0.8.1 → expr_codegen-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: expr_codegen
-Version: 0.8.1
+Version: 0.8.2
 Summary: symbol expression to polars expression tool
 Author-email: wukan <wu-kan@163.com>
 License: BSD 3-Clause License

expr_codegen-0.8.2/expr_codegen/_version.py

@@ -0,0 +1 @@
+__version__ = "0.8.2"

{expr_codegen-0.8.1 → expr_codegen-0.8.2}/expr_codegen/polars/printer.py

@@ -1,5 +1,5 @@
 from sympy import Basic, Function, StrPrinter
-from sympy.printing.precedence import precedence
+from sympy.printing.precedence import precedence, PRECEDENCE
 
 
 # TODO: 如有新添加函数，但表达式有变更才需要在此补充对应的打印代码，否则可以省略
@@ -55,6 +55,22 @@ class PolarsStrPrinter(StrPrinter):
         PREC = precedence(expr)
         return "%s==%s" % (self.parenthesize(expr.args[0], PREC), self.parenthesize(expr.args[1], PREC))
 
+    def _print_Or(self, expr):
+        PREC = PRECEDENCE["Mul"]
+        return "%s | %s" % (self.parenthesize(expr.args[0], PREC), self.parenthesize(expr.args[1], PREC))
+
+    def _print_Xor(self, expr):
+        PREC = PRECEDENCE["Mul"]
+        return "%s ^ %s" % (self.parenthesize(expr.args[0], PREC), self.parenthesize(expr.args[1], PREC))
+
+    def _print_And(self, expr):
+        PREC = PRECEDENCE["Mul"]
+        return "%s & %s" % (self.parenthesize(expr.args[0], PREC), self.parenthesize(expr.args[1], PREC))
+
+    def _print_Not(self, expr):
+        PREC = PRECEDENCE["Mul"]
+        return "~%s" % self.parenthesize(expr.args[0], PREC)
+
     def _print_gp_rank(self, expr):
         return "cs_rank(%s)" % self._print(expr.args[1])
 

{expr_codegen-0.8.1 → expr_codegen-0.8.2}/expr_codegen/tool.py

@@ -11,6 +11,14 @@ from expr_codegen.expr import get_current_by_prefix, get_children, replace_exprs
 from expr_codegen.model import dag_start, dag_end, dag_middle
 
 
+def simplify2(expr):
+    try:
+        expr = simplify(expr)
+    except AttributeError as e:
+        print(f'{expr} ,表达式无法简化, {e}')
+    return expr
+
+
 class ExprTool:
 
     def __init__(self):
@@ -38,7 +46,7 @@ class ExprTool:
 
         """
         # 抽取前先化简
-        expr = simplify(expr)
+        expr = simplify2(expr)
 
         exprs = []
         syms = []
@@ -87,9 +95,9 @@ class ExprTool:
 
         # 不做改动，直接生成
         for variable, expr in repl:
-            exprs_dict[variable] = simplify(expr)
+            exprs_dict[variable] = simplify2(expr)
         for variable, expr in redu:
-            exprs_dict[variable] = simplify(expr)
+            exprs_dict[variable] = simplify2(expr)
 
         return exprs_dict
 

{expr_codegen-0.8.1 → expr_codegen-0.8.2}/expr_codegen.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: expr_codegen
-Version: 0.8.1
+Version: 0.8.2
 Summary: symbol expression to polars expression tool
 Author-email: wukan <wu-kan@163.com>
 License: BSD 3-Clause License

expr_codegen-0.8.1/expr_codegen/_version.py

@@ -1 +0,0 @@
-__version__ = "0.8.1"