From 8883db42e797e5f35c18f9be77e7aea03345b572 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 10 Oct 2018 11:26:08 +0200
Subject: [PATCH] v1.0.15.2 CLEAN:
---
DESCRIPTION | 2 +-
NEWS.rmd | 7 ++++-
.../vignettes_data}/Vignette_Param.rda | Bin
man/Vignette_Param.Rd | 29 ------------------
vignettes/V02.1_param_optim.Rmd | 2 +-
vignettes/V02.2_param_mcmc.Rmd | 2 +-
6 files changed, 9 insertions(+), 33 deletions(-)
rename {data => inst/vignettes_data}/Vignette_Param.rda (100%)
delete mode 100644 man/Vignette_Param.Rd
diff --git a/DESCRIPTION b/DESCRIPTION
index 1e2f71f2..733080b1 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 6802f1d3..5a1d80db 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 4d39b579..00000000
--- 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 5c87fc9d..8ee08c30 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 5192c6ea..f618b78b 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"))
```
--
GitLab