-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Multiple Maximum Generation and Pumping for Hydro (Merging with devel…
…op branch) (#1723) 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: - [x] Discard using raw matrix objects in function class members of the `DataHydroSeries` class and in unit tests. - [x] Change type arguments from `Matrix<double>&` to `TimeSeries&` for non-class static functions in **src/libs/antares/study/parts/hydro/series.cpp** --------- Co-authored-by: Milos-RTEi <milos.andjelkovic@redstork-solutions.com> Co-authored-by: Milos <97689304+Milos-RTEi@users.noreply.github.com> Co-authored-by: guilpier-code <62292552+guilpier-code@users.noreply.github.com> Co-authored-by: payetvin <113102157+payetvin@users.noreply.github.com> Co-authored-by: Guillaume PIERRE <guillaume.pierre@rte-france.com> Co-authored-by: Florian Omnès <florian.omnes@rte-france.com> Co-authored-by: Florian OMNES <26088210+flomnes@users.noreply.github.com> Co-authored-by: OMNES Florian <omnesflo@gm0winl370.bureau.si.interne>
- Loading branch information
1 parent
a7670bb
commit cda3dd5
Showing
76 changed files
with
2,213 additions
and
639 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -135,5 +135,4 @@ uint64_t TimeSeries::memoryUsage() const | |
{ | ||
return timeSeries.memoryUsage(); | ||
} | ||
|
||
} // namespace Antares::Data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.