From dec45795b20de55e477ea61cbd48dfe4e12243f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Todor=20Kondi=C4=87?= <todor.kondic@uni.lu>
Date: Mon, 11 May 2020 07:56:23 +0200
Subject: [PATCH] mix: Adapt to the new comprehensive table generation
* R/mix.R(gen_sup_ftab): Removed.
(add_wd_to_mzml): Updated.
---
R/mix.R | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/R/mix.R b/R/mix.R
index 6c22ce7..d7f0bc0 100644
--- a/R/mix.R
+++ b/R/mix.R
@@ -466,13 +466,12 @@ add_wd_to_mzml <- function(df,wdir) {
df
}
-gen_sup_ftab <- function(ftab,ctab) {
- df<-ctab[ftab,on=c("set","mode"),allow.cartesian=T]
- setkeyv(df,cols=FTAB_KEY)
- setcolorder(df,neworder = FTAB_NAMES)
- df
+add_wd_to_mzml <- function(fn,proj) {
+ wd<-basename(tools::file_path_sans_ext(fn))
+ file.path(proj,wd)
}
+
getEntryFromComp<-function(entry,id,set,mode,compTab) {
ind <- which(compTab$ID %in% id &
compTab$set %in% set &
--
GitLab