Skip to content
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

Add tests for MILP using CBC #1840

Merged
merged 10 commits into from
Dec 21, 2023
+25 −1
Merged

Add tests for MILP using CBC #1840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e7c21b0
Version 8.8.0-rc4
flomnes Nov 21, 2023
7833a86
RC=5, fix changelog
flomnes Nov 23, 2023
c093c1c
Merge remote-tracking branch 'github/develop' into release/8.8.x
flomnes Nov 23, 2023
26fd35e
Add E2E tests on MILP + CBC
flomnes Dec 8, 2023
628f070
Add `enabled` property for ST storage objects, fix bug related to sav…
flomnes Dec 19, 2023
0147dc4
Changelog for v8.8.0, rc=0
flomnes Dec 19, 2023
d3babfe
Add changelog
flomnes Dec 19, 2023
1ba5471
Merge remote-tracking branch 'github/develop' into release/8.8.x
flomnes Dec 19, 2023
facd84d
Partial revert
flomnes Dec 21, 2023
b8494ec
Partial revert
flomnes Dec 21, 2023
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
9 changes: 9 additions & 0 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,15 @@ jobs:
batch-name: valid-v830
os: ${{ matrix.test-platform }}

- name: Run MILP with CBC
if: ${{ env.IS_PUSH == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
batch-name: valid-milp
variant: "milp-cbc"
os: ${{ matrix.test-platform }}

- name: Run tests introduced in v860
if: ${{ env.IS_PUSH == 'true' }}
uses: ./.github/workflows/run-tests
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/windows-vcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,15 @@ jobs:
batch-name: valid-v830
os: ${{ matrix.test-platform }}

- name: Run MILP with CBC
if: ${{ env.IS_PUSH == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
batch-name: valid-milp
variant: "milp-cbc"
os: ${{ matrix.test-platform }}

- name: Run tests introduced in v860
uses: ./.github/workflows/run-tests
with:
Expand Down
2 changes: 1 addition & 1 deletion simtest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "v8.7.2"
"version": "v8.8.0-rc1"
}
6 changes: 6 additions & 0 deletions src/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ if(Python3_Interpreter_FOUND)
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/run-study-tests"
)

add_test(
NAME milp-cbc
COMMAND Python3::Interpreter -m pytest -m json --solver-path=$<TARGET_FILE:antares-solver> --use-ortools --ortools-solver coin
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/run-study-tests"
)

add_test(
NAME parallel
COMMAND Python3::Interpreter -m pytest -m json --solver-path=$<TARGET_FILE:antares-solver> --force-parallel
Expand Down