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

Jump to bottom

Hydro final lvl (CR 25) to merge in develop [ANT-1084] #1521

Merged
merged 584 commits into from
Jun 21, 2024
Merged

Hydro final lvl (CR 25) to merge in develop [ANT-1084] #1521

merged 584 commits into from
Jun 21, 2024

Conversation

guilpier-code
Copy link
Contributor

@guilpier-code guilpier-code commented Aug 8, 2023 •
edited
Loading

This PR attempts some code enhancements on branch feature/final-reservoir-level-cr25.
Therefore, this PR's associated branch (fix/hydro-final-levels-cr25--try-fixes) is based on feature/final-reservoir-level-cr25.

  • in class FinalLevelInflowsModifier,
    • try to reduce the number of data members,
    • making data members private whenever it's possible,
    • define a clear interface with a smallest number of public functions
    • and so make the more methods private as possible
  • Unit tests : clarify their intention and reduce their size
  • caution : could not remove yet the initialize method. This method should be merged with the constructor, but when we call the constructor, all input pieces of data are not available. that's why initialize exists. We should try to make these pieces of data available, for instance by changing the order of data loading

For any purpose, here are doc resources :

  • specs here
  • a discussion on that matter here

CAUTION :

Some cleaning and corrections were introduced in a new pull request (see this PR).
This new PR was merged into this one.
This PR contains a test under the form of a study.
This study should be downloaded and added to the right test repo.

Left to to

  • Merge from branch develop and remove conflicts
  • Check that all tests exist (unit test for raising failures and study case for fine working)
  • what else ?

Milos-RTEi and others added 30 commits August 24, 2022 11:11
@Milos-RTEi
make solveCSR private method
b4ad703
@Milos-RTEi
use auto instead of std::unique_ptr<PROBLEME_POINT_INTERIEUR>
c865631
@Milos-RTEi
float->double
20d0bd3
@Milos-RTEi
remove saveIntermediateResults
0164441
@Milos-RTEi
Merge pull request #70 from rte-i/feature/issue66-update
a5e6bd7 
CSR comments implementation update
@Milos-RTEi
Merge pull request #69 from rte-i/feature/issue66-update
24981ce 
Issue-66 update
@flomnes
Merge pull request #825 from rte-i/feature/issue66-milos
d49872e 
Implement latest CSR comments
@Milos-RTEi
code smells parameters.cpp
13dfa74
@Milos-RTEi
critical-CodeSmell-adequacy_patch.cpp
e90b8a0
@Milos-RTEi
critical-codeSmells- set_problem_cost.cpp
3bfd490
@Milos-RTEi
info-CodeSmell - remove todo-s
98363bc
@Milos-RTEi
CodeSmells - global var should be const
9601788
@Milos-RTEi
NULL->nullptr
f9d0d2c
@Milos-RTEi
use default destructor
9516295
@Milos-RTEi
protected->private in adq-patch-area-grid.h
0a39ad3
@Milos-RTEi
use default constructor in adequacy-patch-areas
f21aa54
@Milos-RTEi
Add the "explicit" keyword to AdequacyPatchAreas constructor
f10f145
@Milos-RTEi
NULL->nullptr in adequacy-patch-options.cpp
a6f7980
@Milos-RTEi
= default, AdequacyPatchOptions
76bf599
@Milos-RTEi
Add the "explicit" keyword to AdequacyPatchOptions constructor
f56b69a
@Milos-RTEi
Remove these useless parentheses
2760657
@Milos-RTEi
Remove these useless parentheses
f560f72
@Milos-RTEi
Remove the unused parameter "weekNb",
aecaa1f
@Milos-RTEi
Move these 4 #include directives to the top of the file
122e005
@Milos-RTEi
declaration shadows a local variable
606a77b
@Milos-RTEi
Value stored to 'ProblemeAResoudre' is never read
d7865c2
@Milos-RTEi
function should be declared "const"
f334819
@Milos-RTEi
Use "std::make_unique" to construct "std::unique_ptr
f4ac2b9
@Milos-RTEi
Value stored to 'out' during its initialization is never read
82b419c
@Milos-RTEi
major-CodeSmells-adequacy-patch-options.cpp
49a68ec
This was referenced Dec 21, 2023
Merged
Merged
Merged
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

The SonarCloud Quality Gate passed, but some issues were introduced.

20 New issues
0 Security Hotspots
73.6% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
21 New issues
0 Accepted issues

Measures
0 Security Hotspots
73.6% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@flomnes flomnes modified the milestones: v8.9.0, 9.2 May 2, 2024
@guilpier-code
Hydro final levels (CR 25) : corrections and cleaning (#2040)
e12eb48 
See comments to know more about this PR intentions.

Furthermore, a study testing final levels can be found here below.
Please read this study's user's notes for the test goals and how to
fulfill them.


[final-levels.zip](https://github.com/AntaresSimulatorTeam/Antares_Simulator/files/15126508/final-levels.zip)
@flomnes flomnes changed the title Hydro final lvl (CR 25) to merge in develop Hydro final lvl (CR 25) to merge in develop [ANT-1084] Jun 10, 2024
@flomnes flomnes modified the milestones: 9.2, Sprint 5 Jun 10, 2024
@flomnes
Copy link
Member

flomnes commented Jun 17, 2024

Final reservoir level not applicable should be a warning, not an info

flomnes
flomnes requested changes Jun 17, 2024
View reviewed changes
src/libs/antares/study/include/antares/study/scenario-builder/rules.h Outdated Show resolved Hide resolved
src/antares-deps Outdated Show resolved Hide resolved
src/libs/antares/study/parts/hydro/finalLevelValidator.cpp Outdated Show resolved Hide resolved
guilpier-code and others added 3 commits June 18, 2024 11:02
@guilpier-code
Merge branch 'develop' into fix/hydro-final-levels-cr25--try-fixes
904d5a2
@guilpier-code
CR 25 (hydro final level) : corrections due to review
76237a6
@guilpier-code
Fixing hydro debug (#2176)
9794966 
Recall : **Hydro allocation** is done at the beginning of each MC year,
and ends with a quantity of hydro energy for each day of the year. These
daily quantities are to be used as daily hydro generations in the
optimization problem.

The **hydro debug** functionality allows to print (if asked by user) on
disk a **report** about **hydro allocation results**.

This hydro allocation report is broken (a crash comes up). It was broken
since January 2023 (a commit can be supplied if needed).

This PR to fix this crash.
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
B Maintainability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@flomnes flomnes dismissed Milos-RTEi’s stale review June 21, 2024 11:42

remarks have been applied

@flomnes flomnes merged commit b3f3fc0 into develop Jun 21, 2024
6 of 7 checks passed
@flomnes flomnes deleted the fix/hydro-final-levels-cr25--try-fixes branch June 21, 2024 11:42
@flomnes flomnes mentioned this pull request Jun 24, 2024
Merged
@flomnes flomnes modified the milestones: Sprint 5, Sprint 6 Jun 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Milos-RTEi Milos-RTEi Milos-RTEi left review comments

@flomnes flomnes flomnes approved these changes

@hugo-antoine-rtei hugo-antoine-rtei Awaiting requested review from hugo-antoine-rtei

@nikolaredstork nikolaredstork Awaiting requested review from nikolaredstork

Assignees
No one assigned
Labels
code enhancement New feature or request RTE-i size/XXL
Projects
RTE / RTE-i
Status: Technical design
Milestone
Sprint 6
Development

Successfully merging this pull request may close these issues.
4 participants
@guilpier-code @Milos-RTEi @flomnes @nikolaredstork