Skip to content

Commit

Permalink
Tomaster (#188)
Browse files Browse the repository at this point in the history
* use dev version of antaresRead on master
* update workflow ci/cd on master only
  • Loading branch information
berthetclement authored Sep 3, 2024
1 parent c9adc8e commit b3fe199
Show file tree
Hide file tree
Showing 49 changed files with 1,998 additions and 1,208 deletions.
4 changes: 3 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: antaresEditObject
Type: Package
Title: Edit an 'Antares' Simulation
Version: 0.7.0
Version: 0.7.1.9000
Authors@R: c(
person("Tatiana", "Vargas", email = "[email protected]", role = c("aut", "cre")),
person("Frederic", "Breant", role = "aut"),
Expand Down Expand Up @@ -53,3 +53,5 @@ Suggests:
knitr,
rmarkdown
VignetteBuilder: knitr
Remotes:
github::rte-antares-rpackage/antaresRead
333 changes: 166 additions & 167 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,167 +1,166 @@
# Generated by roxygen2: do not edit by hand

S3method(print,antares.api.command)
S3method(print,antares.api.commands)
S3method(print,antares.api.logs)
export(activateRES)
export(activateST)
export(adequacyOptions)
export(backupStudy)
export(checkRemovedArea)
export(cleanUpOutput)
export(clearScenarioBuilder)
export(computeOtherFromHourlyMulti)
export(computeOtherFromHourlyYear)
export(computeTimeStampFromHourly)
export(convertConfigToAdq)
export(copyOutput)
export(copyStudyWeb)
export(createArea)
export(createBindingConstraint)
export(createBindingConstraintBulk)
export(createCluster)
export(createClusterBulk)
export(createClusterRES)
export(createClusterST)
export(createDSR)
export(createDistrict)
export(createLink)
export(createPSP)
export(createStudy)
export(createStudyAPI)
export(createVariant)
export(create_scb_referential_series_type)
export(deduplicateScenarioBuilder)
export(deleteStudy)
export(dicoGeneralSettings)
export(dicoOptimizationSettings)
export(editArea)
export(editBindingConstraint)
export(editCluster)
export(editClusterRES)
export(editClusterST)
export(editDSR)
export(editLink)
export(editPSP)
export(filteringOptions)
export(getCapacityDSR)
export(getCapacityPSP)
export(getJobLogs)
export(getJobs)
export(getPlaylist)
export(getVariantCommands)
export(group_values_check)
export(importZipStudyWeb)
export(is_antares_v7)
export(is_antares_v820)
export(list_pollutants_values)
export(mockSimulationAPI)
export(nodalOptimizationOptions)
export(propertiesLinkOptions)
export(readIni)
export(readIniAPI)
export(readIniFile)
export(readScenarioBuilder)
export(removeArea)
export(removeBindingConstraint)
export(removeCluster)
export(removeClusterRES)
export(removeClusterST)
export(removeLink)
export(runSimulation)
export(runTsGenerator)
export(scenarioBuilder)
export(searchStudy)
export(setAPImode)
export(setPlaylist)
export(setSolverPath)
export(storage_values_default)
export(updateAdequacySettings)
export(updateGeneralSettings)
export(updateInputSettings)
export(updateOptimizationSettings)
export(updateOutputSettings)
export(updateScenarioBuilder)
export(useVariant)
export(writeEconomicOptions)
export(writeHydroValues)
export(writeIni)
export(writeIniAPI)
export(writeIniFile)
export(writeIniHydro)
export(writeInputTS)
export(writeMiscGen)
export(writeOutputValues)
export(writeSeriesPrepro)
export(writeVariantCommands)
export(writeWaterValues)
import(data.table)
import(doParallel)
import(parallel)
import(pbapply)
import(progressr)
importFrom(antaresRead,api_delete)
importFrom(antaresRead,api_get)
importFrom(antaresRead,api_post)
importFrom(antaresRead,api_put)
importFrom(antaresRead,getAreas)
importFrom(antaresRead,getLinks)
importFrom(antaresRead,readBindingConstraints)
importFrom(antaresRead,readClusterDesc)
importFrom(antaresRead,readClusterSTDesc)
importFrom(antaresRead,readIni)
importFrom(antaresRead,readIniAPI)
importFrom(antaresRead,readIniFile)
importFrom(antaresRead,readInputTS)
importFrom(antaresRead,readLayout)
importFrom(antaresRead,setSimulationPath)
importFrom(antaresRead,setSimulationPathAPI)
importFrom(antaresRead,simOptions)
importFrom(assertthat,assert_that)
importFrom(data.table,":=")
importFrom(data.table,.SD)
importFrom(data.table,CJ)
importFrom(data.table,as.data.table)
importFrom(data.table,data.table)
importFrom(data.table,dcast)
importFrom(data.table,fread)
importFrom(data.table,fwrite)
importFrom(data.table,melt)
importFrom(data.table,month)
importFrom(data.table,rbindlist)
importFrom(data.table,setcolorder)
importFrom(data.table,setnames)
importFrom(data.table,transpose)
importFrom(data.table,yday)
importFrom(data.table,year)
importFrom(doFuture,registerDoFuture)
importFrom(future,plan)
importFrom(grDevices,col2rgb)
importFrom(httr,POST)
importFrom(httr,accept_json)
importFrom(httr,add_headers)
importFrom(httr,content)
importFrom(httr,content_type_json)
importFrom(httr,status_code)
importFrom(httr,stop_for_status)
importFrom(httr,upload_file)
importFrom(jsonlite,toJSON)
importFrom(jsonlite,write_json)
importFrom(lifecycle,deprecated)
importFrom(memuse,Sys.meminfo)
importFrom(plyr,ldply)
importFrom(plyr,llply)
importFrom(stats,as.formula)
importFrom(stats,sd)
importFrom(stats,setNames)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,modifyList)
importFrom(utils,packageVersion)
importFrom(utils,read.table)
importFrom(utils,tail)
importFrom(utils,tar)
importFrom(utils,unzip)
importFrom(utils,write.table)
importFrom(whisker,whisker.render)
importFrom(yaml,read_yaml)
# Generated by roxygen2: do not edit by hand

S3method(print,antares.api.command)
S3method(print,antares.api.commands)
S3method(print,antares.api.logs)
export(activateRES)
export(activateST)
export(adequacyOptions)
export(backupStudy)
export(checkRemovedArea)
export(cleanUpOutput)
export(clearScenarioBuilder)
export(computeOtherFromHourlyMulti)
export(computeOtherFromHourlyYear)
export(computeTimeStampFromHourly)
export(convertConfigToAdq)
export(copyOutput)
export(copyStudyWeb)
export(createArea)
export(createBindingConstraint)
export(createBindingConstraintBulk)
export(createCluster)
export(createClusterBulk)
export(createClusterRES)
export(createClusterST)
export(createDSR)
export(createDistrict)
export(createLink)
export(createPSP)
export(createStudy)
export(createStudyAPI)
export(createVariant)
export(create_scb_referential_series_type)
export(deduplicateScenarioBuilder)
export(deleteStudy)
export(dicoGeneralSettings)
export(dicoOptimizationSettings)
export(dicoOutputSettings)
export(editArea)
export(editBindingConstraint)
export(editCluster)
export(editClusterRES)
export(editClusterST)
export(editDSR)
export(editLink)
export(editPSP)
export(filteringOptions)
export(getCapacityDSR)
export(getCapacityPSP)
export(getJobLogs)
export(getJobs)
export(getPlaylist)
export(getVariantCommands)
export(group_values_meta_check)
export(importZipStudyWeb)
export(is_antares_v7)
export(is_antares_v820)
export(list_pollutants_values)
export(mockSimulationAPI)
export(nodalOptimizationOptions)
export(propertiesLinkOptions)
export(readScenarioBuilder)
export(removeArea)
export(removeBindingConstraint)
export(removeCluster)
export(removeClusterRES)
export(removeClusterST)
export(removeLink)
export(runSimulation)
export(runTsGenerator)
export(scenarioBuilder)
export(searchStudy)
export(setAPImode)
export(setPlaylist)
export(setSolverPath)
export(storage_values_default)
export(updateAdequacySettings)
export(updateGeneralSettings)
export(updateInputSettings)
export(updateOptimizationSettings)
export(updateOutputSettings)
export(updateScenarioBuilder)
export(useVariant)
export(writeEconomicOptions)
export(writeHydroValues)
export(writeIni)
export(writeIniAPI)
export(writeIniFile)
export(writeIniHydro)
export(writeInputTS)
export(writeMiscGen)
export(writeOutputValues)
export(writeSeriesPrepro)
export(writeVariantCommands)
export(writeWaterValues)
import(data.table)
import(doParallel)
import(parallel)
import(pbapply)
import(progressr)
importFrom(antaresRead,api_delete)
importFrom(antaresRead,api_get)
importFrom(antaresRead,api_post)
importFrom(antaresRead,api_put)
importFrom(antaresRead,getAreas)
importFrom(antaresRead,getLinks)
importFrom(antaresRead,readBindingConstraints)
importFrom(antaresRead,readClusterDesc)
importFrom(antaresRead,readClusterSTDesc)
importFrom(antaresRead,readIni)
importFrom(antaresRead,readIniFile)
importFrom(antaresRead,readInputTS)
importFrom(antaresRead,readLayout)
importFrom(antaresRead,setSimulationPath)
importFrom(antaresRead,setSimulationPathAPI)
importFrom(antaresRead,simOptions)
importFrom(assertthat,assert_that)
importFrom(data.table,":=")
importFrom(data.table,.SD)
importFrom(data.table,CJ)
importFrom(data.table,as.data.table)
importFrom(data.table,data.table)
importFrom(data.table,dcast)
importFrom(data.table,fread)
importFrom(data.table,fwrite)
importFrom(data.table,melt)
importFrom(data.table,month)
importFrom(data.table,rbindlist)
importFrom(data.table,setcolorder)
importFrom(data.table,setnames)
importFrom(data.table,transpose)
importFrom(data.table,yday)
importFrom(data.table,year)
importFrom(doFuture,registerDoFuture)
importFrom(future,plan)
importFrom(grDevices,col2rgb)
importFrom(httr,POST)
importFrom(httr,accept_json)
importFrom(httr,add_headers)
importFrom(httr,content)
importFrom(httr,content_type_json)
importFrom(httr,status_code)
importFrom(httr,stop_for_status)
importFrom(httr,upload_file)
importFrom(jsonlite,toJSON)
importFrom(jsonlite,write_json)
importFrom(lifecycle,deprecate_warn)
importFrom(lifecycle,deprecated)
importFrom(lifecycle,is_present)
importFrom(memuse,Sys.meminfo)
importFrom(plyr,ldply)
importFrom(plyr,llply)
importFrom(stats,as.formula)
importFrom(stats,sd)
importFrom(stats,setNames)
importFrom(utils,getFromNamespace)
importFrom(utils,head)
importFrom(utils,modifyList)
importFrom(utils,packageVersion)
importFrom(utils,read.table)
importFrom(utils,tail)
importFrom(utils,tar)
importFrom(utils,unzip)
importFrom(utils,write.table)
importFrom(whisker,whisker.render)
importFrom(yaml,read_yaml)
41 changes: 40 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,45 @@
# antaresEditObject 0.7.1.9000

### Breaking changes :

* `createBindingConstraint()` / `editBindingConstraint()` uses metadata to check the group size of time series.
* `createBindingConstraintBulk()` checks consistency of groups passed as parameters and consistency with the study.
* `importZipStudyWeb()` can delete the zipfile and move the study in Antares Web to another folder
* delete `antaresRead-reexports.R` and adjust scripts to have a clean package
* `removeArea()` : send a warning instead of a stop if an area is referenced in a binding constraint coefficient
* `removeLink()` : send a warning instead of a stop if a link is referenced in a binding constraint coefficient
* `removeCluster()` : send a warning instead of a stop if a cluster is referenced in a binding constraint coefficient

NEW FEATURES (Antares v8.8) :

* `updateOptimizationSettings()` allows the user to update solver.log property
* `createClusterST()` / `editClusterST()` use new parameters and default values


BUGFIXES :

* `createBindingConstraint()` in API mode (for study <v870) created with "hourly" timeStep all the time
* `createBindingConstraint()` / `editBindingConstraint()` in TEXT mode, bad values in time series
* `createBindingConstraintBulk()` with no VALUES and with a mix
* side effects with `readClusterDesc()` / `readClusterResDesc()` / `readClusterSTDesc()`
* Fix bug for data.table to ensure that the variable name is not a column name in `check_cluster_name()` (API + DISK) and `createClusterST()`(API)
* Enable control of matrix dimension in `.check_bulk_object_dim()` even if the values are not in first position in the list
* `editLink()` : avoid *NULL* value (default) for arguments *filter_synthesis* and *filter_year_by_year* to write an empty string
* `updateOutputSettings()` : in API mode, allow the user to edit the desired property


OTHER UPDATES :

* `updateGeneralSettings()` : replace custom.ts.numbers argument by custom.scenario and deprecate custom.ts.numbers
* `updateGeneralSettings()` : add thematic.trimming argument for edition

DOC :

* `createClusterST()` : update doc to discrabe st-storage list parameters + "Inflows" parameter

# antaresEditObject 0.7.0

> Second-member coupling constraint scenarios
> Scenarized RHS for binding constraints
NEW FEATURES (Antares v8.7, cf. Antares v8.7 changelog) :

Expand Down
Loading

0 comments on commit b3fe199

Please sign in to comment.