diff --git a/DESCRIPTION b/DESCRIPTION
index 03ded9f976a4556cba89e0843cde3adb3e0256ab..f18d2867d8c252471d72f98e366ef31baabaf950 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: gmGeostats
-Version: 0.10-5.9000
+Version: 0.10-5
Date: 2020-07-16
-Title: Geostatistics for Compositional Analysis with R
+Title: Geostatistics for Compositional Analysis
Author: Raimon Tolosana Delgado, K. Gerald van den Boogaart,
Ute Mueller, Hassan Talebi
Maintainer: K. Gerald van den Boogaart <support@boogaart.de>
@@ -30,9 +30,12 @@ Description: Support for geostatistical analysis of multivariate data,
compositional data, distributional data, microstructural data, etc.
It includes descriptive analysis and modelling for such data, both
from a two-point Gaussian perspective and multipoint perspective.
+ The methods mainly follow Tolosana-Delgado, Mueller and van den
+ Boogaart (2018) <https://doi.org/10.1007/s11004-018-9769-3>.
License: CC BY-SA 4.0 | GPL (>=2)
URL: https://www.r-project.org, http://www.stat.boogaart.de
-Copyright: (C) 2020 by Helmholtz-Zentrum Dresden-Rossendorf
+Copyright: (C) 2020 by Helmholtz-Zentrum Dresden-Rossendorf and Edith Cowan University;
+ gsi.DS code by Hassan Talebi
RoxygenNote: 7.1.0
Roxygen: list(markdown = TRUE)
Encoding: UTF-8
diff --git a/R/data.R b/R/data.R
index d5a4d5f39f75195fd3456c5fb02ea9772084fef0..70835b2256aa5abc91ef0b25d9501cc705dc34dd 100644
--- a/R/data.R
+++ b/R/data.R
@@ -134,7 +134,7 @@
#'
#' @source Ward (2015) Compositions, logratios and
#' geostatistics: An application to iron ore. MSc Thesis
-#' Edith Cowan University; \url{https://ro.ecu.edu.au/theses/1581}
+#' Edith Cowan University; \url{https://ro.ecu.edu.au/theses/1581/}
"Windarling"
diff --git a/README.Rmd b/README.Rmd
index 475fbb505fc54047e341a1ea322139c23c006398..7054ff338d1e0c50a420474f9c1c57b43f4538f2 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -33,7 +33,7 @@ install.packages("gmGeostats")
## Example
-Read the [vignette](./vignettes/gmGeostats.html) for an extended scheme of the package functionality. The fundamental steps are:
+Read the package vignette for an extended scheme of the package functionality. The fundamental steps are:
```{r example}
## load the package and its dependencies
@@ -55,7 +55,7 @@ gsm = make.gmCompositionalGaussianSpatialModel(
)
```
-From this point on, what you do depends on which model do you have in mind. Here we briefly cover the case of a Gaussian model, though a multipoint approach can also be tackled with function `make.gmCompositionalMPSSpatialModel()` providing a training image as model. See [vignette](./vignettes/gmGeostats.html) for details.
+From this point on, what you do depends on which model do you have in mind. Here we briefly cover the case of a Gaussian model, though a multipoint approach can also be tackled with function `make.gmCompositionalMPSSpatialModel()` providing a training image as model. See the package vignette for details.
A structural analysis can be obtained in the following steps
```{r structural}
@@ -80,6 +80,6 @@ This model can then be validated, interpolated and/or simulated. The workflow fo
2.- if desired, define some new locations where to interpolate or simulate, using `expand.grid()` or `sp::GridTopology()` or similar
-3.- call an appropriate function, specifying the model, potential new data, and the parameters created in the preceding steps; e.g. `validate(model, pars)` for validation, or `predict(model, newdata, pars)` for interpolation or validation
+3.- call an appropriate function, specifying the model, potential new data, and the parameters created in the preceding steps; e.g. `validate(model, pars)` for validation, or `predict(model, newdata, pars)` for interpolation or simulation
-More information can be found in this [vignette](./vignettes/gmGeostats.html).
\ No newline at end of file
+More information can be found in the package vignette.
\ No newline at end of file
diff --git a/README.md b/README.md
index 630a42de4baec7ed3d7ad86072a3d5adbd5fd2b0..7d8eb2dc824361d75fe4dae0670f666f53fb9eda 100644
--- a/README.md
+++ b/README.md
@@ -32,14 +32,12 @@ install.packages("gmGeostats")
## Example
-Read the [vignette](./vignettes/gmGeostats.html) for an extended scheme
-of the package functionality. The fundamental steps are:
+Read the package vignette for an extended scheme of the package
+functionality. The fundamental steps are:
``` r
## load the package and its dependencies
library(gmGeostats)
-#> Warning: replacing previous import 'compositions::fit.lmc' by 'gstat::fit.lmc'
-#> when loading 'gmGeostats'
#> Welcome to 'gmGeostats', a package for multivariate geostatistical analysis.
#> Note: use 'fit_lmc' instead of fit.lmc
@@ -67,7 +65,7 @@ From this point on, what you do depends on which model do you have in
mind. Here we briefly cover the case of a Gaussian model, though a
multipoint approach can also be tackled with function
`make.gmCompositionalMPSSpatialModel()` providing a training image as
-model. See [vignette](./vignettes/gmGeostats.html) for details.
+model. See the package vignette for details.
A structural analysis can be obtained in the following steps
@@ -101,7 +99,6 @@ simulate, using `expand.grid()` or `sp::GridTopology()` or similar
3.- call an appropriate function, specifying the model, potential new
data, and the parameters created in the preceding steps; e.g.
`validate(model, pars)` for validation, or `predict(model, newdata,
-pars)` for interpolation or validation
+pars)` for interpolation or simulation
-More information can be found in this
-[vignette](./vignettes/gmGeostats.html).
+More information can be found in the package vignette.
diff --git a/cran-comments.md b/cran-comments.md
index e92f8ea212e32a10310221511512b69aae1fe25d..69a59618a6edc54ff82c6427db5668f568a931e4 100644
--- a/cran-comments.md
+++ b/cran-comments.md
@@ -17,22 +17,35 @@
* this is a resubmission, after the following manual check report:
```
-Found the following \keyword or \concept entries with Rd markup:
- File 'LeaveOneOut.Rd':
- \concept{{validation functions}}
- File 'Maf.data.frame.Rd':
- \concept{{genDiag}}
- File 'NfoldCrossValidation.Rd':
- \concept{{validation functions}}
+Thanks, we see:
-Please omit all extra sets of braces.
+ Found the following (possibly) invalid URLs:
+ URL: https://ro.ecu.edu.au/theses/1581 (moved to https://ro.ecu.edu.au/theses/1581/)
+ From: man/Windarling.Rd
+ Status: 200
+ Message: OK
+--> trailing slash needed.
+
+ Found the following (possibly) invalid file URI:
+ URI: ./vignettes/gmGeostats.html
+ From: README.md
+Pls include the file or link to it via a fully specified URL.
+
+Is there some reference about the method you can add in the Description field in the form Authors (year) <doi:.....>?
+
+In thw Title field, why not drop the redundant " with R"?
+
+Please fix and resubmit after the CRAN break, i.e. after Aug 24.
Best,
-Uwe Ligges
+Uwe Ligges
+
```
Action:
-- extra sets of braces were omitted
-
-
+- all urls checked for trailing slashes; in particular <https://ro.ecu.edu.au/theses/1581> was moved to <https://ro.ecu.edu.au/theses/1581/> as requested
+- all links to the vignette (./vignettes/gmGeostats.html) have been removed
+- reference to Tolosana-Delgado, Mueller and van den Boogaart (2018) <https://doi.org/10.1007/s11004-018-9769-3> added in the Description field of the DESCRIPTION file
+- redundant "with R" removed from Title field of DESCRIPTION file
+-