Skip to content

Commit bb51ed8

Browse files
berthetclementberthetclement
authoredJun 27, 2024··
Merge pull request #44 from rte-antares-rpackage/fix/cran/issue/m1mac
update package, deleting dep rhdf5 to fix cran release of antaresRead
·
v0.18.3v0.18.2
2 parents 5e0b4d9 + 2f0df0a commit bb51ed8

24 files changed

+206
-1642
lines changed
 

‎.Rbuildignore

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
^.*\.Rproj$
2-
^\.Rproj\.user$
3-
^\.travis\.yml$
4-
^codecov\.yml$
5-
^appveyor\.yml$
6-
^cran-comments\.md$
7-
^CRAN-RELEASE$
1+
^.*\.Rproj$
2+
^\.Rproj\.user$
3+
^\.travis\.yml$
4+
^codecov\.yml$
5+
^appveyor\.yml$
6+
^cran-comments\.md$
7+
^CRAN-RELEASE$
8+
^CRAN-SUBMISSION$
9+
^revdep$

‎.gitignore

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
.Rproj.user
2-
.Rhistory
3-
.RData
4-
.Ruserdata
5-
inst/doc
1+
.Rproj.user
2+
.Rhistory
3+
.RData
4+
.Ruserdata
5+
inst/doc
6+
revdep/checks/
7+
revdep/data.sqlite
8+
revdep/library/

‎.travis.yml

-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ r_github_packages:
2424
#before - Bioconductor-mirror/zlibbioc
2525
# - Bioconductor-mirror/rhdf5
2626
#after
27-
bioc_packages:
28-
- rhdf5
29-
- zlibbioc
30-
3127

3228
r_packages:
3329
- covr

‎DESCRIPTION

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Package: antaresProcessing
22
Type: Package
33
Title: 'Antares' Results Processing
4-
Version: 0.18.1
4+
Version: 0.18.2
55
Authors@R: c(
6-
person("Veronique", "Bachelier", email = "veronique.bachelier@rte-france.com", role = c("aut", "cre")),
6+
person("Tatiana", "Vargas", email = "tatiana.vargas@rte-france.com", role = c("aut", "cre")),
77
person("Jalal-Edine", "ZAWAM", role = "aut"),
88
person("Francois", "Guillem", role = "aut"),
99
person("Benoit", "Thieurmel", role = "aut"),
@@ -27,13 +27,12 @@ Imports:
2727
methods,
2828
stats
2929
Suggests:
30-
rhdf5 (>= 2.24.0),
3130
parallel,
3231
testthat,
3332
knitr,
3433
rmarkdown,
3534
covr
36-
RoxygenNote: 7.1.2
35+
RoxygenNote: 7.2.2
3736
VignetteBuilder: knitr
3837
Encoding: UTF-8
3938
biocViews: Infrastructure, DataImport

‎NAMESPACE

-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
# Generated by roxygen2: do not edit by hand
22

3-
export(.setAliasH5)
43
export(addCongestionLink)
54
export(addDownwardMargin)
65
export(addExportAndImport)
76
export(addLoadFactorLink)
87
export(addNetLoad)
9-
export(addProcessingH5)
108
export(addUpwardMargin)
119
export(compare)
1210
export(externalDependency)

‎NEWS

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Copyright © 2016 RTE Réseau de transport d’électricité
22

3+
Changes in version 0.18.2
4+
* delete suggest dependecies `rhdf5` causing error in `AntaresRead`
5+
6+
37
Changes in version 0.18.1 (2021-10-20)
48

59
BUGFIXES:

‎R/addExportAndImport.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#'@param x
99
#' an object of class "antaresDataList" created with the function
1010
#' \code{readAntares}. It has to contain some areas and all the links that are
11-
#' connected to these areas. Moreover the function \code{\link{removeVirtualAreas}} must be call before.
11+
#' connected to these areas. Moreover the function "removeVirtualAreas" must be call before.
1212
#' @param addCapacities
1313
#' If \code{TRUE}, export and import capacities are added.
1414
#' @param opts opts

‎R/compare.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#' Compare two simulations or two antaresData
44
#'
55
#' \code{compare} has been designed to compare two surpluses created with function
6-
#' \code{\link{surplus}} but it can be used to compare the values of two tables of
6+
#' "surplus" but it can be used to compare the values of two tables of
77
#' class \code{antaresData} that contain the same type of data.
88
#'
99
#' @param x

‎R/h5_processing.R

-808
This file was deleted.

‎R/zzz.R

+111-111
Original file line numberDiff line numberDiff line change
@@ -121,114 +121,114 @@ globalVariables(
121121

122122
pkgEnv <- antaresRead:::pkgEnv
123123

124-
#----------------------------- HDF5 ------------------------------------#
125-
126-
.requireRhdf5_Antares <- antaresRead:::.requireRhdf5_Antares
127-
128-
# Process H5
129-
pkgEnv$process$addNetLoad$areas <- c("netLoad")
130-
pkgEnv$process$addNetLoad$districts <- c("netLoad")
131-
132-
pkgEnv$process$addDownwardMargin$areas <- c(
133-
"isolatedDownwardMargin",
134-
"interconnectedDownwardMargin"
135-
)
136-
137-
pkgEnv$process$addDownwardMargin$districts <- c(
138-
"isolatedDownwardMargin",
139-
"interconnectedDownwardMargin"
140-
)
141-
142-
pkgEnv$process$addUpwardMargin$areas <- c(
143-
"isolatedUpwardMargin",
144-
"interconnectedUpwardMargin"
145-
)
146-
pkgEnv$process$addUpwardMargin$districts <- c(
147-
"isolatedUpwardMargin",
148-
"interconnectedUpwardMargin"
149-
)
150-
151-
pkgEnv$process$addExportAndImport$areas <- c(
152-
"import",
153-
"export",
154-
"capExport",
155-
"capImport"
156-
)
157-
158-
pkgEnv$process$addExportAndImport$districts <- c(
159-
"import",
160-
"export",
161-
"capExport",
162-
"capImport"
163-
)
164-
165-
pkgEnv$process$addLoadFactorLink$links <- c(
166-
"loadFactor",
167-
"congestion"
168-
)
169-
170-
pkgEnv$process$externalDependency$areas <- c(
171-
"netLoad",
172-
"exportsLevel",
173-
"importsLevel",
174-
"exportsFrequency",
175-
"importsFrequency"
176-
)
177-
178-
pkgEnv$process$externalDependency$districts <- c(
179-
"netLoad",
180-
"exportsLevel",
181-
"importsLevel",
182-
"exportsFrequency",
183-
"importsFrequency"
184-
)
185-
186-
pkgEnv$process$loadFactor$clusters <- c("loadFactor", "propHoursMinGen", "propHoursMaxGen", "loadFactorAvailable")
187-
188-
pkgEnv$process$modulation$clusters <- c(
189-
"upwardModulation", "downwardModulation",
190-
"absoluteModulation"
191-
)
192-
193-
pkgEnv$process$netLoadRamp$areas <- c("netLoadRamp", "balanceRamp", "areaRamp")
194-
195-
pkgEnv$process$netLoadRamp$districts <- c("netLoadRamp", "balanceRamp", "areaRamp")
196-
197-
pkgEnv$process$surplus$areas <- c("consumerSurplus", "producerSurplus", "rowBalanceSurplus",
198-
"storageSurplus", "congestionFees", "globalSurplus")
199-
200-
pkgEnv$process$surplus$districts <- c("consumerSurplus", "producerSurplus", "rowBalanceSurplus",
201-
"storageSurplus", "congestionFees", "globalSurplus")
202-
203-
pkgEnv$process$surplusClusters$clusters <- c("variableCost", "fixedCost", "startupCost",
204-
"surplusPerUnit", "totalSurplus",
205-
"economicGradient", "surplusLastUnit")
206-
207-
pkgEnv$processDispo <- data.frame(
208-
trtName = c(
209-
"netLoad",
210-
"downwardMargin",
211-
"upwardMargin",
212-
"exportsImports",
213-
"loadFactorLink",
214-
"externalDependency",
215-
"loadFactor",
216-
"modulation",
217-
"netLoadRamp",
218-
"surplus",
219-
"surplusClusters"
220-
),
221-
fctname = c(
222-
"addNetLoad",
223-
"addDownwardMargin",
224-
"addUpwardMargin",
225-
"addExportAndImport",
226-
"addLoadFactorLink",
227-
"externalDependency",
228-
"loadFactor",
229-
"modulation",
230-
"netLoadRamp",
231-
"surplus",
232-
"surplusClusters"
233-
)
234-
)
124+
# #----------------------------- HDF5 ------------------------------------#
125+
#
126+
# .requireRhdf5_Antares <- antaresRead:::.requireRhdf5_Antares
127+
#
128+
# # Process H5
129+
# pkgEnv$process$addNetLoad$areas <- c("netLoad")
130+
# pkgEnv$process$addNetLoad$districts <- c("netLoad")
131+
#
132+
# pkgEnv$process$addDownwardMargin$areas <- c(
133+
# "isolatedDownwardMargin",
134+
# "interconnectedDownwardMargin"
135+
# )
136+
#
137+
# pkgEnv$process$addDownwardMargin$districts <- c(
138+
# "isolatedDownwardMargin",
139+
# "interconnectedDownwardMargin"
140+
# )
141+
#
142+
# pkgEnv$process$addUpwardMargin$areas <- c(
143+
# "isolatedUpwardMargin",
144+
# "interconnectedUpwardMargin"
145+
# )
146+
# pkgEnv$process$addUpwardMargin$districts <- c(
147+
# "isolatedUpwardMargin",
148+
# "interconnectedUpwardMargin"
149+
# )
150+
#
151+
# pkgEnv$process$addExportAndImport$areas <- c(
152+
# "import",
153+
# "export",
154+
# "capExport",
155+
# "capImport"
156+
# )
157+
#
158+
# pkgEnv$process$addExportAndImport$districts <- c(
159+
# "import",
160+
# "export",
161+
# "capExport",
162+
# "capImport"
163+
# )
164+
#
165+
# pkgEnv$process$addLoadFactorLink$links <- c(
166+
# "loadFactor",
167+
# "congestion"
168+
# )
169+
#
170+
# pkgEnv$process$externalDependency$areas <- c(
171+
# "netLoad",
172+
# "exportsLevel",
173+
# "importsLevel",
174+
# "exportsFrequency",
175+
# "importsFrequency"
176+
# )
177+
#
178+
# pkgEnv$process$externalDependency$districts <- c(
179+
# "netLoad",
180+
# "exportsLevel",
181+
# "importsLevel",
182+
# "exportsFrequency",
183+
# "importsFrequency"
184+
# )
185+
#
186+
# pkgEnv$process$loadFactor$clusters <- c("loadFactor", "propHoursMinGen", "propHoursMaxGen", "loadFactorAvailable")
187+
#
188+
# pkgEnv$process$modulation$clusters <- c(
189+
# "upwardModulation", "downwardModulation",
190+
# "absoluteModulation"
191+
# )
192+
#
193+
# pkgEnv$process$netLoadRamp$areas <- c("netLoadRamp", "balanceRamp", "areaRamp")
194+
#
195+
# pkgEnv$process$netLoadRamp$districts <- c("netLoadRamp", "balanceRamp", "areaRamp")
196+
#
197+
# pkgEnv$process$surplus$areas <- c("consumerSurplus", "producerSurplus", "rowBalanceSurplus",
198+
# "storageSurplus", "congestionFees", "globalSurplus")
199+
#
200+
# pkgEnv$process$surplus$districts <- c("consumerSurplus", "producerSurplus", "rowBalanceSurplus",
201+
# "storageSurplus", "congestionFees", "globalSurplus")
202+
#
203+
# pkgEnv$process$surplusClusters$clusters <- c("variableCost", "fixedCost", "startupCost",
204+
# "surplusPerUnit", "totalSurplus",
205+
# "economicGradient", "surplusLastUnit")
206+
#
207+
# pkgEnv$processDispo <- data.frame(
208+
# trtName = c(
209+
# "netLoad",
210+
# "downwardMargin",
211+
# "upwardMargin",
212+
# "exportsImports",
213+
# "loadFactorLink",
214+
# "externalDependency",
215+
# "loadFactor",
216+
# "modulation",
217+
# "netLoadRamp",
218+
# "surplus",
219+
# "surplusClusters"
220+
# ),
221+
# fctname = c(
222+
# "addNetLoad",
223+
# "addDownwardMargin",
224+
# "addUpwardMargin",
225+
# "addExportAndImport",
226+
# "addLoadFactorLink",
227+
# "externalDependency",
228+
# "loadFactor",
229+
# "modulation",
230+
# "netLoadRamp",
231+
# "surplus",
232+
# "surplusClusters"
233+
# )
234+
# )

‎README.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
66
<!-- badges: start -->
77
[![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/antaresProcessing)](https://cran.r-project.org/package=antaresProcessing)
8-
[![Build status](https://ci.appveyor.com/api/projects/status/rnf5iejmgyu00j1i?svg=true)](https://ci.appveyor.com/project/rte-antares-rpackage/antaresprocessing)
9-
[![Build Status](https://travis-ci.org/rte-antares-rpackage/antaresProcessing.svg?branch=master)](https://travis-ci.org/rte-antares-rpackage/antaresProcessing)
10-
[![codecov](https://codecov.io/gh/rte-antares-rpackage/antaresProcessing/branch/develop/graph/badge.svg)](https://codecov.io/gh/rte-antares-rpackage/antaresProcessing/branch/develop)
118
<!-- badges: end -->
129

1310

@@ -90,4 +87,4 @@ Copyright 2015-2020 RTE (France)
9087

9188
* RTE: http://www.rte-france.com
9289

93-
This Source Code is subject to the terms of the GNU General Public License, version 2 or any higher version. If a copy of the GPL-v2 was not distributed with this file, You can obtain one at https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html.
90+
This Source Code is subject to the terms of the GNU General Public License, version 2 or any higher version. If a copy of the GPL-v2 was not distributed with this file.

‎antaresProcessing.Rproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ LineEndingConversion: Posix
1919
BuildType: Package
2020
PackageUseDevtools: Yes
2121
PackageInstallArgs: --no-multiarch --with-keep.source
22-
PackageRoxygenize: rd,collate,namespace,vignette
22+
PackageRoxygenize: rd,collate,namespace

‎cran-comments.md

+2
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@
1010
* There's a new maintainer to the package. This release correct problems reported by Brian D. Ripley.
1111
Thanks!
1212

13+
# Changes in version 0.18.2
14+
* delete suggest dependecies `rhdf5` causing error in `AntaresRead`

‎man/addExportAndImport.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎man/addProcessingH5.Rd

-130
This file was deleted.

‎man/compare.Rd

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎revdep/README.md

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Platform
2+
3+
|field |value |
4+
|:--------|:-----------------------------------|
5+
|version |R version 4.2.2 (2022-10-31 ucrt) |
6+
|os |Windows 10 x64 (build 19045) |
7+
|system |x86_64, mingw32 |
8+
|ui |RStudio |
9+
|language |(EN) |
10+
|collate |French_France.utf8 |
11+
|ctype |French_France.utf8 |
12+
|tz |Europe/Paris |
13+
|date |2024-06-24 |
14+
|rstudio |2023.12.0+369 Ocean Storm (desktop) |
15+
|pandoc |NA |
16+
17+
# Dependencies
18+
19+
|package |old |new |Δ |
20+
|:-----------------|:------|:------|:--|
21+
|antaresProcessing |0.18.1 |0.18.2 |* |
22+
|cachem |NA |1.1.0 |* |
23+
|cli |NA |3.6.3 |* |
24+
|crayon |NA |1.5.3 |* |
25+
|fastmap |NA |1.2.0 |* |
26+
|openssl |NA |2.2.0 |* |
27+
|rlang |NA |1.1.4 |* |
28+
|stringi |NA |1.8.4 |* |
29+
30+
# Revdeps
31+

‎revdep/cran.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## revdepcheck results
2+
3+
We checked 1 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
4+
5+
* We saw 0 new problems
6+
* We failed to check 0 packages
7+

‎revdep/failures.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*Wow, no problems at all. :)*

‎revdep/problems.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*Wow, no problems at all. :)*

‎tests/testthat/test-h5_allias.R

-8
This file was deleted.

‎tests/testthat/test-h5_processing.R

-333
This file was deleted.

‎tests/testthat/test-thermalGroupCapacities.R

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
context("thermalGroupCapacities")
2-
3-
4-
sapply(studyPathS, function(studyPath){
5-
6-
opts <- setSimulationPath(studyPath)
7-
8-
test_that("thermalGroupCapacities calc",{
9-
Tres <- thermalGroupCapacities(opts)
10-
reCl <- readClusterDesc(opts)
11-
uniqueRe <- unique(reCl[, .SD, .SDcols = c("area", "group")])
12-
expect_true(nrow(uniqueRe) == nrow(Tres))
13-
})
14-
15-
if(requireNamespace("rhdf5")){
16-
rhdf5::H5close()
17-
}
18-
if(dir.exists(pathtodelete))
19-
{
20-
unlink(pathtodelete, recursive = TRUE)
21-
}
22-
23-
})
1+
# context("thermalGroupCapacities")
2+
#
3+
#
4+
# sapply(studyPathS, function(studyPath){
5+
#
6+
# opts <- setSimulationPath(studyPath)
7+
#
8+
# test_that("thermalGroupCapacities calc",{
9+
# Tres <- thermalGroupCapacities(opts)
10+
# reCl <- readClusterDesc(opts)
11+
# uniqueRe <- unique(reCl[, .SD, .SDcols = c("area", "group")])
12+
# expect_true(nrow(uniqueRe) == nrow(Tres))
13+
# })
14+
#
15+
# if(requireNamespace("rhdf5")){
16+
# rhdf5::H5close()
17+
# }
18+
# if(dir.exists(pathtodelete))
19+
# {
20+
# unlink(pathtodelete, recursive = TRUE)
21+
# }
22+
#
23+
# })

‎vignettes/antaresProcessing.html

-198
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.