diff --git a/NEWS.md b/NEWS.md index 4cd70501..9eb17f4b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ > Copyright © 2016 RTE Réseau de transport d’électricité -# antaresRead 2.6.1 (devlopment) +# antaresRead 2.6.1 BUGFIXES : diff --git a/R/aggregateResult.R b/R/aggregateResult.R index b5efa718..b215e452 100644 --- a/R/aggregateResult.R +++ b/R/aggregateResult.R @@ -4,12 +4,10 @@ #' #' @param opts \code{list} of simulation parameters returned by the function \link{setSimulationPath} #' @param nbcl \code{numeric} Number of parralel process -#' @param verbose \code{numeric} show log in console. Defaut to 1 -#' \itemize{ -#' \item{0}{ : No log} -#' \item{1}{ : Short log} -#' \item{2}{ : Long log} -#'} +#' @param verbose \code{numeric} show log in console. Defaut to 1 +#' - 0 : No log +#' - 1 : Short log +#' - 2 : Long log #' @param timestep \code{character} antares timestep #' @param writeOutput \code{boolean} write result or not. #' @param mcWeights \code{numeric} vector of weigth for mcYears. @@ -689,12 +687,6 @@ parAggregateMCall <- function(opts, } #' @param opts \code{list} of simulation parameters returned by the function \link{setSimulationPath} -#' @param verbose \code{numeric} show log in console. Defaut to 1 -#' \itemize{ -#' \item{0}{ : No log} -#' \item{1}{ : Short log} -#' \item{2}{ : Long log} -#'} #' @param timestep \code{character} antares timestep #' @param writeOutput \code{boolean} write result or not. #' @param mcWeights \code{numeric} vector of weigth for mcYears. @@ -1533,7 +1525,7 @@ pmax.fast <- function(k,x) (x+k + abs(x-k))/2 #' #' @import data.table #' -#' @rdname aggregatate_mc_all_old +#' @noRd #' #' @examples #' \dontrun{ diff --git a/man/aggregatate_mc_all.Rd b/man/aggregatate_mc_all.Rd index d218c60c..4b4a1bc4 100644 --- a/man/aggregatate_mc_all.Rd +++ b/man/aggregatate_mc_all.Rd @@ -37,9 +37,9 @@ aggregateResult( \item{verbose}{\code{numeric} show log in console. Defaut to 1 \itemize{ -\item{0}{ : No log} -\item{1}{ : Short log} -\item{2}{ : Long log} +\item 0 : No log +\item 1 : Short log +\item 2 : Long log }} \item{timestep}{\code{character} antares timestep} diff --git a/man/aggregatate_mc_all_old.Rd b/man/aggregatate_mc_all_old.Rd deleted file mode 100644 index 4b5f414a..00000000 --- a/man/aggregatate_mc_all_old.Rd +++ /dev/null @@ -1,57 +0,0 @@ -% Generated by roxygen2: do not edit by hand -% Please edit documentation in R/aggregateResult.R -\name{aggregateResult_old} -\alias{aggregateResult_old} -\alias{parAggregateMCall_old} -\title{Creation of Mc_all (only antares > V6)} -\usage{ -aggregateResult_old( - opts, - verbose = 1, - filtering = FALSE, - selected = NULL, - timestep = c("annual", "daily", "hourly", "monthly", "weekly"), - writeOutput = FALSE, - mcWeights = NULL, - mcYears = NULL -) - -parAggregateMCall_old( - opts, - nbcl = 8, - verbose = 1, - timestep = c("annual", "daily", "hourly", "monthly", "weekly"), - writeOutput = TRUE, - mcWeights = NULL, - mcYears = NULL -) -} -\arguments{ -\item{opts}{\code{list} of simulation parameters returned by the function \link{setSimulationPath}} - -\item{verbose}{\code{numeric} see logs (1) or not (0)} - -\item{filtering}{\code{boolean} filtering control} - -\item{selected}{\code{list} named list (pass to antaresRead) : list(areas = 'a', links = 'a - e')} - -\item{timestep}{\code{character} antares timestep} - -\item{writeOutput}{\code{boolean} write result or not.} - -\item{mcWeights}{\code{numeric} vector of weigth for mcYears.} - -\item{mcYears}{\code{numeric} mcYears to load.} - -\item{nbcl}{\code{numeric} Number of parralel process} -} -\description{ -Creation of Mc_all (only antares > V6) -} -\examples{ -\dontrun{ - aggregateResult(opts) - -} - -} diff --git a/vignettes/antaresH5.Rmd b/vignettes/antaresH5.Rmd index ebe1ced5..ee292c1a 100644 --- a/vignettes/antaresH5.Rmd +++ b/vignettes/antaresH5.Rmd @@ -35,7 +35,6 @@ BiocManager::install("rhdf5") An other solution is to install manually these two packages from zip file. They are available here : https://bioconductor.org/packages/release/bioc/html/zlibbioc.html -http://bioconductor.org/packages/release/bioc/html/rhdf5.html ## Avantages of h5 transformation