From 6a664d25ce518df0297ece8d7281e6d380e44376 Mon Sep 17 00:00:00 2001 From: JohannesNE Date: Fri, 28 May 2021 11:06:41 +0200 Subject: [PATCH 1/3] add repl (col number) to taken before overwriting repl --- R/Meth.r | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/Meth.r b/R/Meth.r index 78af570..1e5c86c 100644 --- a/R/Meth.r +++ b/R/Meth.r @@ -117,8 +117,8 @@ if( methods.in.y ) repl <- match( repl, dfr.nam ) if( is.numeric(repl) & length(repl)==1 ) { - repl <- data[,repl] taken <- c(taken,repl.col<-repl) + repl <- data[,repl] } else repl <- make.repl( data.frame(meth=rep(1,Nr),item=item) )$repl From fd60adcca8e3083bde3e164f181a1765ecc3f1b7 Mon Sep 17 00:00:00 2001 From: JohannesNE Date: Fri, 28 May 2021 11:08:39 +0200 Subject: [PATCH 2/3] Change repl and item from data.frame to vector data[,item] creates a 1 column data.frame. This creates an error in make.repl() since the data.frame passed to this function will have an item with the wrong name. data.frame(item=item) ignores the tag if item is a data.frame. --- R/Meth.r | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/Meth.r b/R/Meth.r index 1e5c86c..05f00c1 100644 --- a/R/Meth.r +++ b/R/Meth.r @@ -152,7 +152,7 @@ else if( is.numeric(item) & length(item)==1 ) { taken <- c(taken,item.col<-item) - item <- data[,item] + item <- data[[item]] } else item <- rows if( is.na(item)[1] ) stop( "\nitem not properly specified.") @@ -165,7 +165,7 @@ else if( is.numeric(repl) & length(repl)==1 ) { taken <- c(taken,repl.col<-repl) - repl <- data[,repl] + repl <- data[[repl]] } else repl <- rep(1,nrow(data)) From 635065211bf09ebd91873e23e102b21e7535aab7 Mon Sep 17 00:00:00 2001 From: Johannes Date: Tue, 1 Jun 2021 11:31:53 +0200 Subject: [PATCH 3/3] nothing --- R/Meth.r | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/Meth.r b/R/Meth.r index 05f00c1..f1cad88 100644 --- a/R/Meth.r +++ b/R/Meth.r @@ -108,7 +108,7 @@ if( methods.in.y ) if( is.numeric(item) & length(item)==1 ) { taken <- c(taken,item.col<-item) - item <- data[,item] + item <- data[[item]] } else item <- rows @@ -118,7 +118,7 @@ if( methods.in.y ) if( is.numeric(repl) & length(repl)==1 ) { taken <- c(taken,repl.col<-repl) - repl <- data[,repl] + repl <- data[[repl]] } else repl <- make.repl( data.frame(meth=rep(1,Nr),item=item) )$repl