Skip to content

Commit

Permalink
Merge pull request #226 from rte-antares-rpackage/feature/scenarized_bc
Browse files Browse the repository at this point in the history 
Feature/scenarized bc
  • Loading branch information
@berthetclement
berthetclement authored Jan 15, 2024
2 parents c2dcd69 + 42813ee commit 3443fdc
Show file tree
Hide file tree
Showing 22 changed files with 607 additions and 300 deletions.
3 changes: 2 additions & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ Imports:
httr,
utils,
memuse,
purrr
purrr,
lifecycle
Suggests:
rhdf5 (>= 2.24.0),
testthat,
Expand Down
239 changes: 120 additions & 119 deletions NAMESPACE
View file
Original file line number Diff line number Diff line change
@@ -1,119 +1,120 @@
# Generated by roxygen2: do not edit by hand

S3method("[",antaresDataTable)
S3method(as.antaresDataList,antaresDataList)
S3method(as.antaresDataList,antaresDataTable)
S3method(as.antaresDataList,data.frame)
S3method(as.antaresDataList,default)
S3method(as.antaresDataList,list)
S3method(as.antaresDataTable,antaresDataTable)
S3method(as.antaresDataTable,data.frame)
S3method(as.antaresDataTable,default)
S3method(copyToClipboard,antaresDataList)
S3method(copyToClipboard,data.frame)
S3method(copyToClipboard,default)
S3method(copyToClipboard,matrix)
S3method(merge,antaresDataTable)
S3method(print,antaresDataList)
S3method(print,antaresDataTable)
S3method(print,simOptions)
S3method(subset,antaresDataList)
S3method(summary,bindingConstraints)
S3method(viewAntares,antaresDataList)
S3method(viewAntares,default)
export(.getOptionsH5)
export(.h5ReadAntares)
export(.writeAntaresH5Fun)
export(aggregateResult)
export(api_delete)
export(api_get)
export(api_post)
export(api_put)
export(as.antaresDataList)
export(as.antaresDataTable)
export(changeTimeStep)
export(copyToClipboard)
export(extractDataList)
export(getAlias)
export(getAreas)
export(getDistricts)
export(getGeographicTrimming)
export(getIdCols)
export(getLinks)
export(hvdcModification)
export(isH5Opts)
export(mergeDigests)
export(parAggregateMCall)
export(ponderateMcAggregation)
export(readAntares)
export(readAntaresAreas)
export(readAntaresClusters)
export(readBindingConstraints)
export(readClusterDesc)
export(readClusterResDesc)
export(readClusterSTDesc)
export(readDigestFile)
export(readIni)
export(readIniAPI)
export(readIniFile)
export(readInputRES)
export(readInputTS)
export(readInputThermal)
export(readLayout)
export(readOptimCriteria)
export(removeVirtualAreas)
export(setAlias)
export(setHvdcAreas)
export(setRam)
export(setSimulationPath)
export(setSimulationPathAPI)
export(setTimeoutAPI)
export(showAliases)
export(simOptions)
export(viewAntares)
export(writeAntaresH5)
export(writeDigest)
import(bit64)
import(data.table)
import(doParallel)
import(jsonlite)
import(parallel)
import(plyr)
importFrom(doParallel,registerDoParallel)
importFrom(grDevices,col2rgb)
importFrom(grDevices,rgb)
importFrom(httr,DELETE)
importFrom(httr,GET)
importFrom(httr,POST)
importFrom(httr,PUT)
importFrom(httr,accept_json)
importFrom(httr,add_headers)
importFrom(httr,content)
importFrom(httr,content_type_json)
importFrom(httr,http_status)
importFrom(httr,stop_for_status)
importFrom(httr,timeout)
importFrom(memuse,Sys.meminfo)
importFrom(methods,is)
importFrom(pbapply,pblapply)
importFrom(pbapply,pboptions)
importFrom(plyr,llply)
importFrom(purrr,quietly)
importFrom(shiny,getDefaultReactiveDomain)
importFrom(shiny,incProgress)
importFrom(shiny,withProgress)
importFrom(stats,as.formula)
importFrom(stats,setNames)
importFrom(stats,weighted.mean)
importFrom(stringi,stri_replace_last_fixed)
importFrom(stringr,str_match)
importFrom(stringr,str_replace)
importFrom(stringr,str_split)
importFrom(utils,URLencode)
importFrom(utils,View)
importFrom(utils,read.table)
importFrom(utils,setTxtProgressBar)
importFrom(utils,txtProgressBar)
importFrom(utils,type.convert)
importFrom(utils,untar)
importFrom(utils,write.table)
# Generated by roxygen2: do not edit by hand

S3method("[",antaresDataTable)
S3method(as.antaresDataList,antaresDataList)
S3method(as.antaresDataList,antaresDataTable)
S3method(as.antaresDataList,data.frame)
S3method(as.antaresDataList,default)
S3method(as.antaresDataList,list)
S3method(as.antaresDataTable,antaresDataTable)
S3method(as.antaresDataTable,data.frame)
S3method(as.antaresDataTable,default)
S3method(copyToClipboard,antaresDataList)
S3method(copyToClipboard,data.frame)
S3method(copyToClipboard,default)
S3method(copyToClipboard,matrix)
S3method(merge,antaresDataTable)
S3method(print,antaresDataList)
S3method(print,antaresDataTable)
S3method(print,simOptions)
S3method(subset,antaresDataList)
S3method(summary,bindingConstraints)
S3method(viewAntares,antaresDataList)
S3method(viewAntares,default)
export(.getOptionsH5)
export(.h5ReadAntares)
export(.writeAntaresH5Fun)
export(aggregateResult)
export(api_delete)
export(api_get)
export(api_post)
export(api_put)
export(as.antaresDataList)
export(as.antaresDataTable)
export(changeTimeStep)
export(copyToClipboard)
export(extractDataList)
export(getAlias)
export(getAreas)
export(getDistricts)
export(getGeographicTrimming)
export(getIdCols)
export(getLinks)
export(hvdcModification)
export(isH5Opts)
export(mergeDigests)
export(parAggregateMCall)
export(ponderateMcAggregation)
export(readAntares)
export(readAntaresAreas)
export(readAntaresClusters)
export(readBindingConstraints)
export(readClusterDesc)
export(readClusterResDesc)
export(readClusterSTDesc)
export(readDigestFile)
export(readIni)
export(readIniAPI)
export(readIniFile)
export(readInputRES)
export(readInputTS)
export(readInputThermal)
export(readLayout)
export(readOptimCriteria)
export(removeVirtualAreas)
export(setAlias)
export(setHvdcAreas)
export(setRam)
export(setSimulationPath)
export(setSimulationPathAPI)
export(setTimeoutAPI)
export(showAliases)
export(simOptions)
export(viewAntares)
export(writeAntaresH5)
export(writeDigest)
import(bit64)
import(data.table)
import(doParallel)
import(jsonlite)
import(parallel)
import(plyr)
importFrom(doParallel,registerDoParallel)
importFrom(grDevices,col2rgb)
importFrom(grDevices,rgb)
importFrom(httr,DELETE)
importFrom(httr,GET)
importFrom(httr,POST)
importFrom(httr,PUT)
importFrom(httr,accept_json)
importFrom(httr,add_headers)
importFrom(httr,content)
importFrom(httr,content_type_json)
importFrom(httr,http_status)
importFrom(httr,stop_for_status)
importFrom(httr,timeout)
importFrom(lifecycle,deprecated)
importFrom(memuse,Sys.meminfo)
importFrom(methods,is)
importFrom(pbapply,pblapply)
importFrom(pbapply,pboptions)
importFrom(plyr,llply)
importFrom(purrr,quietly)
importFrom(shiny,getDefaultReactiveDomain)
importFrom(shiny,incProgress)
importFrom(shiny,withProgress)
importFrom(stats,as.formula)
importFrom(stats,setNames)
importFrom(stats,weighted.mean)
importFrom(stringi,stri_replace_last_fixed)
importFrom(stringr,str_match)
importFrom(stringr,str_replace)
importFrom(stringr,str_split)
importFrom(utils,URLencode)
importFrom(utils,View)
importFrom(utils,read.table)
importFrom(utils,setTxtProgressBar)
importFrom(utils,txtProgressBar)
importFrom(utils,type.convert)
importFrom(utils,untar)
importFrom(utils,write.table)
7 changes: 6 additions & 1 deletion NEWS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@

### Breaking changes (Antares v8.7) :

* Existing function `readBindingConstraints()` (cf. Antares v8.7 changelog)
* `readBindingConstraints()` read now Scenarized RHS for binding constraints (cf. Antares v8.7 changelog)
- returns a new list structure

BUGFIXES :

* `readBindingConstraints()` read well study >= v8.3.2


# antaresRead 2.6.1 (devlopment)
Expand Down
7 changes: 7 additions & 0 deletions R/antaresRead-package.R
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#' @keywords internal
"_PACKAGE"

## usethis namespace: start
#' @importFrom lifecycle deprecated
## usethis namespace: end
NULL
Loading

0 comments on commit 3443fdc

Please sign in to comment.