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.

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

Multiple Maximum Generation and Pumping for Hydro (RTEi's -> CR23) #1470

Closed
wants to merge 92 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
2b03609
Maxgen matrix implemented
nikolaredstork Jul 13, 2023
e25aea9
Maxpump matrix implemented
nikolaredstork Jul 13, 2023
9bbe22e
Scenario Builder GUI
nikolaredstork Jul 22, 2023
ab3085f
DataSeriesHydro-new matrix for max gen and pump TS's
nikolaredstork Jul 22, 2023
f2bd3ac
MC years linked with new hydro MC Scenario Builder Matrix
nikolaredstork Jul 22, 2023
5a80015
Random number feature
nikolaredstork Jul 22, 2023
f602cc6
Replacing daily values for hourly in solver
nikolaredstork Jul 22, 2023
22d74c4
HydroHasMod and PumpHasMod
nikolaredstork Jul 22, 2023
34a314b
Hydro Modulabe
nikolaredstork Jul 22, 2023
0fb26de
GUI for TS management hydro power credits
nikolaredstork Jul 22, 2023
e2e963a
Inter and Intra modal feature backend
nikolaredstork Jul 23, 2023
a4d33db
Auto Transfer function and one comment modification
nikolaredstork Jul 23, 2023
eee6d08
Comment modification
nikolaredstork Jul 23, 2023
a4c1da8
Refactoring checkHourlyMinMaxGeneration function
nikolaredstork Jul 23, 2023
827cfb5
Separate function for checking max gen and pump TS number
nikolaredstork Jul 23, 2023
07ce46b
Excluding unnecessary function parameter
nikolaredstork Jul 23, 2023
4b08e13
Excluding unnecessary reference
nikolaredstork Jul 24, 2023
ede8efc
HydroHasMod and PumpHasMod modification
nikolaredstork Jul 24, 2023
598a474
Change function name
nikolaredstork Jul 24, 2023
4554d23
MD files updated
nikolaredstork Jul 24, 2023
94ca6b7
MD file modification
nikolaredstork Jul 25, 2023
2ab16dc
Merge branch 'develop-new' into feature/maxgen-maxpump-cr23
nikolaredstork Jul 31, 2023
13db210
Modification after merging with develop-new branch
nikolaredstork Jul 31, 2023
04b6104
Fixing build errors due to migration from raw ptrs to stl vectors
nikolaredstork Jul 31, 2023
1820fda
Support for old studies fix
nikolaredstork Aug 2, 2023
94698f1
Separate mingen from maxgen and maxpump
nikolaredstork Aug 3, 2023
75b6263
New Load function for Hydro Power Credits
nikolaredstork Aug 3, 2023
91435e9
fix - random ts number test crash
Milos-RTEi Aug 3, 2023
c672e3a
fix pumpMaxE bug
Milos-RTEi Aug 3, 2023
118db9a
Separate mingen from maxgen and maxpump
nikolaredstork Aug 3, 2023
7ee9ccf
fix - random ts number test crash
Milos-RTEi Aug 3, 2023
4b165d2
fix pumpMaxE bug
Milos-RTEi Aug 3, 2023
6cad434
Bugfix
nikolaredstork Aug 4, 2023
401e21a
Merge branch 'feature/max-hydro-gen-pump-per-h-cr23' into feature/max…
Milos-RTEi Aug 4, 2023
75cb113
Feature/maxgen maxpump cr23 - improvements (#1499)
Milos-RTEi Aug 4, 2023
bcdc18b
Adding pointer check
nikolaredstork Aug 4, 2023
8e35773
Adding pointer check
nikolaredstork Aug 4, 2023
4abc817
New file maxhours_areaID
nikolaredstork Aug 8, 2023
c104436
New class that support old studies
nikolaredstork Aug 9, 2023
0667a39
Two separate files for Gen and Pump hours
nikolaredstork Aug 11, 2023
7138ced
Delete old files
nikolaredstork Aug 14, 2023
cabdc79
Scenario Builder unit tests
nikolaredstork Aug 14, 2023
94784ea
Excluding unnecessary code
nikolaredstork Aug 14, 2023
c8f2050
Keep files for an area
nikolaredstork Aug 14, 2023
a33099d
Excluding unnecessary arrays
nikolaredstork Aug 15, 2023
21cd52e
Fix test
nikolaredstork Aug 16, 2023
7fa96b3
New file maxhours_areaID
nikolaredstork Aug 8, 2023
b5f0573
New class that support old studies
nikolaredstork Aug 9, 2023
aadaa26
Two separate files for Gen and Pump hours
nikolaredstork Aug 11, 2023
8ff8737
Delete old files
nikolaredstork Aug 14, 2023
0d9e8e5
Scenario Builder unit tests
nikolaredstork Aug 14, 2023
a4f00a2
Excluding unnecessary code
nikolaredstork Aug 14, 2023
c142ee9
Keep files for an area
nikolaredstork Aug 14, 2023
644c50b
Excluding unnecessary arrays
nikolaredstork Aug 15, 2023
172d8a9
Fix test
nikolaredstork Aug 16, 2023
68d4299
Merge branch 'develop-new' into feature/maxgen-maxpump-cr23
nikolaredstork Aug 16, 2023
1ec8f3e
Post merge fixs
nikolaredstork Aug 16, 2023
552b48a
Merge branch 'feature/maxgen-maxpump-cr23' into feature/max-hydro-gen…
Milos-RTEi Aug 16, 2023
be21fda
Merge branch 'develop-new' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Aug 16, 2023
578c6e5
Post merge build fix
nikolaredstork Aug 17, 2023
fb0c474
Fix sonar bugs
nikolaredstork Aug 17, 2023
a9e6519
Exclude duplication code
nikolaredstork Aug 17, 2023
b2899d5
Some minor code smells
nikolaredstork Aug 17, 2023
596d9f4
More code smells
nikolaredstork Aug 18, 2023
54bbc79
Resolving Code smells
nikolaredstork Aug 18, 2023
2672405
Unit test datatransfer
nikolaredstork Aug 21, 2023
f78e096
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Aug 21, 2023
20a4738
Post merge build fix
nikolaredstork Aug 21, 2023
b1874ec
Additional datatransfer unit tests
nikolaredstork Aug 22, 2023
32b56e5
LoadPowerCredits func unit tests
nikolaredstork Aug 22, 2023
c0643bb
Comment correction
nikolaredstork Aug 22, 2023
838c04c
Additional comments
nikolaredstork Aug 22, 2023
376f24d
Refactoring unit tests
nikolaredstork Aug 23, 2023
1eb238c
Refactoring hydro series unit tests
nikolaredstork Aug 23, 2023
fe47970
Help files for unit tests
nikolaredstork Aug 23, 2023
8fa59e9
Exclude unnecessary code
nikolaredstork Aug 23, 2023
25c4b23
MD files
nikolaredstork Aug 23, 2023
426b3c9
Remove function for unit tests
nikolaredstork Aug 24, 2023
9cd3f88
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Aug 24, 2023
edd5c50
Passing by reference
nikolaredstork Aug 25, 2023
5354e87
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Aug 25, 2023
867aa5b
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Aug 25, 2023
81850af
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Aug 31, 2023
030af42
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Sep 4, 2023
7c5ddc5
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Sep 8, 2023
f1c3673
Copy from UI
nikolaredstork Sep 13, 2023
d21f858
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Sep 13, 2023
6c01298
Post merge build errors
nikolaredstork Sep 15, 2023
fd1e1eb
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Sep 18, 2023
baa6994
Merge branch 'develop' into feature/max-hydro-gen-pump-per-h-cr23
nikolaredstork Sep 21, 2023
00b8592
Post merge build errors resolved
nikolaredstork Sep 21, 2023
cc82545
Multiple Maximum Generation and Pumping for Hydro (Refactoring) (#1648)
nikolaredstork Oct 26, 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
2 changes: 0 additions & 2 deletions src/libs/antares/study/parts/hydro/container.cpp
Original file line number Diff line number Diff line change
@@ -29,8 +29,6 @@
#include "container.h"
#include <antares/inifile/inifile.h>
#include "datatransfer.h"
#include <antares/array/array1d.h>


using namespace Antares;
using namespace Yuni;
You are viewing a condensed version of this merge commit. You can view the full changes here.