working on master table

Author: alysiaymk

R/funs.R

@@ -4,7 +4,7 @@ interp_fun <- function(y, fs, ...){
 	out_t <- seq(from=floor(min(y$V1)), to=round(max(y$V1)), by= 1/fs)
 	df_v1 <- approx(x=y$V1, y=y$V2, xout=out_t, method='linear')
 	df_v2 <- data.frame(df_v1)
-	colnames(df_v2) <- c("t", "y")
+	colnames(df_v2) <- c("t", "V2")
 	fin_df <- na.omit(df_v2)
 
 	return(as.data.frame(fin_df))

R/mastertable_generation.R

@@ -5,23 +5,33 @@ MASTER_FILE <- "~/Documents/snail_back_pack/experiments/snail_temperature_experi
 
 
 
+makedt_for_animal <- function(subdt, fs=5){
 
+	heart_dt <- fread(subdt$heart_file)
+	temp_dt <- fread(subdt$temp_file)
+	
+	out_t <- seq(from=floor(min(heart_dt$V1)), to=round(max(heart_dt$V1)), by= 1/fs)
+	li_heart <- approx(x=heart_dt$V1, y=heart_dt$V2, xout=out_t, method='linear')
+	li_temp <- approx(x=temp_dt$V1, y=temp_dt$V2, xout=out_t, method='linear')
+	#map here
+	out_dt <- data.table(t=li_heart$x, l=li_heart$y, temp=li_temp$y)
+	fin_dt <- na.omit(out_dt)
 
 
+	fin_dt
+	
+		}
 
 
-
-
-
-
-makedt_for_animal <- function(subdt){
+makedt_for_animal_interp <- function(subdt){
 
 	heart_dt <- fread(subdt$heart_file)
 	temp_dt <- fread(subdt$temp_file)
-	##interpolation goes here
-	
-	heart_dt
-	
+
+	interp_heart <- interp_fun(heart_dt, fs=5)
+	interp_temp <- interp_fun(temp_dt, fs=5)
+	li <- merge(interp_temp, interp_heart, by="t")
+	return(li)
 	}
 
 
@@ -35,6 +45,19 @@ master_table_v2[, temp_file:= paste(RESULT_DIR,gsub("\\s", "", temp_file),sep="/
 master_table_v2 <- master_table_v2[ID<13, ]
 setkey(master_table_v2,ID)
 
+
 test <- master_table_v2[,makedt_for_animal(.SD),by=ID]
+test <- master_table_v2[,makedt_for_animal(.SD),by=c("ID","t_m")]
+
+
+li <- list(test1, test2, test3)
+test <- rbindlist(li, fill=T)
 
 master_table_v2[test]
+
+
+
+
+
+
+#Notes: combine function makedt fun into one, arguments into list/table/etc.