Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Feature: Merge Expr and GenExpr #1114

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
Zeroto521 wants to merge 215 commits into
base: master
Choose a base branch
Loading
from
Draft

Feature: Merge Expr and GenExpr #1114

Changes from 1 commit
Commits
Show all changes
215 commits
Select commit Hold shift + click to select a range
58c34c0
Feature: merge `Expr` and `GenExpr`
Zeroto521 Oct 28, 2025
4cbc603
Rename _unary to _to_unary_expr in expr.pxi
Zeroto521 Oct 28, 2025
188b3ef
Remove `Variable.create`
Zeroto521 Oct 28, 2025
193ec1c
Specify type of _lhs and _rhs as object in ExprCons
Zeroto521 Nov 7, 2025
c70e305
Merge branch 'master' into issue/1074
Zeroto521 Nov 8, 2025
d8d63d2
lint codes
Zeroto521 Nov 8, 2025
a0086d2
Change Variable constructor to use __cinit__
Zeroto521 Nov 8, 2025
123f36e
MAINT: Support return solution
Zeroto521 Nov 10, 2025
c961db5
Add return type annotations to _normalize methods
Zeroto521 Nov 10, 2025
0b01b08
Remove adding 0
Zeroto521 Nov 10, 2025
28e6673
MAINT: use class inner method to instead
Zeroto521 Nov 10, 2025
e4f48b5
Replace 'terms' with 'children' in Expr usage
Zeroto521 Nov 10, 2025
7d85fd0
lint codes
Zeroto521 Nov 10, 2025
f7159a0
Correct `_evaluate` cython syntax
Zeroto521 Nov 17, 2025
69737c0
Correct name: `PowerExpr` → `PowExpr`
Zeroto521 Nov 18, 2025
09a222b
Refactor expression to node conversion
Zeroto521 Nov 18, 2025
2b0fa85
Merge branch 'master' into issue/1074
Zeroto521 Nov 18, 2025
0b7ee70
Revert 188b3efa "Remove `Variable.create`"
Zeroto521 Nov 18, 2025
cc28588
Refactor Expr to standard Python class
Zeroto521 Nov 18, 2025
8719b91
Simplify comparison
Zeroto521 Nov 18, 2025
84886b3
Revert "MAINT: use class inner method to instead"
Zeroto521 Nov 18, 2025
955a9e0
Change cdef classes to Python classes in expr.pxi
Zeroto521 Nov 18, 2025
88aa0b4
lint codes
Zeroto521 Nov 18, 2025
d4bf9b7
Remove unused Expr class from scip.pxd
Zeroto521 Nov 18, 2025
b5f0435
Refactor ExprCons to Python class with type hints
Zeroto521 Nov 18, 2025
ece0ce0
Remove Cython related annotations
Zeroto521 Nov 18, 2025
7811406
Refactor tests to use Expr instead of GenExpr
Zeroto521 Nov 18, 2025
72efd0a
Remove `GenExpr`
Zeroto521 Nov 18, 2025
73777a4
Add __hash__ method to Variable class
Zeroto521 Nov 18, 2025
c0c14ae
Replace > and < with <= and >=
Zeroto521 Nov 18, 2025
900bc81
Support Variable type in matrix comparison
Zeroto521 Nov 18, 2025
003f3a6
Move degree() method from subclasses to Expr base class
Zeroto521 Nov 18, 2025
810a60d
support `Expr() + 1`
Zeroto521 Nov 18, 2025
0c406bb
Update degree test for empty expression
Zeroto521 Nov 18, 2025
dd2b02d
Replace `.terms` with `.children`
Zeroto521 Nov 18, 2025
c139de4
Replace `.vartuple` with `.vars`
Zeroto521 Nov 18, 2025
a7ba203
Fix operator overloads in Expr class
Zeroto521 Nov 18, 2025
3fbd24f
Replace __ge__ with __eq__ in Expr class
Zeroto521 Nov 18, 2025
ea9bb38
Support `variable[variable]`
Zeroto521 Nov 19, 2025
c17e4a5
Add iterator support to Variable class
Zeroto521 Nov 19, 2025
790319e
Refactor objective expression type handling
Zeroto521 Nov 19, 2025
7373021
Empty Expr * other Expr return empty Expr
Zeroto521 Nov 20, 2025
8876f64
Revert "support `Expr() + 1`"
Zeroto521 Nov 20, 2025
e1e1dac
support `_to_nodes`
Zeroto521 Nov 20, 2025
f5a4144
Support `__rpow__`
Zeroto521 Nov 20, 2025
3e3f2bd
Sort methods
Zeroto521 Nov 20, 2025
b9936f0
Merge branch 'master' into issue/1074
Joao-Dionisio Nov 20, 2025
e60e3ce
Support `__abs__`
Zeroto521 Nov 20, 2025
162f6f2
Expr requires Variable, Term, or Expr
Zeroto521 Nov 20, 2025
b3698de
`to_const_or_var` → `from_const_or_var`
Zeroto521 Nov 20, 2025
718fb67
Allow __getitem__ to accept non-Expr keys
Zeroto521 Nov 20, 2025
33695c4
Allow Term objects as keys in Expr __getitem__
Zeroto521 Nov 20, 2025
73a5a21
Use PolynomialExpr in quicksum and quickprod
Zeroto521 Nov 20, 2025
da49cca
Fix division logic for Expr with hash check
Zeroto521 Nov 22, 2025
2977310
Filter 0 coefficient from SumExpr
Zeroto521 Nov 22, 2025
b270aa8
Use Hashable for hash check in Expr division
Zeroto521 Nov 23, 2025
bb3f871
Improve type checks and constructors in expression classes
Zeroto521 Nov 23, 2025
29a7e2a
Term support return `_to_nodes`
Zeroto521 Nov 23, 2025
7f75a55
Add type annotations to expression classes and functions
Zeroto521 Nov 23, 2025
bd00b91
Refactor number type checks to use numbers.Number
Zeroto521 Nov 23, 2025
337803b
Handle Number type in UnaryExpr constructor
Zeroto521 Nov 23, 2025
d0776b1
Add type annotations to expression classes
Zeroto521 Nov 23, 2025
d74fbfa
Move `_to_unary_expr` to UnaryExpr class inner
Zeroto521 Nov 23, 2025
882a1b1
Update exception type in power operation test
Zeroto521 Nov 23, 2025
b971304
Refactor quicksum and quickprod implementations
Zeroto521 Nov 23, 2025
d56b5db
Improve addition logic for Expr classe
Zeroto521 Nov 23, 2025
ca5aae2
Refactor degree calculation in expression classes
Zeroto521 Nov 23, 2025
3a599a5
Fix node construction logic in expression classes
Zeroto521 Nov 23, 2025
0e7223b
Fix degree calculation for empty expression children
Zeroto521 Nov 23, 2025
86d60f7
Improve ExprCons initialization and validation
Zeroto521 Nov 23, 2025
659fb2b
Set default CONST term in Expr children
Zeroto521 Nov 25, 2025
36f46cc
Fix degree test for empty expression
Zeroto521 Nov 25, 2025
726561c
Update expected values in equation tests
Zeroto521 Nov 25, 2025
0edf545
Remove unused test_degree (it for GenExpr)
Zeroto521 Nov 25, 2025
1b4719e
Improve multiplication logic in Expr class
Zeroto521 Nov 25, 2025
1b481eb
Update inequality test assertions in test_expr.py
Zeroto521 Nov 25, 2025
cb9e8c2
Revert "Set default CONST term in Expr children"
Zeroto521 Nov 25, 2025
a679683
Refactor zero-removal logic in SumExpr and PolynomialExpr
Zeroto521 Nov 25, 2025
835feeb
Fix addition behavior for Expr with no children
Zeroto521 Nov 25, 2025
1cf3a79
Update degree test for empty expression
Zeroto521 Nov 25, 2025
fe7027e
Refactor Expr and ProdExpr multiplication logic
Zeroto521 Nov 26, 2025
64097ee
Merge SumExpr into Expr
Zeroto521 Nov 26, 2025
a0f3f57
Reorder imports and reformat addMatrixVar and addCons loop
Zeroto521 Nov 26, 2025
8c9d155
Speed up via avoid copying dict itself
Zeroto521 Nov 26, 2025
697d971
Drop `ptrs` from Term
Zeroto521 Nov 27, 2025
9e73d13
support the same base ProdExpr to add
Zeroto521 Nov 27, 2025
769a0c9
Add __slots__ attr for Expr
Zeroto521 Nov 27, 2025
0a32157
`Expr._normalize` will change itself now
Zeroto521 Nov 28, 2025
c118c47
Add type hints in ExprCons
Zeroto521 Nov 28, 2025
fd9ed81
Remove __next__ method
Zeroto521 Nov 28, 2025
1e22c8b
Speed up accessing the first child
Zeroto521 Nov 28, 2025
9555844
Use .append and .extend to add value to list
Zeroto521 Nov 28, 2025
f00c5f1
Use ConstExpr(1) instead of 1
Zeroto521 Dec 1, 2025
2b70039
Refactor sum expression type check in Expr class
Zeroto521 Dec 1, 2025
f9525cc
Cythonize Expr and ExprCons
Zeroto521 Dec 2, 2025
df44fcd
Cythonize Term
Zeroto521 Dec 2, 2025
f41fb88
Drop _remove_zero
Zeroto521 Dec 2, 2025
bc54cab
Drop `Variable.to_expr`
Zeroto521 Dec 3, 2025
5bc41f5
BUG: add coef to node if coef != 1
Zeroto521 Dec 3, 2025
45b38f9
Add degree method to Variable class
Zeroto521 Dec 3, 2025
06e77c2
Simplify a bit
Zeroto521 Dec 3, 2025
41dd48b
Fix Variable.__iadd__ to use MonomialExpr
Zeroto521 Dec 3, 2025
7cf94cd
Refactor Expr class and restore _is_SumExpr method
Zeroto521 Dec 4, 2025
ab57fea
Add in-place addition to ConstExpr and MonomialExpr
Zeroto521 Dec 4, 2025
f94da07
Merge branch 'master' into issue/1074
Zeroto521 Dec 4, 2025
adbd38e
Refactor _is_SumExpr to instance method in Expr
Zeroto521 Dec 6, 2025
4775060
Refactor expression classes and type annotations
Zeroto521 Dec 6, 2025
a41c470
Change Variable.degree return type to float
Zeroto521 Dec 6, 2025
84ce732
Add type check for Term constructor arguments
Zeroto521 Dec 6, 2025
b8c3466
Update __iter__ return type in Expr class
Zeroto521 Dec 6, 2025
3efdff2
Expr only receives Term and Expr
Zeroto521 Dec 6, 2025
d5ae65e
Refactor _to_node methods for expression classes
Zeroto521 Dec 6, 2025
94ac5ef
Optimize addition with zero constant expressions
Zeroto521 Dec 6, 2025
9e3b11a
Merge branch 'master' into issue/1074
Zeroto521 Dec 6, 2025
6148e8d
Add copy option to Expr.to_dict and optimize __iadd__
Zeroto521 Dec 6, 2025
0398a66
add type to calculate hash value for FuncExpr
Zeroto521 Dec 6, 2025
b8a23ba
Optimize in-place addition and implement in-place subtraction for Expr
Zeroto521 Dec 6, 2025
56a82cc
Fix Expr comparison logic with MatrixExpr
Zeroto521 Dec 7, 2025
c07fdc3
Fix comparison logic in Expr class
Zeroto521 Dec 8, 2025
4ffc79f
Add negative to `coeffs` test_customizedbenders.py
Zeroto521 Dec 8, 2025
2ce7501
Rename Term.HASH to Term._hash for clarity
Zeroto521 Dec 9, 2025
e40dbd8
Fix degree calculation for empty expression children
Zeroto521 Dec 9, 2025
50d9d68
Fix degree test for empty expression
Zeroto521 Dec 9, 2025
1999e88
change `relevant_value` to float in readStatistics
Zeroto521 Dec 9, 2025
744d421
Refactor expression type checks in expr.pxi
Zeroto521 Dec 11, 2025
8f9e804
Add in-place mul and sub operators to Variable
Zeroto521 Dec 11, 2025
02ca24e
Add in-place multiplication support to Expr class
Zeroto521 Dec 13, 2025
b9e8a02
Add __iadd__ method to ProdExpr and new config file
Zeroto521 Dec 13, 2025
33e1244
Add in-place multiplication to ProdExpr
Zeroto521 Dec 13, 2025
d43639b
Refactor child equality and hashing in FuncExpr
Zeroto521 Dec 13, 2025
26e3f49
Enhance PowExpr and LogExpr operator overloading
Zeroto521 Dec 13, 2025
d4b1f36
Remove lint
Zeroto521 Dec 13, 2025
67ea9b7
Fix sign error in dual solution coefficient calculation
Zeroto521 Dec 13, 2025
ac3bb7f
Drop test_upgrade
Zeroto521 Dec 13, 2025
fa87e36
Speed a little via checking empty first
Zeroto521 Dec 13, 2025
fb07597
Remove test_eq.py and test_ge.py test scripts
Zeroto521 Dec 13, 2025
5e381da
Delete config
Zeroto521 Dec 13, 2025
a73767e
Create test_term.py
Zeroto521 Dec 13, 2025
46c5f41
check error inputting into Expr
Zeroto521 Dec 13, 2025
2333cb4
Add test for slots enforcement in Expr and related classes
Zeroto521 Dec 13, 2025
c402e04
reorder test_expr_op_expr
Zeroto521 Dec 13, 2025
7a28c54
Add equality tests for Term class
Zeroto521 Dec 13, 2025
466b9e8
Add tests for Term __getitem__ behavior
Zeroto521 Dec 13, 2025
8e2dfe3
Rename test functions for clarity in test_expr.py
Zeroto521 Dec 13, 2025
5a4f5f7
Add Expr __getitem__ tests
Zeroto521 Dec 13, 2025
e902cf4
Add test for abs() on Expr objects
Zeroto521 Dec 13, 2025
4a86658
Add tests for Expr._fchild() method
Zeroto521 Dec 13, 2025
649a782
Add tests for unsupported type addition in Expr
Zeroto521 Dec 13, 2025
6d45eed
Add tests for Expr multiplication with invalid types
Zeroto521 Dec 13, 2025
84966df
Add tests for Expr division operations
Zeroto521 Dec 13, 2025
e0ea9a3
Add test for Expr power operation with exponent 0
Zeroto521 Dec 13, 2025
121af2c
Add tests for Expr rpow (__rpow__) behavior
Zeroto521 Dec 13, 2025
8b478c5
Fix FuncExpr can't access children
Zeroto521 Dec 13, 2025
900132a
Use identity comparison in test_getitem assertion
Zeroto521 Dec 13, 2025
42cd9ae
Expand and rename test for Expr multiplication
Zeroto521 Dec 13, 2025
b3129a7
Simplify Expr init
Zeroto521 Dec 14, 2025
95d9a03
Refactor tests to use explicit Model instances
Zeroto521 Dec 14, 2025
958e1bb
Refactor tests to use shared model fixture
Zeroto521 Dec 14, 2025
d302831
Refactor ProdExpr to use dict.fromkeys for children
Zeroto521 Dec 14, 2025
31bae2b
Refactor UnaryExpr.to_subclass type handling
Zeroto521 Dec 14, 2025
2221868
Add __bool__ method to Expr and refactor checks
Zeroto521 Dec 14, 2025
d1e94da
Handle the FuncExpr add itself
Zeroto521 Dec 14, 2025
431d4a0
handle adding 0 or 1 in Expr not the subclass
Zeroto521 Dec 14, 2025
1c5b3d8
Refactor variable naming from 'terms' to 'children'
Zeroto521 Dec 15, 2025
c931f40
Rename parameter in Term.__getitem__ method
Zeroto521 Dec 17, 2025
5d4cea9
Add iterator support to Term class
Zeroto521 Dec 17, 2025
9893145
Make _hash attribute readonly and improve __eq__ check
Zeroto521 Dec 17, 2025
c2f3a87
Update Term equality tests for non-Term comparisons
Zeroto521 Dec 20, 2025
d9f8522
Update __hash__ methods for Expr and PolynomialExpr
Zeroto521 Dec 20, 2025
b451bf8
Add explicit type casts in ExprCons methods
Zeroto521 Dec 20, 2025
7342e88
Rename to_subclass to _to_subclass in UnaryExpr
Zeroto521 Dec 20, 2025
2a1466b
Cast Number to float in UnaryExpr initialization
Zeroto521 Dec 20, 2025
07594f3
Optimize subtraction for identical Expr operands
Zeroto521 Dec 20, 2025
dd9d490
Add copy methods to expression classes
Zeroto521 Dec 20, 2025
66e83c0
Add _is_equal method to Expr class
Zeroto521 Dec 20, 2025
37b44b4
Add static method to check for zero constant expr
Zeroto521 Dec 20, 2025
d7f12dc
Add _ExprKey helper class and refactor sum handling in Expr
Zeroto521 Dec 20, 2025
f17d118
Cast children to dict in PolynomialExpr constructor
Zeroto521 Dec 20, 2025
22edc8d
Refactor: rename from_const_or_var to _from_const_or_var
Zeroto521 Dec 20, 2025
b912a0f
Rename to_subclass to _to_subclass in PolynomialExpr
Zeroto521 Dec 20, 2025
067002e
Refactor Expr: rename _is_Const and _is_Sum to snake_case
Zeroto521 Dec 20, 2025
4f75edc
Replace to_dict with _to_dict in Expr and PolynomialExpr
Zeroto521 Dec 20, 2025
250a8d4
Use _ExprKey to wrap key of Expr._children
Zeroto521 Dec 20, 2025
0255176
Enforce Expr type for objective functions
Zeroto521 Dec 20, 2025
05f131f
Refactor to use _children instead of children in Expr
Zeroto521 Dec 20, 2025
6569711
Rename and expand Expr tests for consistency
Zeroto521 Dec 20, 2025
b84bea6
Remove type check for dict in _merge_dicts method
Zeroto521 Dec 20, 2025
0f13f42
Refactor variable names in __imul__ method of Expr
Zeroto521 Dec 20, 2025
71af1bd
Handle zero coefficient in Expr._to_node
Zeroto521 Dec 20, 2025
3152d43
Fix indentation in Expr class for sum handling
Zeroto521 Dec 20, 2025
cc655e1
Optimize in-place multiplication for Expr sums
Zeroto521 Dec 20, 2025
bb842e3
Correct type from Term to Variable
Zeroto521 Dec 20, 2025
26529d2
Make MonomialExpr.from_var a private method
Zeroto521 Dec 20, 2025
8283c03
Add NotImplementedError for ExprCons equality
Zeroto521 Dec 20, 2025
520543c
Remove redundant bound checks in ExprCons
Zeroto521 Dec 20, 2025
1b0a0b3
Refactor ExprCons comparison operator type checks
Zeroto521 Dec 20, 2025
220e41b
Update constructor argument types to Cython syntax
Zeroto521 Dec 20, 2025
9089eea
Remove MonomialExpr and use PolynomialExpr for variables
Zeroto521 Dec 20, 2025
4689522
zero-check including empty-check
Zeroto521 Dec 21, 2025
73475b1
Fix type in ConstExpr call in Expr.__ge__ method
Zeroto521 Dec 21, 2025
697d090
Update _to_subclass signature in PolynomialExpr
Zeroto521 Dec 21, 2025
1fd8076
Fix argument order in UnaryExpr._to_subclass calls
Zeroto521 Dec 21, 2025
8304ebc
Refactor in-place addition for Expr and subclasses
Zeroto521 Dec 21, 2025
72e6320
Make ExprCons attributes readonly
Zeroto521 Dec 21, 2025
93027db
Change Term.vars and _ExprKey.expr to readonly attributes
Zeroto521 Dec 21, 2025
5a069db
Refactor expression comparison methods using __richcmp__
Zeroto521 Dec 21, 2025
e89e0d9
Make `Term._hash` to private attribute
Zeroto521 Dec 22, 2025
6a81522
Update Term tests to expect Variable instead of Term
Zeroto521 Dec 22, 2025
2d913d4
Refactor Expr subclass conversion logic
Zeroto521 Dec 22, 2025
bb91803
Create test_PolynomialExpr.py
Zeroto521 Dec 22, 2025
22e9cd4
Simplify Expr.__hash__ due to _ExprKey.__eq__
Zeroto521 Dec 22, 2025
4d1b54a
Cast result of __add__ to Expr in comparison ops
Zeroto521 Dec 22, 2025
c91e459
Reorder __slots__ and cdef readonly attributes in expr.pxi
Zeroto521 Dec 22, 2025
02774f0
Refactor quicksum and quickprod for type safety and speed
Zeroto521 Dec 23, 2025
b5a1037
Refactor unary functions via numpy ufunc
Zeroto521 Dec 23, 2025
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
Prev Previous commit
Next Next commit
Merge branch 'master' into issue/1074
  • Loading branch information
@Zeroto521
Zeroto521 authored Dec 6, 2025
commit 9e3b11a6df2fa66d591ac9732f7f54ca477464d8

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.
Morty Proxy This is a proxified and sanitized view of the page, visit original site.