Skip to content

update ds.dataFrameFill to assign correct classes to the generated ve… #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StuartWheater merged 1 commit into from
Jun 28, 2020
Merged

update ds.dataFrameFill to assign correct classes to the generated ve… #225

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions R/ds.dataFrameFill.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,14 @@ ds.dataFrameFill <- function(df.name=NULL, newobj=NULL, datasources=NULL){
# if the datasets share the same variables then the function stops
check.indicator <- c()
for (i in 1:length(datasources)){
if(length(column.names[[i]])==length(allNames)){check.indicator[i] <- 0}
else{check.indicator[i] <- 1}
if(length(setdiff(allNames,column.names[[i]])) > 0){
check.indicator[i] <- 1
}else{
check.indicator[i] <- 0}
}

if(sum(check.indicator)==0){
stop("The dataframes have the same variables!", call.=FALSE)
stop("The dataframes have the same variables. There are no missing variables to fill!", call.=FALSE)
}

if(!is.null(allNames)){
Expand All @@ -130,7 +132,19 @@ ds.dataFrameFill <- function(df.name=NULL, newobj=NULL, datasources=NULL){
allNames.transmit <- NULL
}

calltext <- call("dataFrameFillDS", df.name, allNames.transmit)
# get the class of each variable in the dataframes
class.list <- lapply(allNames, function(x){dsBaseClient::ds.class(paste0(df.name, '$', x))})
class.vect1 <- lapply(class.list, function(x){unlist(x)})
class.vect2 <- lapply(class.vect1, function(x){x[which(x != 'NULL')[[1]]]})
class.vect2 <- unname(unlist(class.vect2))

if(!is.null(class.vect2)){
class.vect.transmit <- paste(class.vect2,collapse=",")
}else{
class.vect.transmit <- NULL
}

calltext <- call("dataFrameFillDS", df.name, allNames.transmit, class.vect.transmit)
DSI::datashield.assign(datasources, newobj, calltext)

#############################################################################################################
Expand Down