expr-codegen 0.10.1__tar.gz → 0.10.2__tar.gz

{expr_codegen-0.10.1 → expr_codegen-0.10.2}/PKG-INFO

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

expr_codegen-0.10.2/expr_codegen/_version.py

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

{expr_codegen-0.10.1 → expr_codegen-0.10.2}/expr_codegen/codes.py

@@ -2,7 +2,7 @@ import ast
 import re
 from ast import expr
 
-from sympy import Add, Mul, Pow, Eq
+from sympy import Add, Mul, Pow, Eq, Not, Xor
 
 from expr_codegen.expr import register_symbols, dict_to_exprs
 
@@ -372,6 +372,8 @@ def _add_default_type(globals_):
     globals_['Mul'] = Mul
     globals_['Pow'] = Pow
     globals_['Eq'] = Eq
+    globals_['Not'] = Not
+    globals_['Xor'] = Xor
     return globals_
 
 

{expr_codegen-0.10.1 → expr_codegen-0.10.2}/expr_codegen/expr.py

@@ -1,6 +1,6 @@
 from functools import reduce
 
-from sympy import Mul, preorder_traversal, symbols, Function, simplify, Add, Basic, Symbol, sympify
+from sympy import Mul, preorder_traversal, symbols, Function, simplify, Add, Basic, Symbol, sympify, FunctionClass
 
 # 预定义前缀，算子用前缀进行区分更方便。
 # 当然也可以用是否在某容器中进行分类
@@ -23,6 +23,9 @@ def is_symbol(x, globals_):
     if type(s) is type:
         # Eq
         return issubclass(s, Basic)
+    if isinstance(s, FunctionClass):
+        # Not
+        return True
     return False
 
 

{expr_codegen-0.10.1 → expr_codegen-0.10.2}/expr_codegen/tool.py

@@ -127,11 +127,12 @@ class ExprTool:
 
         exprs_dict = {}
 
-        # 不做改动，直接生成
+        # cse前简化一次，cse后不再简化
+        # (~开盘涨停 & 昨收涨停) | (~收盘涨停 & 最高涨停)
         for variable, expr in repl:
-            exprs_dict[variable] = simplify2(expr)
+            exprs_dict[variable] = expr
         for variable, expr in redu:
-            exprs_dict[variable] = simplify2(expr)
+            exprs_dict[variable] = expr
 
         return exprs_dict
 

{expr_codegen-0.10.1 → expr_codegen-0.10.2}/expr_codegen.egg-info/PKG-INFO

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

expr_codegen-0.10.1/expr_codegen/_version.py

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