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

Multiple Maximum Generation and Pumping for Hydro (Merging with develop branch) #1723

Merged
merged 152 commits into from
Mar 4, 2024
Merged

Multiple Maximum Generation and Pumping for Hydro (Merging with develop branch) #1723

merged 152 commits into from
Mar 4, 2024

Conversation

nikolaredstork
Copy link
Collaborator

@nikolaredstork nikolaredstork commented Oct 28, 2023 •
edited
Loading

This PR is created due to major changes on the develop branch, that also caused significant changes on the CR23.

Notable changes:

  1. Type of the matrices that represents Maximum Generation and Pumping data is changed into newly implemented type TimeSeries.
  2. Type of the matrices that represents Mean Maximum Generation and Pumping data implemented in AreaScratchpad class is changed into newly implemented type TimeSeries.
  3. These previous changes affected usage of Maximum Generation and Pumping data in solver, which required few changes in solver code.

To do:

  • Discard using raw matrix objects in function class members of the DataHydroSeries class and in unit tests.
  • Change type arguments from Matrix<double>& to TimeSeries& for non-class static functions in src/libs/antares/study/parts/hydro/series.cpp

nikolaredstork and others added 30 commits July 22, 2023 16:52
@nikolaredstork
Maxgen matrix implemented
2b03609
@nikolaredstork
Maxpump matrix implemented
e25aea9
@nikolaredstork
Scenario Builder GUI
9bbe22e
@nikolaredstork
DataSeriesHydro-new matrix for max gen and pump TS's
ab3085f
@nikolaredstork
MC years linked with new hydro MC Scenario Builder Matrix
f2bd3ac
@nikolaredstork
Random number feature
5a80015
@nikolaredstork
Replacing daily values for hourly in solver
f602cc6
@nikolaredstork
HydroHasMod and PumpHasMod
22d74c4
@nikolaredstork
Hydro Modulabe
34a314b
@nikolaredstork
GUI for TS management hydro power credits
0fb26de
@nikolaredstork
Inter and Intra modal feature backend
e2e963a
@nikolaredstork
Auto Transfer function and one comment modification
a4d33db
@nikolaredstork
Comment modification
eee6d08
@nikolaredstork
Refactoring checkHourlyMinMaxGeneration function
a4c1da8
@nikolaredstork
Separate function for checking max gen and pump TS number
827cfb5
@nikolaredstork
Excluding unnecessary function parameter
07ce46b
@nikolaredstork
Excluding unnecessary reference
4b08e13
@nikolaredstork
HydroHasMod and PumpHasMod modification
ede8efc
@nikolaredstork
Change function name
598a474
@nikolaredstork
MD files updated
4554d23
@nikolaredstork
MD file modification
94ca6b7
@nikolaredstork
Merge branch 'develop-new' into feature/maxgen-maxpump-cr23
2ab16dc
@nikolaredstork
Modification after merging with develop-new branch
13db210
@nikolaredstork
Fixing build errors due to migration from raw ptrs to stl vectors
04b6104
@nikolaredstork
Support for old studies fix
1820fda
@nikolaredstork
Separate mingen from maxgen and maxpump
94698f1
@nikolaredstork
New Load function for Hydro Power Credits
75b6263
@Milos-RTEi
fix - random ts number test crash
91435e9
@Milos-RTEi
fix pumpMaxE bug
c672e3a
@nikolaredstork @Milos-RTEi
Separate mingen from maxgen and maxpump
118db9a
@flomnes flomnes modified the milestones: v8.9.0, Sprint 1 Jan 30, 2024
flomnes and others added 3 commits February 5, 2024 11:35
@flomnes @nikolaredstork
In-memory tests for CR23 (#1894)
4392ccc 
Co-authored-by: NikolaIlic <nikola.ilic@redstork-solutions.com>
@flomnes
Merge remote-tracking branch 'github/develop' into feature/max-gen-pu…
016c186 
…mp-cr23-develop-merge
@nikolaredstork @flomnes
CR23 Reference Guide Update (#1904)
f1e84ed 
Co-authored-by: Florian Omnès <26088210+flomnes@users.noreply.github.com>
flomnes
flomnes reviewed Feb 6, 2024
View reviewed changes
src/libs/antares/study/parameters.cpp Outdated Show resolved Hide resolved
src/libs/antares/study/parameters.cpp Outdated Show resolved Hide resolved
@flomnes flomnes modified the milestones: Sprint 1, Sprint 2 Feb 9, 2024
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Feb 21, 2024

Quality Gate Passed Quality Gate passed

Issues
33 New issues

Measures
0 Security Hotspots
29.8% Coverage on New Code
0.4% Duplication on New Code

See analysis details on SonarCloud

@flomnes flomnes merged commit cda3dd5 into develop Mar 4, 2024
5 checks passed
@flomnes flomnes deleted the feature/max-gen-pump-cr23-develop-merge branch March 4, 2024 09:14
@flomnes flomnes mentioned this pull request Mar 14, 2024
Merged
flomnes added a commit that referenced this pull request Mar 14, 2024
@flomnes
Bump SimTest@9.1.0a (#1992)
c091db5 
Add named MPS tests for #1723

- [Generation
only](https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR/tree/main/valid-named-mps/v910-hydro-max-power)
- [Generation and
pumping](https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR/tree/main/valid-named-mps/v910-hydro-max-power-pump)
JasonMarechal25 pushed a commit that referenced this pull request Mar 20, 2024
@flomnes @JasonMarechal25
Bump SimTest@9.1.0a (#1992)
3947ea2 
Add named MPS tests for #1723

- [Generation
only](https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR/tree/main/valid-named-mps/v910-hydro-max-power)
- [Generation and
pumping](https://github.com/AntaresSimulatorTeam/Antares_Simulator_Tests_NR/tree/main/valid-named-mps/v910-hydro-max-power-pump)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guilpier-code guilpier-code guilpier-code left review comments

@watermelon-copilot-for-code-review watermelon-copilot-for-code-review[bot] watermelon-copilot-for-code-review left review comments

@flomnes flomnes flomnes approved these changes

@Milos-RTEi Milos-RTEi Awaiting requested review from Milos-RTEi

Assignees

@nikolaredstork nikolaredstork

Labels
RTE-i 🍉 Safe to Merge size/XXL
Projects
None yet
Milestone
Sprint 2
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@nikolaredstork @flomnes @Milos-RTEi @guilpier-code