diff --git a/DESCRIPTION b/DESCRIPTION index 1e2f71f238bfe176af05b7b6ae323c25ca266418..733080b152d309ea3fb7dbe849c0d49ff07bbfdb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.0.15.1 +Version: 1.0.15.2 Date: 2018-10-10 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.rmd b/NEWS.rmd index 6802f1d331098f53f3d029db1d17754556ab79f2..5a1d80db57c9ba34e11bb28375d33f4c29debdbc 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.0.15.1 Release Notes (2018-10-10) +### 1.0.15.2 Release Notes (2018-10-10) #### Bug fixes @@ -25,6 +25,11 @@ output: - <code>CreateRunOptions()</code> was cleant, with no effect on its outputs. + +#### CRAN-compatibility updates + +- The <code>Vignette_Param.</code> datasets moved to the inst directory. It contains different objects needed for param_optim and param_mcmc vignettes. + ____________________________________________________________________________________ diff --git a/data/Vignette_Param.rda b/inst/vignettes_data/Vignette_Param.rda similarity index 100% rename from data/Vignette_Param.rda rename to inst/vignettes_data/Vignette_Param.rda diff --git a/man/Vignette_Param.Rd b/man/Vignette_Param.Rd deleted file mode 100644 index 4d39b5798e1d8dd40c2f97c940bbc75ac7f888e1..0000000000000000000000000000000000000000 --- a/man/Vignette_Param.Rd +++ /dev/null @@ -1,29 +0,0 @@ -\docType{data} -\encoding{UTF-8} - - -\name{Vignette_Param} -\alias{IniParam} -\alias{ListIniParam} -\alias{list_opt} -\alias{mcmcDRAM} -\alias{optDE} -\alias{optMALS} -\alias{optPORT} -\alias{optPORT_} -\alias{optPSO} -\alias{startGR4J} - - - - -\title{Datasets needed to run param_optim or param_mcmc vignettes} - - - - -\description{Datasets needed to run param_optim or param_mcmc vignettes.} - - - - diff --git a/vignettes/V02.1_param_optim.Rmd b/vignettes/V02.1_param_optim.Rmd index 5c87fc9dd9270c20957589347e571ede2f84516e..8ee08c308f9d7d4ba483b713de336e7b124ada18 100644 --- a/vignettes/V02.1_param_optim.Rmd +++ b/vignettes/V02.1_param_optim.Rmd @@ -17,7 +17,7 @@ library(hydroPSO) library(Rmalschains) # source("airGR.R") set.seed(321) -data("Vignette_Param") +load(system.file("vignettes_data/Vignette_Param.rda", package = "airGR")) ``` diff --git a/vignettes/V02.2_param_mcmc.Rmd b/vignettes/V02.2_param_mcmc.Rmd index 5192c6ea89a0258a9700c99be6d9f4dec60e5e20..f618b78bd746fd999a39aa761759c03a1bbc2a7f 100644 --- a/vignettes/V02.2_param_mcmc.Rmd +++ b/vignettes/V02.2_param_mcmc.Rmd @@ -18,7 +18,7 @@ library(ggmcmc) library(dplyr) # source("airGR.R") set.seed(123) -data("Vignette_Param") +load(system.file("vignettes_data/Vignette_Param.rda", package = "airGR")) ```