Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
- numbers are imported as numeric not as char
- if no stock name is provided, 'missing' is inserted instead
  • Loading branch information
gvogler committed May 3, 2021
1 parent 88b641f commit 653a047
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions tdtK_Full_Analysis_script_v0.7.R
Original file line number Diff line number Diff line change
Expand Up @@ -1040,8 +1040,8 @@ Sys.setenv(PATH=paste(Sys.getenv("PATH"), "/Applications/Fiji.app/Contents/macos
# New data table that uses temporal and spatial resolution data to calculate real distances
meta.data <- read.csv(paste0(substr(filelist$file[f],1,gregexpr('.cxd',filelist$file[f])[[1]][1]),"_new_meta_data.csv"))

time_interval <- meta.data[which(meta.data$L1 == "time_interval"),1]
resolution_meta <- meta.data[which(meta.data$L1 == "resolution"),1]
time_interval <- as.numeric(meta.data[which(meta.data$L1 == "time_interval"),1])
resolution_meta <- as.numeric(meta.data[which(meta.data$L1 == "resolution"),1])

diameters$time <- c(0, time_interval * 1:c(length(diameters$distance)-1))

Expand Down Expand Up @@ -2135,7 +2135,7 @@ Sys.setenv(PATH=paste(Sys.getenv("PATH"), "/Applications/Fiji.app/Contents/macos
baseline <- read.csv(filelist$csv[f], sep = ",", stringsAsFactors = F)


meta_data[f,] <- c(t(as.numeric(baseline[1:21,1])) , filelist$csv[f])
meta_data[f,] <- c(t(baseline[1:21,1]) , filelist$csv[f])
}

meta_data$filename <- gsub("..//", "", meta_data$filename)
Expand Down Expand Up @@ -2617,6 +2617,11 @@ Sys.setenv(PATH=paste(Sys.getenv("PATH"), "/Applications/Fiji.app/Contents/macos

# final_all_data <- final_all_data[,1:42]
final_all_data$stocks <- crosses$Stock.collection[match(final_all_data$CODE, crosses$CODE)]
if(is.null(crosses$Stock.collection[match(final_all_data$CODE, crosses$CODE)]))
{
final_all_data$stocks <- "empty"
}

final_all_data <- unique(final_all_data)
final_all_data <- group_by(final_all_data, flyID)

Expand Down

0 comments on commit 653a047

Please sign in to comment.