Using the PySCIPOpt logical wrapper for modeling a scheduling problem - #2
Merged
Conversation
* `Expr` and `GenExpr` support `__pos__` now * Update CHANGELOG.md * Add copy method to .pxd file * Variable support copy method * Add test cases for `__pos__` * Update CHANGELOG.md * Update CHANGELOG.md * add @disjoint_base for ExprLike * add better type annotations for `copy` * Add `copy` method for `Constant`
* Annotate several Model methods in the stubs * fixup! Annotate several Model methods in the stubs * Annotate all other Model methods * Annotate new method addMatrixConsDisjunction * Add changelog entry * Fix review findings * More review feedback --------- Co-authored-by: João Dionísio <57299939+Joao-Dionisio@users.noreply.github.com>
* Add comprehensive type tests for expression arithmetic * Add steps to stubs.yml workflow to check generated output * Update mypy baseline after #1220 * Update tests and results after #1227 * Align dimensions of all arrays to 3 To avoid counting shape broadcasting errors as typing errors. Since shape-typing is nearly impossible to achieve, let's assume shapes are correct and focus on typing the operation result. * Ignore deb file in GH workflow * Update baseline results * Pin version of Mypy used * Delete generated tests from repo * Run test generation and baseline together * Lock dependencies used * Remove operations that always error
* Improve baseline script * Type var+1 * type var+constant * type var*constant * type prod_expr**2 * type abs(var) * type var<=3 * type +var * type -var * type +mvar * type exp/log/sqrt/sin/cos * type exp/log/sqrt/sin/cos as methods * type comparison operators better * type binary operators better on Expr * remove noise from GenExpr * remove noise from UnaryExpr * Fix mypy errors * type MatrixExpr basic operations * type abs(matrixexpr) * type expr**int|float * type expr==float * type operations between expr and ndarray * type operations for matrixexpr * type matrixexpr @ * type matrixexpr ** float * type matrixexpr ** ndarray * type genexpr operations * type constant**x * Remove problematic rops for Expr * type genexpr**constant * type comparisons for (Matrix)ExprCons * type most reverse binops * Fix stubtest checks * Remove Expr.__iadd__ stub * Unpin ruff * Review comments
* Add getNNodesLeft method * add getNNodesLeft signature to stub * add getNRuns and refactor statistics tests * add getNReoptRuns * add addNNodes * fix SCIPgetNNodesLeft dtype and reorder methods defintions
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an extension of using logical wrapper of PySCIPOpt to solve the same problem in different modeling aspects.
PMSP_Logical.txt