From 23255edbc891e4e79d0c852ad45655f9692ef24c Mon Sep 17 00:00:00 2001 From: Rainer Walke Date: Wed, 2 Oct 2019 10:55:37 +0200 Subject: [PATCH] define unbound variables locally fix some more parts using data.table:: --- NAMESPACE | 2 ++ R/GENESISClasses.R | 15 ++++++++++----- R/HMDClasses.R | 6 ++++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/NAMESPACE b/NAMESPACE index 2198e8b..596454d 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -32,6 +32,8 @@ exportMethods(selectRegion) exportMethods(selectYears) exportMethods(show) importFrom(data.table,":=") +importFrom(data.table,fread) +importFrom(data.table,setnames) importFrom(methods,new) importFrom(methods,show) importFrom(methods,validObject) diff --git a/R/GENESISClasses.R b/R/GENESISClasses.R index 45b0d41..6295754 100644 --- a/R/GENESISClasses.R +++ b/R/GENESISClasses.R @@ -2,7 +2,7 @@ #' @importFrom methods new show validObject NULL -#' @importFrom data.table := +#' @importFrom data.table := fread setnames NULL #### @@ -56,6 +56,7 @@ setMethod("show", "RD1", #' @export setMethod("selectYears", "RD1", function(x, selectYears) { + Year <- NULL # evoid NOTE .rd1 <- x@rd1[Year %in% selectYears] return(new("RD1", header=x@header, footer=x@footer, rd1=.rd1, content=x@content, country=x@country, protocol=x@protocol)) } @@ -63,6 +64,7 @@ setMethod("selectYears", "RD1", function(x, selectYears) { #' @export setMethod("selectRegion", "RD1", function(x, selectRegion) { + Region_Code <- NULL # evoid NOTE .rd1 <- x@rd1[Region_Code %in% selectRegion] return(new("RD1", header=x@header, footer=x@footer, rd1=.rd1, content=x@content, country=x@country, protocol=x@protocol)) } @@ -137,6 +139,7 @@ setMethod("show", "RE1", #' @export setMethod("selectYears", "RE1", function(x, selectYears) { + Year <- NULL # evoid NOTE .re1 <- x@re1[Year %in% selectYears] return(new("RE1", header=x@header, footer=x@footer, re1=.re1, content=x@content, country=x@country, protocol=x@protocol)) } @@ -144,6 +147,7 @@ setMethod("selectYears", "RE1", function(x, selectYears) { #' @export setMethod("selectRegion", "RE1", function(x, selectRegion) { + Region_Code <- NULL # evoid NOTE .re1 <- x@re1[Region_Code %in% selectRegion] return(new("RE1", header=x@header, footer=x@footer, re1=.re1, content=x@content, country=x@country, protocol=x@protocol)) } @@ -184,11 +188,11 @@ readRegDeath <- function(infile) rdft <- data.table::fread(infile, skip=h2, nrows=(f1-h2-1)) - setnames(rdft, c("V1","V2","V3","V4","V5","V6","V7","V8","V9","V10"), + data.table::setnames(rdft, c("V1","V2","V3","V4","V5","V6","V7","V8","V9","V10"), c("Year","Region_Code","Region_Name","Age_Name","Total1","Male","Female","D_Total","D_Male","D_Female")) # merge the lower age limit - age_code1 <- data.table(Age_Name=c("unter 1 Jahr","1 bis unter 5 Jahre", + age_code1 <- data.table::data.table(Age_Name=c("unter 1 Jahr","1 bis unter 5 Jahre", "5 bis unter 10 Jahre","10 bis unter 15 Jahre", "15 bis unter 20 Jahre","20 bis unter 25 Jahre", "25 bis unter 30 Jahre","30 bis unter 35 Jahre", @@ -223,14 +227,15 @@ readRegExp <- function(infile) rexpt <- data.table::fread(infile, skip=h2, nrows=(f1-h2-1)) - setnames(rexpt, c("V1","V2","V3","V4","V5","V6","V7","V8","V9","V10","V11","V12"), + data.table::setnames(rexpt, c("V1","V2","V3","V4","V5","V6","V7","V8","V9","V10","V11","V12"), c("Region_Code","Region_Name","Age_Name","Total1","Male","Female","D_Total","D_Male","D_Female", "A_Total","A_Male","A_Female")) # add the year + Year <- NULL # avoid NOTE rexpt[, Year:=2016] # merge the lower age limit - age_code2 <- data.table(Age_Name=c("unter 3 Jahre","3 bis unter 6 Jahre", + age_code2 <- data.table::data.table(Age_Name=c("unter 3 Jahre","3 bis unter 6 Jahre", "6 bis unter 10 Jahre","10 bis unter 15 Jahre", "15 bis unter 18 Jahre","18 bis unter 20 Jahre", "20 bis unter 25 Jahre", diff --git a/R/HMDClasses.R b/R/HMDClasses.R index 148e276..193a225 100644 --- a/R/HMDClasses.R +++ b/R/HMDClasses.R @@ -2,7 +2,7 @@ #' @importFrom methods new show validObject NULL -#' @importFrom data.table := +#' @importFrom data.table := fread NULL #### @@ -64,7 +64,8 @@ setMethod("show", "LT1", #' @export setMethod("selectYears", "LT1", function(x, selectYears) { - .lt1 <- x@lt1[Year %in% selectYears] + Year <- NULL # evoid NOTE + .lt1 <- x@lt1[Year %in% selectYears] return(new("LT1", header=x@header, lt1=.lt1, content=x@content, country=x@country, protocol=x@protocol)) } ) @@ -142,6 +143,7 @@ setMethod("show", "EX1", #' @export setMethod("selectYears", "EX1", function(x, selectYears) { + Year <- NULL # evoid NOTE .ex1 <- x@ex1[Year %in% selectYears] return(new("EX1", header=x@header, ex1=.ex1, content=x@content, country=x@country, protocol=x@protocol)) }