Skip to content

Commit

Permalink
resolve conflicts from master + add to DESCRIPTION remotes
Browse files Browse the repository at this point in the history 
Merge branch 'master' of https://github.com/rte-antares-rpackage/antaresEditObject into tomaster

# Conflicts:
#	DESCRIPTION
#	NAMESPACE
#	NEWS.md
#	R/createBindingConstraint.R
#	R/createClusterST.R
#	R/editBindingConstraint.R
#	R/editClusterST.R
#	R/removeArea.R
#	R/removeCluster.R
#	R/removeLink.R
#	R/utils.R
#	man/createBindingConstraint.Rd
#	man/editBindingConstraint.Rd
#	man/removeBindingConstraint.Rd
#	tests/testthat/test-createArea.R
#	tests/testthat/test-createBindingConstraint.R
#	tests/testthat/test-createCluster.R
#	tests/testthat/test-createClusterST.R
#	tests/testthat/test-createLink.R
#	tests/testthat/test-editBindingConstraint.R
#	tests/testthat/test-editClusterST.R
#	tests/testthat/test-editLink.R
#	tests/testthat/test-writeInputTS.R
  • Loading branch information
@berthetclement
berthetclement committed Sep 3, 2024
2 parents 1d17898 + c9adc8e commit a9bbcde
Show file tree
Hide file tree
Showing 6 changed files with 388 additions and 389 deletions.
5 changes: 2 additions & 3 deletions DESCRIPTION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,5 @@ Suggests:
knitr,
rmarkdown
VignetteBuilder: knitr
Remotes:
rte-antares-rpackage/antaresRead

Remotes:
github::rte-antares-rpackage/antaresRead
332 changes: 166 additions & 166 deletions NAMESPACE
View file
Original file line number Diff line number Diff line change
@@ -1,166 +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(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)
# 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)
7 changes: 4 additions & 3 deletions NEWS.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# antaresEditObject 0.7.1 (development)
# antaresEditObject 0.7.1.9000

### Breaking changes :

Expand Down Expand Up @@ -57,10 +57,10 @@ NEW FEATURES (Antares v8.7, cf. Antares v8.7 changelog) :

### Breaking changes :

* `createBindingConstraint()` is available with **offset** parameter in API mode
* `createBindingConstraint()` is available with **offset** parameter in API mode


# antaresEditObject 0.6.4 (development)
# antaresEditObject 0.6.4

BREAKING CHANGES :
* Add UTF-8 encoding argument in `.getJobs()`
Expand All @@ -71,6 +71,7 @@ BUGFIXES :
* `editArea()` : not delete one of the two economic options if only one must be edited
* Avoid data deletion in API mode for `editArea()`


# antaresEditObject 0.6.3

NEW FEATURES :
Expand Down
3 changes: 2 additions & 1 deletion cran-comments.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ New result: ERROR
Failure ('test-createCluster.R:76:5'): Remove all clusters ──────────────────
`antaresRead::readClusterDesc()` did not throw an error.


## antaresEditObject 0.6.4
Patch version to break abusive dependencies with antaresRead in tests
Loading

0 comments on commit a9bbcde

Please sign in to comment.