Remove RenouvelableParPalier from global variable #1659

payetvin · 2023-09-28T14:54:59Z

#1615

#1644 (comment)
#1644 (comment)

rename getAvailablePower()
remove scratchpad.ts
clean alea.cpp

src/solver/hydro/management/management.cpp

flomnes

I think the precise naming for "timeStep" is hourInYear

So the caller know that it's an hour between 0 (included) and 8760 (excluded).

src/libs/antares/study/parts/renewable/cluster.cpp

guilpier-code · 2023-10-02T13:11:07Z

src/libs/antares/study/parts/renewable/cluster.cpp

@@ -200,14 +200,15 @@ YString Data::RenewableCluster::getTimeSeriesModeAsString() const
    return "unknown";
 }

-double RenewableCluster::valueAtTimeStep(uint timeSeriesIndex, uint timeStepIndex) const
+double RenewableCluster::valueAtTimeStep(uint hourInYear, uint year) const


One could expect that arguments are switched (as it was before) : first year, then hourInYear. Another way to see this, is : you cannot have an hour in the year if you don't have a year first, right ?

@guilpier-code to be done in the next (factorization) work

src/libs/antares/study/parts/renewable/cluster.cpp

src/libs/antares/study/parts/wind/series.cpp

src/solver/simulation/sim_calcul_economique.cpp

src/solver/simulation/common-hydro-remix.cpp

src/solver/variable/commons/wind.h

flomnes · 2023-10-03T12:36:34Z

Rename getAvailablePower into something else

…TIREES_PAR_PAYS

src/libs/antares/study/parts/load/series.h

src/solver/hydro/management/management.cpp

src/libs/antares/study/parts/load/series.cpp

….com/AntaresSimulatorTeam/Antares_Simulator into feature/remove-RenouvelableParPalier

sylvlecl

Nice:
I think we could improve again the design by returning more often column objects (double* in practice) instead of getting the year index then only retrieving the column using that index.

However, maybe that's for a future work on series classes?

sylvlecl · 2023-10-03T14:53:54Z

src/solver/simulation/sim_calcul_economique.cpp


-            uint tsFatalIndex = (uint)tsIndex.Hydraulique < ror.width ? tsIndex.Hydraulique : 0;
+            uint tsFatalIndex = hydroSeriesIndex < ror.width ? hydroSeriesIndex : 0;


It seems that the hydroSeriesIndex is used only to get this ROR index:
we could probably have a more direct getRorIndex in the series class ?

src/solver/simulation/sim_calcul_economique.cpp

sylvlecl · 2023-10-03T14:58:38Z

src/solver/variable/commons/hydro.h

@@ -200,7 +200,7 @@ class TimeSeriesValuesHydro
        // The current time-series
        auto& ror = pArea->hydro.series->ror;
        const unsigned int nbchro
-          = NumeroChroniquesTireesParPays[numSpace][pArea->index].Hydraulique;
+          = pArea->hydro.series->getIndex(year);
        pFatalValues[numSpace] = &(ror.entry[(nbchro < ror.width ? nbchro : 0)]);


Could be simplified too with a getRorIndex

sylvlecl · 2023-10-03T15:03:38Z

src/solver/simulation/sim_calcul_economique.cpp

            auto& area = *(study.areas.byIndex[k]);
            auto& scratchpad = area.scratchpad[numSpace];
            auto& ror = area.hydro.series->ror;
+            auto loadSeries = area.load.series->getCoefficient(year, hourInYear);


As pointed by @flomnes , we can retrieve the full columns only once et the start and use them (it avoids to repeat the small logic on the index)

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

sylvlecl · 2023-10-03T15:18:42Z

src/solver/simulation/sim_calcul_economique.cpp

                auto const& srcinflows = inflowsmatrix[tsIndex < inflowsmatrix.width ? tsIndex : 0];
-                auto& mingenmatrix = area.hydro.series->mingen;
+                auto& mingenmatrix = hydroSeries->mingen;
                auto const& srcmingen = mingenmatrix[tsIndex < mingenmatrix.width ? tsIndex : 0];


We could have a getter for this column in the HydroSeries class, instead of going through 1. retrieve the index then 2. retrieve the column.

sylvlecl · 2023-10-03T15:19:00Z

src/solver/simulation/sim_calcul_economique.cpp

+                auto& hydroSeries = area.hydro.series;
+                uint tsIndex = hydroSeries->getIndex(year);
+
+                auto& inflowsmatrix = hydroSeries->storage;
                auto const& srcinflows = inflowsmatrix[tsIndex < inflowsmatrix.width ? tsIndex : 0];


Same here, we could have a getter for the column itself instead of the index

sonarqubecloud · 2023-10-04T11:03:39Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
1 Code Smell

0.0% Coverage
0.0% Duplication

The comments will be adressed in a future work

[DEV] Remove RenouvelableParPalier from alea

3e10c54

payetvin self-assigned this Sep 28, 2023

pull-request-size bot added the size/S label Sep 28, 2023

[DEV] Changed arg of valueAtTimeStep

ffa90af

pull-request-size bot added size/M and removed size/S labels Sep 28, 2023

payetvin added 2 commits September 28, 2023 17:26

[DEV] use year for valueAtTimeStep calls

77faf90

[DEV] Removed RenouvelableParPalier from struct

6d4dcb8

payetvin marked this pull request as ready for review September 29, 2023 13:36

[FIX] warning

34b6c1c

flomnes reviewed Sep 29, 2023

View reviewed changes

src/solver/hydro/management/management.cpp Outdated Show resolved Hide resolved

payetvin added 2 commits October 2, 2023 10:23

[FIX] args hour, year for valueAtTimeStep

ebc1738

[FIX] Remove unused var

f462df9

flomnes requested changes Oct 2, 2023

View reviewed changes

src/libs/antares/study/parts/renewable/cluster.cpp Outdated Show resolved Hide resolved

payetvin added 5 commits October 2, 2023 14:08

[DEV] Try Eolien for output var

ec39476

[FIX] Arg name for hourInYear

8cbc20f

[FIX] Compile

6aa9534

[DEV] Add getIndex

f4bd2b9

[DEV] Remove Eolien

262cb36

guilpier-code requested changes Oct 2, 2023

View reviewed changes

[DEV] Consommation

8e9a5a6

pull-request-size bot added size/L and removed size/M labels Oct 3, 2023

payetvin added 3 commits October 3, 2023 10:47

[DEV] Remove Consommation from struct

34ca477

[DEV] Remove Hydraulique

2cdc6fc

[DEV] Remove (long) conversion for getIndex

988b087

guilpier-code previously requested changes Oct 3, 2023

View reviewed changes

[FIX] Replace wind with load

ffa6102

[DEV] Guillaume comments

f5dcb06

payetvin added 9 commits October 3, 2023 15:08

[DEV] Solar

5a9f97b

[DEV] Remove NumeroChroniquesTireesParPays, struct NUMERO_CHRONIQUES_…

ef945a7

…TIREES_PAR_PAYS

[DEV] Rename getAvailablePower with getCoefficient

3448fad

[DEV] Use getCoefficient instead of scratchpad for wind

206781b

[DEV] Use getCoefficient instead of scratchpad for solar and load

545ece0

[DEV] remove ts from scratchpad

f77b3d8

[DEV] problem.year as year

40b729e

[DEV] Code smell

26f67db

[DEV] Code smell 2

8d07dc7

flomnes reviewed Oct 3, 2023

View reviewed changes

payetvin added 5 commits October 3, 2023 16:50

[DEV] Code smell const lambda

3121bee

[DEV] Code smell const

211ef8f

[DEV] getColumn

0269b82

Merge branch 'feature/remove-RenouvelableParPalier' of https://github…

ccb78e8

….com/AntaresSimulatorTeam/Antares_Simulator into feature/remove-RenouvelableParPalier

[FIX] Results

d8e357c

sylvlecl reviewed Oct 3, 2023

View reviewed changes

payetvin added 3 commits October 4, 2023 11:23

[FIX] windSeries

452a3c8

[FIX] Use double*

5e8662f

[FIX] const

3d15c42

flomnes approved these changes Oct 4, 2023

View reviewed changes

flomnes merged commit 715d884 into develop Oct 4, 2023

flomnes deleted the feature/remove-RenouvelableParPalier branch October 4, 2023 11:04

flomnes added the refactoring label Oct 6, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove RenouvelableParPalier from global variable #1659

Remove RenouvelableParPalier from global variable #1659

payetvin commented Sep 28, 2023 •

edited

Loading

flomnes left a comment

guilpier-code Oct 2, 2023 •

edited

Loading

flomnes Oct 4, 2023

flomnes commented Oct 3, 2023

sylvlecl left a comment

sylvlecl Oct 3, 2023

sylvlecl Oct 3, 2023

sylvlecl Oct 3, 2023

sylvlecl Oct 3, 2023

sylvlecl Oct 3, 2023

sonarqubecloud bot commented Oct 4, 2023


		uint tsFatalIndex = (uint)tsIndex.Hydraulique < ror.width ? tsIndex.Hydraulique : 0;
		uint tsFatalIndex = hydroSeriesIndex < ror.width ? hydroSeriesIndex : 0;

Remove RenouvelableParPalier from global variable #1659

Remove RenouvelableParPalier from global variable #1659

Conversation

payetvin commented Sep 28, 2023 • edited Loading

flomnes left a comment

Choose a reason for hiding this comment

guilpier-code Oct 2, 2023 • edited Loading

Choose a reason for hiding this comment

flomnes Oct 4, 2023

Choose a reason for hiding this comment

flomnes commented Oct 3, 2023

sylvlecl left a comment

Choose a reason for hiding this comment

sylvlecl Oct 3, 2023

Choose a reason for hiding this comment

sylvlecl Oct 3, 2023

Choose a reason for hiding this comment

sylvlecl Oct 3, 2023

Choose a reason for hiding this comment

sylvlecl Oct 3, 2023

Choose a reason for hiding this comment

sylvlecl Oct 3, 2023

Choose a reason for hiding this comment

sonarqubecloud bot commented Oct 4, 2023

payetvin commented Sep 28, 2023 •

edited

Loading

guilpier-code Oct 2, 2023 •

edited

Loading