Skip to content

Commit

Permalink
develop (#260)
Browse files Browse the repository at this point in the history
* Collect hydro validation errors (AntaresSimulatorTeam#2204)

collect *n* hydro validation errors (10 per area ) before exiting

---------

Co-authored-by: Florian Omnès <[email protected]>

* Remove actions dependencies using node js 16 (AntaresSimulatorTeam#2215)

> Node.js 16 actions are deprecated. Please update the following actions
to use Node.js 20: notiz-dev/github-action-json-property@release. For
more information see:
https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.

---------

Co-authored-by: Florian OMNES <[email protected]>

* Move TS number print (AntaresSimulatorTeam#2228)

Purpose : moving the code that prints the TS numbers on disk : due to
recent changes it was moved after the loop through MC years. So, we have
to wait until simulation ends to know which TS numbers where drawn. So
we move that code back.

* Infeability analyzer : renaming (AntaresSimulatorTeam#2225)

Purpose : as the title says

This PR is attached to ticket [ticket
ANT-1825](https://gopro-tickets.rte-france.com/browse/ANT-1825).
Some improvements were made or tried by taking care of the ticket.
The result is this PR.

---------

Co-authored-by: Florian OMNES <[email protected]>

* Always run clang-format on PR (AntaresSimulatorTeam#2230)

* Add changelog for minor versions (AntaresSimulatorTeam#2229)

- v8.8.6
- v8.6.8

---------

Co-authored-by: Abdoulbari Zaher <[email protected]>
Co-authored-by: Jason Maréchal <[email protected]>

* Infeasibility analyzer : small simplifications (AntaresSimulatorTeam#2226)

Purpose : as the title says

This PR is attached to ticket [ticket
ANT-1825](https://gopro-tickets.rte-france.com/browse/ANT-1825).
Some improvements were made or tried by taking care of the ticket.
The result is this PR.

---------

Co-authored-by: Florian OMNES <[email protected]>

* Fix compile, add boost header in CMakelists (AntaresSimulatorTeam#2233)

* STS: Withdrawal efficiency [ANT-1862] (AntaresSimulatorTeam#2223)

Add a efficiencywithdrawal property to short term storage
This mimics the already existing efficiency for injection

* Infeasibility analyzer : HydroPower constraint (AntaresSimulatorTeam#2227) [ANT-1825]

Add constraint that can possibily lead to infeasibilities. HydroPower is the constraint on the sum of generated hydro energy over the week for a given area. The provided RHS in some cases makes the problem infeasible.

---------

Co-authored-by: Florian OMNES <[email protected]>

* Compilation warnings (AntaresSimulatorTeam#2237)

close  AntaresSimulatorTeam#2236

* Version 9.2 (AntaresSimulatorTeam#2240)

* Fix sonarcloud job (AntaresSimulatorTeam#2246)

* Adequacy Patch regression [ANT-1845] (AntaresSimulatorTeam#2235)

* 9.2 rc 1 (AntaresSimulatorTeam#2247)

* Keep using node js 16 on centos CI (AntaresSimulatorTeam#2248)

* Infeasibility more cleaning (AntaresSimulatorTeam#2231)

We're on the road to make **infeasibility analyzer** more changeable,
more precisely when adding a constraint type to the list of constraints
to be detected in case of infeasibity.
This PR is a step towards this purpose.  
It contains some heterogeneous simplifications and renaming.
In order to ease the review, some comments were added in this PR.

---------

Co-authored-by: Florian OMNES <[email protected]>

* Document clang-format (AntaresSimulatorTeam#2243)

Add version number to avoid confusion.

* Link TS generation : splitting into multiple files (AntaresSimulatorTeam#2171)

This PR aims at moving some code about link TS generation, from **main**
program to new source files.
It follows PR AntaresSimulatorTeam#2155 

To be done : 

- [x] move headers (*.h) to the right place
- [x] update this branch with its base branch (@flomnes made a change on
base branch)

We may also take advantage of this PR to : 
- [ ] Thermal TS generation :
- [ ] avoid loading the **whole study** when **no** thermal TS
generation is required (this is currently the case)
- [ ] move implementation details about thermal TS generation from
**main** program to new source files
- [ ] Separate loading / extracting data from study and generate the TS

---------

Co-authored-by: Florian OMNES <[email protected]>
Co-authored-by: Florian OMNES <[email protected]>

* Explain why MPS are named when the problem is infeasible (AntaresSimulatorTeam#2250)

* Add tests in CI for version 9.2 (AntaresSimulatorTeam#2241)

Co-authored-by: Florian OMNES <[email protected]>

* Rename test-platform to os for windows CI (AntaresSimulatorTeam#2253)

* Fix bug hydro heuristic with mingen (ANT-1825) (AntaresSimulatorTeam#2258)

Removing lines that create infeasibility and that are not necessary.

---------

Co-authored-by: Juliette-Gerbaux <[email protected]>
Co-authored-by: Florian OMNES <[email protected]>

* Infeasibility anaylsis : make it more changeable (AntaresSimulatorTeam#2232)

Create classes for each constraint type, with a common interface. Additional tests to come.

---------

Co-authored-by: Florian OMNES <[email protected]>
Co-authored-by: Florian Omnès <[email protected]>

* Remove manual dynamic memory usage (AntaresSimulatorTeam#2254)

Replaced new[] with vectors
Made RunTimeInfos static

---------

Co-authored-by: Abdoulbari Zaher <[email protected]>
Co-authored-by: Florian Omnès <[email protected]>
Co-authored-by: payetvin <[email protected]>
Co-authored-by: guilpier-code <[email protected]>
Co-authored-by: Florian OMNES <[email protected]>
Co-authored-by: Jason Maréchal <[email protected]>
Co-authored-by: Juliette-Gerbaux <[email protected]>
Co-authored-by: Juliette-Gerbaux <[email protected]>
  • Loading branch information
9 people authored Jul 17, 2024
1 parent 8ad71aa commit a3097ec
Show file tree
Hide file tree
Showing 102 changed files with 1,781 additions and 1,651 deletions.
1 change: 1 addition & 0 deletions .github/workflows/centos7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ env:
IS_RELEASE: ${{ github.event_name == 'workflow_dispatch' }}
IS_PUSH: ${{ github.event_name == 'push' }}
REF: ${{ inputs.target_branch =='' && github.ref_name || inputs.target_branch}}
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

jobs:

Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
name: Check cpp formatting
name: Check cpp formatting using clang 18.1.3

on:
push:
branches:
- develop
- feature/*
- features/*
- fix/*
pull_request:

jobs:
build:
Expand All @@ -28,7 +23,7 @@ jobs:
run: |
DIFF=`git status --porcelain`
if [[ $DIFF ]]; then
echo "The following files are not well formatted"
echo "The following files are not well formatted, please make sure to use clang-format 18.1.3"
echo "$DIFF"
exit 1
else
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/oracle8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,15 @@ jobs:
cpack -G TGZ
- name: Installer TGZ push
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: targz
path: _build/*.tar.gz

- name: Installer RPM push
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: rpm
path: _build/*.rpm

- name: Publish assets
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: SonarCloud

on:
pull_request:
push:
branches:
- develop
pull_request:

jobs:
sonarcloud:
Expand Down
58 changes: 34 additions & 24 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,15 @@ jobs:
cd _build
ctest -C Release --output-on-failure
# simtest
- name: Read simtest version
id: simtest-version
uses: notiz-dev/github-action-json-property@release
with:
path: 'simtest.json'
prop_path: 'version'
run: |
echo 'SIMTEST_JSON<<EOF' >> $GITHUB_ENV
cat ./simtest.json >> $GITHUB_ENV
echo 'EOF' >> $GITHUB_ENV
- name: Export simtest version
run: |
echo "SIMTEST=${{ fromJson(env.SIMTEST_JSON).version }}" >> $GITHUB_ENV
- name: Init submodule
run: |
Expand All @@ -148,7 +150,7 @@ jobs:
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: valid-named-mps
os: ${{ env.os }}
variant: "named-mps"
Expand Down Expand Up @@ -176,72 +178,80 @@ jobs:
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: valid-v830
os: ${{ env.os }}

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

- name: Run tests introduced in v860
- name: Run tests introduced in 8.6.0
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: valid-v860
os: ${{ env.os }}

- name: Run tests introduced in v870
- name: Run tests introduced in 8.7.0
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: valid-v870
os: ${{ env.os }}

- name: Run tests introduced in v910
- name: Run tests introduced in 9.1.0
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: valid-v910
os: ${{ env.os }}

- name: Run tests introduced in 9.2.0
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{ env.SIMTEST }}
batch-name: valid-v920
os: ${{ env.os }}

- name: Run short-tests
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: short-tests
os: ${{ env.os }}

- name: Run mps tests
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: valid-mps
os: ${{ env.os }}

- name: Run tests for adequacy patch (CSR)
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: adequacy-patch-CSR
os: ${{ env.os }}

- name: Run parallel tests
if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: valid-parallel
os: ${{ env.os }}
variant: "parallel"
Expand All @@ -250,7 +260,7 @@ jobs:
if: ${{ env.RUN_SIMPLE_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: ts-generator
os: ${{ env.os }}
variant: "tsgenerator"
Expand All @@ -259,31 +269,31 @@ jobs:
if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: medium-tests
os: ${{ env.os }}

- name: Run long-tests-1
if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: long-tests-1
os: ${{ env.os }}

- name: Run long-tests-2
if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: long-tests-2
os: ${{ env.os }}

- name: Run long-tests-3
if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
simtest-tag: ${{ env.SIMTEST }}
batch-name: long-tests-3
os: ${{ env.os }}

Expand Down
Loading

0 comments on commit a3097ec

Please sign in to comment.