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

Match column name and content, add column CashFlow #264

Merged
merged 2 commits into from
Nov 21, 2024
Merged

Match column name and content, add column CashFlow #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de0364f
Match column name and content, add column CashFlow
Nov 4, 2024
b774f15
Fix conflict after pulling from master
Nov 20, 2024
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
1 change: 1 addition & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
BUGFIXES :
* `setSimulationPathAPI()` : encode URL before reading the data in simulation mode
* `api_get()` : add warn_for_status in importFrom section
* `readAntares()` : In disk mode, return all the available columns for a short-term storage output and match the column with the content

BREAKING CHANGES :
* `setSimulationPathAPI()` : reads and returns the new converted study version format (ex : 9.0 => 900)
Expand Down
5 changes: 3 additions & 2 deletions inst/format_output/simulation_variables_names_by_support.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
"Generation / Thermal";"details";"Profit by plant";4;"Net Profit by Thermal Cluster (€)";"profitByPlant";830;"Profit - Euro";"profit"
"Generation / Renewables";"details-res";"RES generation by plant";1;"Renewable Energy Generation by Power Plant Cluster (MWh)";"resGenerationByPlant";810;"MWh";"production"
"Generation / Short-Term Storages";"details-STstorage";"STS inj by plant";1;"Short-Term Storage Injection by Power Plant (MWh)";"stsInjByPlant";860;"P-injection - MW";"P.injection"
"Generation / Short-Term Storages";"details-STstorage";"STS lvl by plant";2;"Short-Term Storage Level by Power Plant (MWh)";"stsLvlByPlant";860;"Levels - MWh";"levels"
"Generation / Short-Term Storages";"details-STstorage";"STS withdrawal by plant";3;"Short-Term Storage Withdrawal by Power Plant (MWh)";"stsWithdrawalByPlant";860;"P-withdrawal - MW";"P.withdrawal"
"Generation / Short-Term Storages";"details-STstorage";"STS withdrawal by plant";2;"Short-Term Storage Withdrawal by Power Plant (MWh)";"stsWithdrawalByPlant";860;"P-withdrawal - MW";"P.withdrawal"
"Generation / Short-Term Storages";"details-STstorage";"STS lvl by plant";3;"Short-Term Storage Level by Power Plant (MWh)";"stsLvlByPlant";860;"Levels - MWh";"levels"
"Generation / Short-Term Storages";"details-STstorage";"STS Cashflow By Cluster";4;"Storage Cashflow by Thermal Cluster (€)";"stsCashflowByCluster";880;"CashFlow - Euro";"Cashflow"
2 changes: 1 addition & 1 deletion tests/testthat/test-importOutputForClusters.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ test_that(".importOutputForSTClusters is ok", {
opts=opts
)

required_order_simulation_variables <- c("P.injection","levels","P.withdrawal")
required_order_simulation_variables <- c("P.injection","P.withdrawal","levels")

order_simulation_variables <- colnames(OutputForSTClusters)[colnames(OutputForSTClusters) %in% required_order_simulation_variables]

Expand Down
Loading