From aa420675b3384f93b2c91aec9d3a11dac95111d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Schmidt?= Date: Tue, 11 Jun 2024 19:35:37 +0200 Subject: [PATCH 1/3] git comments updated --- cran-comments.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cran-comments.md b/cran-comments.md index c62024c3..7776dd2a 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,8 +1,5 @@ -## This is a resubmission -* All issues have been fixed - ## Test environments -* Windows10 R 4.3.0 local development environment +* Windows10 R 4.4.0 local development environment * Windows10 R 4.2.2 local development environment * GitHub Actions: * macOS-latest, R: release From 096716eba326bf8e459a3b133c0f184b32cd9dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Schmidt?= Date: Tue, 11 Jun 2024 19:36:55 +0200 Subject: [PATCH 2/3] version and date updated --- DESCRIPTION | 4 ++-- NEWS.md | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 778f53f9..43c58cec 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: emdi Title: Estimating and Mapping Disaggregated Indicators -Version: 2.2.1 -Date: 2023-10-30 +Version: 2.2.2 +Date: 2024-06-11 Authors@R: c(person("Sylvia", "Harmening", role="aut", email = "sylvia.harmening@fu-berlin.de"), person("Ann-Kristin", "Kreutzmann", role="aut", email="ann-kristin.kreutzmann@fu-berlin.de"), person("Soeren", "Pannier", role=c("aut", "cre"), email="soeren.pannier@fu-berlin.de"), diff --git a/NEWS.md b/NEWS.md index 071cf7a4..cff567c2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,6 @@ * Addition of logit transformation in FH model * Removal of MuMIn dependency - # emdi 2.2.1 * Substitution of maptools and rgeos by sf due to depreciation of the former * Substitution of ggplot2::fortify by ggplot2::geom_sf due to depreciation of the former From 678646f0c214e036822f4756d4b7dc5dd42d1237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Schmidt?= Date: Tue, 11 Jun 2024 21:53:21 +0200 Subject: [PATCH 3/3] doctype removed --- R/emdi.R | 1 - man/emdi.Rd | 26 -------------------------- 2 files changed, 27 deletions(-) diff --git a/R/emdi.R b/R/emdi.R index 3bd91d9f..4b3e85dd 100644 --- a/R/emdi.R +++ b/R/emdi.R @@ -44,6 +44,5 @@ #' Guadarrama, M., Molina, I. and Rao, J.N.K. (2018). Small area estimation of #' general parameters under complex sampling designs. Computational Statistics & #' Data Analysis, Vol. 121, 20-40. -#' @docType package #' @name emdi NULL diff --git a/man/emdi.Rd b/man/emdi.Rd index b174e1de..0c596975 100644 --- a/man/emdi.Rd +++ b/man/emdi.Rd @@ -1,8 +1,6 @@ % Generated by roxygen2: do not edit by hand % Please edit documentation in R/emdi.R -\docType{package} \name{emdi} -\alias{emdi-package} \alias{emdi} \title{A package for estimating and mapping disaggregated indicators} \description{ @@ -49,27 +47,3 @@ Guadarrama, M., Molina, I. and Rao, J.N.K. (2018). Small area estimation of general parameters under complex sampling designs. Computational Statistics & Data Analysis, Vol. 121, 20-40. } -\seealso{ -Useful links: -\itemize{ - \item \url{https://github.com/SoerenPannier/emdi} -} - -} -\author{ -\strong{Maintainer}: Soeren Pannier \email{soeren.pannier@fu-berlin.de} - -Authors: -\itemize{ - \item Sylvia Harmening \email{sylvia.harmening@fu-berlin.de} - \item Ann-Kristin Kreutzmann \email{ann-kristin.kreutzmann@fu-berlin.de} - \item Felix Skarke \email{f.skarke@fu-berlin.de} - \item Natalia Rojas-Perilla \email{natalia.rojas@fu-berlin.de} - \item Nicola Salvati \email{nicola.salvati@unipi.it} - \item Timo Schmid \email{timo.schmid@fu-berlin.de} - \item Matthias Templ \email{templ@statistik.tuwien.ac.at} - \item Nikos Tzavidis \email{N.TZAVIDIS@soton.ac.uk} - \item Nora Würz \email{nora.wuerz@fu-berlin.de} -} - -}