Hydro max power : adding unit tests for timeseries numbers #1843

guilpier-code · 2023-12-22T09:47:30Z

No description provided.

flomnes · 2024-03-13T15:28:33Z

src/libs/antares/study/parts/hydro/hydromaxtimeseriesreader.h

This file was moved to src/libs/antares/study/include/antares/study/parts/hydro/hydromaxtimeseriesreader.h

This header was removed

flomnes · 2024-03-13T15:28:50Z

docs/reference-guide/13-file-format.md

Work ongoing for the documentation. Please revert this.

flomnes · 2024-03-13T15:29:23Z

src/libs/antares/study/scenario-builder/HydroMaxPowerTSNumberData.h

This file was moved to src/libs/antares/study/include/antares/study/scenario-builder/HydroMaxPowerTSNumberData.h

additional header removed

flomnes · 2024-03-13T15:29:34Z

src/solver/simulation/sim_calcul_economique.cpp

@@ -644,7 +644,7 @@ void SIM_RenseignementProblemeHebdo(const Study& study,
        {
            if (problem.CaracteristiquesHydrauliques[k].PresenceDHydrauliqueModulable > 0)
            {
-                auto& area = *study.areas.byIndex[k];
+                auto& area = *study.areas.byIndex[k];       


Don't add spaces

Space removed

flomnes · 2024-03-13T15:31:31Z

src/solver/simulation/timeseries-numbers.cpp

+    // Hydro Max Power : Add hydro's max power number of TS in area ...
+    indexTS = ts_to_tsIndex.at(timeSeriesHydroMaxPower);
+    if (isTSintermodal[indexTS])
+    {
+        uint nbTimeSeries = area.hydro.series->maxPowerTScount();
+        listNumberTsOverArea.push_back(nbTimeSeries);
+    }
+


Duplicate of lines 311-317 above

Suggested change

// Hydro Max Power : Add hydro's max power number of TS in area ...

indexTS = ts_to_tsIndex.at(timeSeriesHydroMaxPower);

if (isTSintermodal[indexTS])

{

uint nbTimeSeries = area.hydro.series->maxPowerTScount();

listNumberTsOverArea.push_back(nbTimeSeries);

}

Duplication removed

guilpier-code · 2024-03-11T14:07:32Z

docs/reference-guide/03-commands.md

@@ -178,7 +178,7 @@ this command allows to state, for each kind of time-series, whether it should be
 the available set (be it ready-made or Antares-generated) _**OR**_ should take a user-defined value
 (in the former case, the default "rand" value should be kept; in the latter, the value should be the reference number of the time-series to use). Multiple simulation profiles can be defined and archived. The default active profile gives the "rand" status for all time-series in all areas (full probabilistic simulation).

-  Regarding Hydro time-series, the scenario builder gives, in addition to the assignment of a specific number to use for the inflows time-series, the ability to define the initial reservoir level to use for each MC year.
+  Regarding Hydro time-series, the scenario builder gives, in addition to the assignment of a specific number to use for the inflows time-series, the ability to define the initial reservoir level to use for each MC year, also hydro max power scenario builder is available to support time-series for Maximum Generation and Maximum Pumping because the number of TS's for ROR, Hydro Storage and Minimum Generation can be different than the  number of TS's for Maximum Generation and Maximum Pumping.


Comment from a review before update with develop (when this change appeared) :
This text addition makes the sentence very long and this piece of documentation unclear.
We should prefer something like :

Regarding Hydro time-series, the scenario builder allows the user to choose, for a given year and area, a different time series whether we consider : - inflows, ROR and minimum generation - initial level - max power for generation and pumping This implies that, inside one of the previous categories, the number of available time series is the same

guilpier-code · 2024-03-12T12:16:37Z

docs/reference-guide/04-active_windows.md


-    Both types of data may come from any origin outside Antares, or may have been formerly generated by the Antares time-series stochastic generator and stored as input data on the user's request. Different ways to update data are:
+    ROR time-series and SP time-series may come from any origin outside Antares, or may have been formerly generated by the Antares time-series stochastic generator and stored as input data on the user's request. Minimum Generation, Maximum Generation and Maximum Pumping may come from any origin outside Antares, but they can not be generated by the Antares time-series stochastic generator. Different ways to update data are:


Comment from a review before update with develop (when this change appeared) :
"The SP time-series" :
I guess SP stands for inflows or hydro storage (in Antares, it means the same thing [very unfortunate indeed, these 2 things should not be equivalent, because in real life, they aren't]).
I have never heard about SP.
So let's be more clear : rename SP into hydro storage

guilpier-code · 2024-03-12T12:30:35Z

docs/reference-guide/04-active_windows.md


-    ROR time-series are defined at the hourly scale; each of the 8760 values represents the ROR power expected at a given hour, expressed in round number and in MW. The SP time-series are defined at the daily scale; each of the 365 values represents an overall SP energy expected in the day, expressed in round number and in MWh. These natural inflows are considered to be storable into a reservoir for later use.
+    ROR time-series are defined at the hourly scale; each of the 8760 values represents the ROR power expected at a given hour, expressed in round number and in MW. The SP time-series are defined at the daily scale; each of the 365 values represents an overall SP energy expected in the day, expressed in round number and in MWh. These natural inflows are considered to be storable into a reservoir for later use. The Minimum Generation time-series are defined at the hourly scale; each of the 8760 values represents the Minimum Generation power expected at a given hour expressed in round number and in MW. The Maximum Generation time-series are defined at the hourly scale; each of the 8760 values represents the Maximum Generation power expected at a given hour expressed in round number and in MW. The Maximum Pumping time-series are defined at the hourly scale; each of the 8760 values represents the Maximum Pumping power expected at a given hour expressed in round number and in MW.


Comment from a review before update with develop (when this change appeared) :
starting from "The Minimum Generation time-series..." :
Following 3 phrases are the same, except for the quantity they concern.
One phrase is enough. Just add : "same for max generation and pumping power"

guilpier-code · 2024-03-14T09:04:18Z

src/libs/antares/study/parts/hydro/hydromaxtimeseriesreader.h

This header was removed

guilpier-code · 2024-03-14T09:04:38Z

docs/reference-guide/13-file-format.md

guilpier-code · 2024-03-14T09:04:49Z

src/libs/antares/study/scenario-builder/HydroMaxPowerTSNumberData.h

additional header removed

guilpier-code · 2024-03-14T09:05:50Z

src/solver/simulation/sim_calcul_economique.cpp

@@ -644,7 +644,7 @@ void SIM_RenseignementProblemeHebdo(const Study& study,
        {
            if (problem.CaracteristiquesHydrauliques[k].PresenceDHydrauliqueModulable > 0)
            {
-                auto& area = *study.areas.byIndex[k];
+                auto& area = *study.areas.byIndex[k];       


Space removed

guilpier-code · 2024-03-14T09:06:10Z

src/solver/simulation/timeseries-numbers.cpp

+    // Hydro Max Power : Add hydro's max power number of TS in area ...
+    indexTS = ts_to_tsIndex.at(timeSeriesHydroMaxPower);
+    if (isTSintermodal[indexTS])
+    {
+        uint nbTimeSeries = area.hydro.series->maxPowerTScount();
+        listNumberTsOverArea.push_back(nbTimeSeries);
+    }
+


Duplication removed

flomnes · 2024-03-14T13:55:49Z

src/solver/simulation/timeseries-numbers.cpp

+        else if (isTSintermodal[ts_to_tsIndex.at(timeSeriesHydroMaxPower)])
+            tsNumbersMtx = &(area.hydro.series->timeseriesNumbersHydroMaxPower);


flomnes · 2024-03-14T13:56:34Z

src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-save.cpp

+        // Hydro Max Power : set the nb of ready made TS
+        nbReadyMadeTS = 15;
+        area_1->hydro.series->resizeMaxPowerTS(nbReadyMadeTS);
+        area_2->hydro.series->resizeMaxPowerTS(nbReadyMadeTS);
+        area_3->hydro.series->resizeMaxPowerTS(nbReadyMadeTS);
+


Duplicate of lines above ⬆️

Duplicated lines removed

flomnes · 2024-03-14T13:57:30Z

src/tests/src/solver/simulation/tests-ts-numbers.cpp

+	area_3->hydro.series->resizeMaxPowerTS(hydroMaxPowerTSsize, 1);
+	area_3->resizeAllTimeseriesNumbers(1 + study->runtime->rangeLimits.year[rangeEnd]);
+
+	BOOST_CHECK(Generate(*study));


I kind of like Namespace::Generate, I find it beautiful

flomnes · 2024-03-14T15:02:54Z

src/tests/src/libs/antares/study/scenario-builder/test-sc-builder-file-read-line.cpp

+		// Hydro Max Power: set the nb of ready made TS
+		nbReadyMadeTS = 15;
+		area_1->hydro.series->resizeMaxPowerTS(nbReadyMadeTS);
+		area_2->hydro.series->resizeMaxPowerTS(nbReadyMadeTS);
+		area_3->hydro.series->resizeMaxPowerTS(nbReadyMadeTS);
+


⬇️ Duplicate of lines 113-116

Duplicate lines removed

sonarcloud · 2024-03-14T17:17:47Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

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

See analysis details on SonarCloud

Co-authored-by: NikolaIlic <[email protected]> Co-authored-by: Milos-RTEi <[email protected]> Co-authored-by: Milos <[email protected]> Co-authored-by: nikolaredstork <[email protected]> Co-authored-by: payetvin <[email protected]> Co-authored-by: Florian Omnès <[email protected]>

nikolaredstork and others added 30 commits July 22, 2023 16:52

Maxgen matrix implemented

2b03609

Maxpump matrix implemented

e25aea9

Scenario Builder GUI

9bbe22e

DataSeriesHydro-new matrix for max gen and pump TS's

ab3085f

MC years linked with new hydro MC Scenario Builder Matrix

f2bd3ac

Random number feature

5a80015

Replacing daily values for hourly in solver

f602cc6

HydroHasMod and PumpHasMod

22d74c4

Hydro Modulabe

34a314b

GUI for TS management hydro power credits

0fb26de

Inter and Intra modal feature backend

e2e963a

Auto Transfer function and one comment modification

a4d33db

Comment modification

eee6d08

Refactoring checkHourlyMinMaxGeneration function

a4c1da8

Separate function for checking max gen and pump TS number

827cfb5

Excluding unnecessary function parameter

07ce46b

Excluding unnecessary reference

4b08e13

HydroHasMod and PumpHasMod modification

ede8efc

Change function name

598a474

MD files updated

4554d23

MD file modification

94ca6b7

Merge branch 'develop-new' into feature/maxgen-maxpump-cr23

2ab16dc

Modification after merging with develop-new branch

13db210

Fixing build errors due to migration from raw ptrs to stl vectors

04b6104

Support for old studies fix

1820fda

Separate mingen from maxgen and maxpump

94698f1

New Load function for Hydro Power Credits

75b6263

fix - random ts number test crash

91435e9

fix pumpMaxE bug

c672e3a

Separate mingen from maxgen and maxpump

118db9a

CR 23 add tests : correction after merge

c540621

pull-request-size bot added size/L and removed size/XXL labels Mar 13, 2024

flomnes reviewed Mar 13, 2024

View reviewed changes

guilpier-code added 7 commits March 14, 2024 08:30

CR 23 add tests : remove unnecessary tab

b7e387d

CR 23 add tests : revert a doc file, due to a reviewer demand

b3871a7

CR 23 add tests : remove unnecessary header file (thanks to review)

d73393e

CR 23 add tests : remove unnecessary header inclusion

2f48b3f

CR 23 add tests : remove unnecessary header inclusion

4a0b5e6

CR 23 add tests : remove unnecessary header

b9d5297

CR 23 add tests : move of duplicate block (see above)

ae30fbd

pull-request-size bot added size/M and removed size/L labels Mar 14, 2024

guilpier-code commented Mar 14, 2024

View reviewed changes

[skip ci] CR 23 add tests : remove initialization of unused variable.

c8fa66f

flomnes reviewed Mar 14, 2024

View reviewed changes

CR 23 add tests : simplifying / correcting unit tests

e6e84e4

pull-request-size bot added size/L and removed size/M labels Mar 14, 2024

guilpier-code added 2 commits March 14, 2024 15:50

CR 23 add tests : simplifying / correcting unit tests

8be90d3

CR 23 add tests : correction after review

595b80b

guilpier-code marked this pull request as ready for review March 14, 2024 14:59

flomnes reviewed Mar 14, 2024

View reviewed changes

CR 23 add tests : remove unintentional duplication

ab7efdb

guilpier-code requested a review from flomnes March 14, 2024 16:25

flomnes approved these changes Mar 14, 2024

View reviewed changes

flomnes merged commit fa92e28 into develop Mar 14, 2024
5 checks passed

flomnes deleted the feature/hydro-max-power-add-tests branch March 14, 2024 20:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hydro max power : adding unit tests for timeseries numbers #1843

Hydro max power : adding unit tests for timeseries numbers #1843

guilpier-code commented Dec 22, 2023

flomnes Mar 13, 2024

guilpier-code Mar 14, 2024

flomnes Mar 13, 2024

guilpier-code Mar 14, 2024

flomnes Mar 13, 2024

guilpier-code Mar 14, 2024

flomnes Mar 13, 2024

guilpier-code Mar 14, 2024

flomnes Mar 13, 2024

guilpier-code Mar 14, 2024

guilpier-code Mar 11, 2024 •

edited

Loading

flomnes Mar 14, 2024

guilpier-code Mar 12, 2024 •

edited

Loading

guilpier-code Mar 12, 2024 •

edited

Loading

guilpier-code Mar 14, 2024

guilpier-code Mar 14, 2024

guilpier-code Mar 14, 2024

guilpier-code Mar 14, 2024

guilpier-code Mar 14, 2024

flomnes Mar 14, 2024

flomnes Mar 14, 2024

guilpier-code Mar 14, 2024

flomnes Mar 14, 2024

flomnes Mar 14, 2024

guilpier-code Mar 14, 2024

sonarcloud bot commented Mar 14, 2024


		Both types of data may come from any origin outside Antares, or may have been formerly generated by the Antares time-series stochastic generator and stored as input data on the user's request. Different ways to update data are:
		ROR time-series and SP time-series may come from any origin outside Antares, or may have been formerly generated by the Antares time-series stochastic generator and stored as input data on the user's request. Minimum Generation, Maximum Generation and Maximum Pumping may come from any origin outside Antares, but they can not be generated by the Antares time-series stochastic generator. Different ways to update data are:


		ROR time-series are defined at the hourly scale; each of the 8760 values represents the ROR power expected at a given hour, expressed in round number and in MW. The SP time-series are defined at the daily scale; each of the 365 values represents an overall SP energy expected in the day, expressed in round number and in MWh. These natural inflows are considered to be storable into a reservoir for later use.
		ROR time-series are defined at the hourly scale; each of the 8760 values represents the ROR power expected at a given hour, expressed in round number and in MW. The SP time-series are defined at the daily scale; each of the 365 values represents an overall SP energy expected in the day, expressed in round number and in MWh. These natural inflows are considered to be storable into a reservoir for later use. The Minimum Generation time-series are defined at the hourly scale; each of the 8760 values represents the Minimum Generation power expected at a given hour expressed in round number and in MW. The Maximum Generation time-series are defined at the hourly scale; each of the 8760 values represents the Maximum Generation power expected at a given hour expressed in round number and in MW. The Maximum Pumping time-series are defined at the hourly scale; each of the 8760 values represents the Maximum Pumping power expected at a given hour expressed in round number and in MW.

		else if (isTSintermodal[ts_to_tsIndex.at(timeSeriesHydroMaxPower)])
		tsNumbersMtx = &(area.hydro.series->timeseriesNumbersHydroMaxPower);

Hydro max power : adding unit tests for timeseries numbers #1843

Hydro max power : adding unit tests for timeseries numbers #1843

Conversation

guilpier-code commented Dec 22, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guilpier-code Mar 11, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guilpier-code Mar 12, 2024 • edited Loading

Choose a reason for hiding this comment

guilpier-code Mar 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Mar 14, 2024

Quality Gate passed

guilpier-code Mar 11, 2024 •

edited

Loading

guilpier-code Mar 12, 2024 •

edited

Loading

guilpier-code Mar 12, 2024 •

edited

Loading