From c1adac6647612046082771b76b024e004a26dc2e Mon Sep 17 00:00:00 2001 From: Kiweler Date: Fri, 7 Jun 2019 09:17:15 +0200 Subject: [PATCH] RSLC gradient included --- R/gradient_functions.R | 150 ++++++++++++++++------ R/sysdata.rda | Bin 2735 -> 3765 bytes R/term_matching_functions.R | 3 +- data/tmt_list.rda | Bin 2732 -> 3765 bytes vignettes/manipulate_term_match_table.Rmd | 5 +- vignettes/using_MARMoSET.Rmd | 2 +- 6 files changed, 117 insertions(+), 43 deletions(-) diff --git a/R/gradient_functions.R b/R/gradient_functions.R index 4161f85..285a23e 100644 --- a/R/gradient_functions.R +++ b/R/gradient_functions.R @@ -5,16 +5,27 @@ #' #' @return Gradient information as sentence. -gradient_as_string <- function(flat_json, group_number) +gradient_as_string <- function(flat_json, group_number, lc_pump) { assertive.types::assert_is_list(flat_json) assertive.types::assert_is_a_number(group_number) + assertive.types::assert_is_a_string(lc_pump) - grad_tab <- one_gradient_table(flat_json, group_number) - grad_tab$`Duration[mm:ss]` %<>% - stringi::stri_replace_all_regex(pattern = ":.*", replacement = "") %<>% - stringi::stri_replace_all_regex(pattern = "^0", replacement = "") + grad_tab <- one_gradient_table(flat_json, group_number, lc_pump) + { + if(lc_pump == "Thermo EASY-nLC") + { + grad_tab$`Time[mm:ss]` %<>% + stringi::stri_replace_all_regex(pattern = ":0.*", replacement = "") %<>% + stringi::stri_replace_all_regex(pattern = "^0", replacement = "") + time <- grad_tab$`Time[mm:ss]` + } + else if(lc_pump == "RSLCnano") + { + time <- grad_tab$`Time[min]` + } + } if(dim(table(grad_tab$`Flow[nl/min]`)) == 1) { @@ -27,12 +38,11 @@ gradient_as_string <- function(flat_json, group_number) sep = "") } - first <- paste("The quantity of B in percent is from ", grad_tab$`Mixture[%B]`[1], "% B in ", - grad_tab$`Duration[mm:ss]`[2], " minutes to ", - grad_tab$`Mixture[%B]`[2], "% B.", + first <- paste("The quantity of B in percent is from ", grad_tab$`Mixture[%B]`[1], "% B to ", + grad_tab$`Mixture[%B]`[2], "% B at minute ", time[2], ".", sep = "") - following <- paste("In ", grad_tab$`Duration[mm:ss]`[3:nrow(grad_tab)], " minutes to ", + following <- paste("At minute ", time[3:nrow(grad_tab)], " to ", grad_tab$`Mixture[%B]`[3:nrow(grad_tab)], "% B.", sep = "", collapse = " ") paste(flow, first, following, sep=" ") %>% @@ -40,13 +50,12 @@ gradient_as_string <- function(flat_json, group_number) } -#' Gradient. +#' Create a list with all gradient tables. #' #' @param flat_json A flattened JSON file, created by "prepare_json()". -#' @param group_number An index that determines the group. -#' @param lc_pump Name of the used lc_pump, default = "Thermo EASY-nLC". +#' @param lc_pump Name of the used lc pump, default = "Thermo EASY-nLC" #' -#' @return A table with gradient. +#' @return List of gradients for all groups #' #' @examples #' # Real-time JSON-generation: `json <- generate_json(data)` @@ -54,39 +63,30 @@ gradient_as_string <- function(flat_json, group_number) #' #' flat_json <- flatten_json(json) #' -#' one_gradient_table(flat_json, 1) +#' gradient_tables(flat_json) #' #' @export -one_gradient_table <- function(flat_json, group_number, lc_pump = "Thermo EASY-nLC") +gradient_tables <- function(flat_json, lc_pump = "Thermo EASY-nLC") { assertive.types::assert_is_list(flat_json) - assertive.types::assert_is_a_number(group_number) - assertive.properties::assert_is_not_null(flat_json[[paste("Group" , group_number , "Instruments", lc_pump, "InstrumentFriendName", sep = ".")]]) + assertive.types::assert_is_a_string(lc_pump) - time <- flat_json[[paste0("Group.",group_number,".Instruments.Thermo EASY-nLC.Method.Gradient.Time [mm:ss]")]] - duration <- flat_json[[paste0("Group.",group_number,".Instruments.Thermo EASY-nLC.Method.Gradient.Duration [mm:ss]")]] - flow <- flat_json[[paste0("Group.",group_number,".Instruments.Thermo EASY-nLC.Method.Gradient.Flow [nl/min]")]] - mixture <- flat_json[[paste0("Group.",group_number,".Instruments.Thermo EASY-nLC.Method.Gradient.Mixture [%B]")]] + group_count <- flat_json %>% names() %>% stringi::stri_extract_first_regex('^Group\\.\\d+\\.') %>% table() %>% length() - gradient_tab <- data.frame( - "Time[mm:ss]" = time, - "Duration[mm:ss]" = duration, - "Flow[nl/min]" = flow, - "Mixture[%B]" = mixture, - check.names = FALSE, - stringsAsFactors = FALSE) + vector_of_gradient_tables <- lapply(1:group_count, function(group) one_gradient_table(flat_json, group, lc_pump)) - return(gradient_tab) + return(vector_of_gradient_tables) } -#' Create a list with all gradient tables. +#' Gradient. #' #' @param flat_json A flattened JSON file, created by "prepare_json()". -#' @param lc_pump Name of the used lc pump, default = "Thermo EASY-nLC" +#' @param group_number An index that determines the group. +#' @param lc_pump Name of the used lc_pump, default = "Thermo EASY-nLC". #' -#' @return List of gradients for all groups +#' @return A table with gradient. #' #' @examples #' # Real-time JSON-generation: `json <- generate_json(data)` @@ -94,18 +94,92 @@ one_gradient_table <- function(flat_json, group_number, lc_pump = "Thermo EASY-n #' #' flat_json <- flatten_json(json) #' -#' gradient_tables(flat_json) +#' one_gradient_table(flat_json, 1) #' #' @export -gradient_tables <- function(flat_json, lc_pump = "Thermo EASY-nLC") +one_gradient_table <- function(flat_json, group_number, lc_pump = "Thermo EASY-nLC") { assertive.types::assert_is_list(flat_json) - assertive.types::assert_is_a_string(lc_pump) + assertive.types::assert_is_a_number(group_number) - group_count <- flat_json %>% names() %>% stringi::stri_extract_first_regex('^Group\\.\\d+\\.') %>% table() %>% length() + { + if(lc_pump == "Thermo EASY-nLC") + { + gradient_table <- EASYnLC_g_tab(flat_json = flat_json, group_number = group_number) + } + else if(lc_pump == "RSLCnano") + { + gradient_table <- RSLC_g_tab(flat_json = flat_json, group_number = group_number) + } + } + return(gradient_table) +} - vector_of_gradient_tables <- lapply(1:group_count, function(group) one_gradient_table(flat_json, group, lc_pump)) +###################################################################################### +#' Create gradient table for RSLCpump. +#' +#' @param flat_json A flattened JSON file, created by "prepare_json()". +#' +#' @return gradient table for RSLCpump - return(vector_of_gradient_tables) +RSLC_g_tab <- function(flat_json, group_number) +{ + group_regex <- paste0("^Group.", group_number, ".Instruments.RSLCnano.Method.[0-9]+\\.[0-9]{3}") + RSLC_gradient <- stringi::stri_subset(names(flat_json), regex = group_regex) + # get values for these keys + gradient_values <- lapply(1:length(RSLC_gradient), function(key) flat_json[[RSLC_gradient[key]]] %>%stringi::stri_split(regex = " ")) %>% + as.data.frame() %>% t() + + # shortening the rows + gradient_time <- stringi::stri_replace_all_regex(RSLC_gradient, pattern = "^Group.[:digit:].Instruments.RSLCnano.Method.", replacement = "") %>% + stringi::stri_split(regex = "\\[min\\]") %>% + as.data.frame() %>% t() + + # combine values and keys + gradient_table <- as.data.frame(cbind(gradient_time, gradient_values[,1])) %>% + # tidy up the entries + dplyr::filter(!stringr::str_detect(V2, 'Equilibration|LoadingPump|ColumnOven.Valve')) %<>% + dplyr::mutate(V2 = V2 %>% stringi::stri_replace_first_fixed('Run','')) %<>% + dplyr::mutate(V2 = V2 %>% stringi::stri_trim()) %>% + # spread + tidyr::spread(key = V2, value = V3) + + col2 <- colnames(gradient_table[2:length(gradient_table)]) %>% stringi::stri_replace_all_regex(pattern = '.PumpModule.NC_Pump.', replacement = '') %>% + stringi::stri_replace_all_regex(pattern = '%B.Value', replacement = 'Mixture[%B]') %>% + stringi::stri_replace_all_regex(pattern = 'Flow.Nominal', replacement = 'Flow[nl/min]') %>% + stringi::stri_trim() + colnames(gradient_table) <- c("Time[min]", col2) + + # microliter to nl: + gradient_table$`Flow[nl/min]` %<>% as.character() %>% as.numeric() %>% magrittr::multiply_by(1000) + gradient_table$`Time[min]` %<>% as.character() %>% as.numeric() + gradient_table %<>% dplyr::arrange(`Time[min]`) + + return(gradient_table) +} + + +#' Create gradient table for RSLCpump. +#' +#' @param flat_json A flattened JSON file, created by "prepare_json()". +#' +#' @return gradient table for RSLCpump + +EASYnLC_g_tab <- function(flat_json, group_number) +{ + time <- flat_json[[paste0("Group.",group_number,".Instruments.Thermo EASY-nLC.Method.Gradient.Time [mm:ss]")]] + duration <- flat_json[[paste0("Group.",group_number,".Instruments.Thermo EASY-nLC.Method.Gradient.Duration [mm:ss]")]] + flow <- flat_json[[paste0("Group.",group_number,".Instruments.Thermo EASY-nLC.Method.Gradient.Flow [nl/min]")]] + mixture <- flat_json[[paste0("Group.",group_number,".Instruments.Thermo EASY-nLC.Method.Gradient.Mixture [%B]")]] + + gradient_table <- data.frame( + "Time[mm:ss]" = time, + "Duration[mm:ss]" = duration, + "Flow[nl/min]" = flow, + "Mixture[%B]" = mixture, + check.names = FALSE, + stringsAsFactors = FALSE) + + return(gradient_table) } diff --git a/R/sysdata.rda b/R/sysdata.rda index ba1d347b194bae9c0742a3d52e55aad5e59c0024..7100a3b0c7506546a3bd47b0f53b63d64687e578 100644 GIT binary patch literal 3765 zcmV;m4odMtT4*^jL0KkKS&Iohp8y-?|Ly<(|Nqwi|Nnpg|L(v4|L{Nn0sv9~5C9MW z00H0>e|)Dwr9EQ#fG`CQY)dR9B7g!Q005vgXaEXOD4+qr000000002c0000000001 z8kE^g)Y@oKlTTAdhJXfu0iXZ?XaE2J28{q2Ptm8OrXi*P6HJ&1gkUB?rV)Z*BME>B zh-s0a0h#)$gChcH8failfEfVLX@MCT02u%=0f0tEfQcd#O+e5UKUDPem?-@So)UTy zwLF7R0g%%WVE_S%r;#)PN>G6s6CetDXav9o9#s6K#*I&CQK#uoP-&Waq3QwXO*WHH z(wcau>Yu57t7Exyj;-rRca|y3gFtv|g=kU(6jk@m?xXs7-tCGZZlA}WA*9wv`@`FC~xJ6hJYt!=(9B=7&5+Vc0kuPt*}FH!;?lW z#u|MNZ^HYXE`hX3`Ri!b9X8I7l<~mhat@=_p|lrh)=+RUj2Og`gAt5Cj3fdQPN-O^ zZ0P7v(Yg~8jBzNwZsAdaNRSB_kRrg4k_2LeXZjdzy;>W`lHls`oXz%KInT*=y79c! zY-ns{*?N^zldt>BV+w{vj9WyoKOLQ%h9S1@92)2{aAasWTrZeG)*9XXbJD@m`k6ay zo2&k|^7)DtSAUNYqCsJ~mwr5ckId{~4ZHYsSu6X;nKmSkoYU}jck8B8%S#u&_I zVT@Taz)$SU-^h`aayDt`^O5oYVeD45YViS((8FuQ@0000000000 z001OWAOb-k015yA000e;twbRiD0R$?glXvH`CLc%81EQ$Xxw4nb|0GFKll2yIJ&Og zSAKX&Hya$!XzDl~D}C2`w?)e3dloFc`$rBOIPv4hgE;X#$3X5;(%~ypVfBt}M!o}% z_5-RG;l{(Ek-MzW>squl6NfwcuN|e9NMvMXxZE&YnWFgG98B_betk~wZ2x&DBe>jm zofTcDEe_M5@SKf{ewL?CYoI!rzsOqE+{+q{JWPb#IUTJ=oz@A4eZEyonc zS;{_NXKgcb@GnVL_-_p8V+e1z41$6-4#1vs0maAo6hH!0tHN#jUq|bZ+_2 z807WGu*DB{0s0Xl5CD3_7ix45iU+9mUWjSQIhbcG%QAwRpedpLZOX_oJIk>Hf)4=iv>eYP>NXPKiKBl5vjpRH3iCl<8_^$-Ie`BLgP?!C zp!zosdHb7>A*txJa=kV+y#kpTKuj7G?DV{?Swi%gISu&0EoRLZrX&!7jx>W{2L@pY zsusARM0;&eB3Z$}OXM^ywzRq}O>YB#-QX7W?|s5M_gMEm=|hA#qvFPvFf712>`%7x zHf;3S>9=m}cqU<+d z?O>mAh_VG^DQ>u$26a4gy)%^B*CyjI%OHKlqCcUkjz6SuTaBF7O5L*h-@3rZ5bmC1 zzPs*WLcRkL%it&yhq?0O#pL$BEra5mkQ8)I&-m+ z1teJsBti@Wus)s?n~$z+SoNmW>0X)1Umhs(D(9y0meyZk*nXe0<25_y_n+POjr`4z ztosj``w#SKK2!A{=RYCbcAU@7e<9ibGjZcO4#QK&{il@k(6XVn2m7JE z55>6h7z{vx1V#Z6ikP)hefOQXTKz}Y);CRfVcc$>%fNdWq89{6SJQGINPSnZWCyng z8zA9^ha*TftiH{P_VSnI#JqRn`3=mn%h&jD9iv;I#F8L*1Xq>k<$Ek2D!zys_Zb%?F)9=OU?Cbd57RP8vFkN@9DQ+v)p@_Y^S2z`FqEB%?b}J z6euWw+Ji(E?=xyusk3FFqpfW#Zjbv)oLB7KPB~llkinEcr}dmyM06j{H4W?9S~Qs_ zHRGJzYF|n8+xi`)%Du_7;U=|1u0-K&sQzl)cxTW0A<(eNcoqBU=c%ckb??VJ2aS5M z?JQWagLTQVgPkh=pX)Up8tS|2U3;|LW~~jzp{{Cap#Rg5-&=>#6#OL`^@d67o~I2B zNgUPDlI~+b{txILikG07xZmP&)VmkA>07z3CBOdrda*bz7QIeq0eKrSJ}-u0n3T{f zn*qDj?zLL7uR1X>t94e{NYWfu%bNHXuyxzM5Vuu0^krCiCRj8kfj2oFOM2A5!GQjD z+s)oSn|@iAb@`WiqIB53DMQ3N)*HB{3XCxb^n%N44Oy^D77by80)z_%!oe)bc~Qb$ zvt~(wFhzy|kVfq_g{^|Ft|I`dgr0;pRl^z&Q!{&(hO>QXRLOcY}VB5x2;S(TKpNgcH(9qdcuu2njBAjdDlzg zI2gwxd64F==A#G^yRdE?MD7#KS0<5^}f!QAMN51}RSsl&U-(9zjnO8cwWEl+o^ zEAY<&Xn_FLfYIv@Ri8}GhmHg34}4r5od>&Tsp)gN%R zjHJfPchlq^qS0K@bPYrX!3VOn zyfj&&{3D{-vwk=YiaAx{`jW4!1XB55b6dUum7-hSLVgU0+u>CDw` ziJ@|qtF2;&!?mPS_Mh-Sm-i3#pWJAD2cUe$r|ld~O|P2#cPmk#Il;!@;tdAFLue>E z3>*^z)@3xp)^)9GeJ;#(<3!H)d$XkXPXu1a+)(FGYO;OS2f%33i}<}w1i^ur zrDQT$W%BD|CF+|-%n!tE4O_8nKOp=c==P-F+DXpjSLT*G15mgy9pFnh9^1v)+zf-y zOk7Ghu;f^#rbZgg$mlLDZDufUoBOqzn=u?ExZuV_Flerm1aBBkwlHW~mi-7bLE?Dt z4PN-x)8;>cqk{S0eI>Thixx1!+4qdOR|CvgbdG~>oO(v-T_&DM^QMRSPo*-;R?XsZ z4+{L&0pej-VT(kjCSq1rDt+_BeKp!~!0{Iw_{T^#cF3PWel_(Q-e{cx^sgM!o_79_ z@E&f!--oA8gDmbeDzNnSX=;13)ump{Yf{3*GBz-1QObqry=P(5TqE1A2IdbYQ^u|G z-gKRM952XG-Cb5=2Bpu=-ZhwT&}D`hT3KO+8Gyx%mPnX7$~~v~82m6i#_AZm)1d9W z9)&}Q=f=O2oSjSI%QCyknmP9K6nG_g>7X%_$&2gjM z-%Hxq-ZzZ+S?4ZUGKTKC8rVs$jT=QjKP@G1D8#G%UbD_}4aP0E_MTGjZyk4WZ!;H$ zU|5)2PE&loE2=Iluy+%baTA~#nv6M9Nz9pB3{_qY=35SCjMU%+Yp9Sc34)q9;={`JP14_Pj#EL^L;08TtxiZDL(FN$lI@W@E{CpN z-9qpww|T&Fm@+IeVT}_Zp_pM{$XT-P#xX^;QY}YpJlz|Cz7JK>gCkO*^&BnRD7i%# zG@y1V%DklG7Yoj|8ei@8J0;!WG#{;@N3xGY(#CIu$zu38O%&~A17lO;iKzS+Ynt&N z{N3^oM&6ZqPM~vD<;8Z1mSA|KOcTrHDP`p>Jz0*D-;<=d;PYK0V|{NQJgK6<#g&E8 zO-6?gDTSW#hBmR?S|+PwOAgi_40RTe@R^Lv%5XQ%(Dxzc7^hM@gXLeDC)&Sa`(%7x f{2!M8ir_xcr1+;o)<^Eu|M7PuQ-ui#u#?&F;zcnz literal 2735 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 p8CL~dMc_Xeoon7*Xmvr?`gUG3{_;9UlMy diff --git a/R/term_matching_functions.R b/R/term_matching_functions.R index b2e079c..61d6aa0 100644 --- a/R/term_matching_functions.R +++ b/R/term_matching_functions.R @@ -81,7 +81,8 @@ one_group_match_terms <- function(flat_json, term_matching_table, group_number) } else if (handle_type == "function") { - meta_data_table[["Value"]][[this_row]] <- gradient_as_string(flat_json, group_number) + lc_pump <- term_matching_table[which(term_matching_table$term == "hplc_instrument"),]$example + meta_data_table[["Value"]][[this_row]] <- gradient_as_string(flat_json, group_number, lc_pump ) } } diff --git a/data/tmt_list.rda b/data/tmt_list.rda index b02ff96a0570e4628b5c4bffbf6fa08a9a98e782..7100a3b0c7506546a3bd47b0f53b63d64687e578 100644 GIT binary patch literal 3765 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 literal 2732 zcmV;d3RCq$T4*^jL0KkKSqa^iD*zMX|Ly<(|Nqwi|Nk%l|LVX0|L{Nn0ss;K5C9MW z00H0*KYc(2K0`nNbOD7B5<)_tA{A09LK&0>jQ{`>00009lK>_F0003nj1va{001-q z007VfKmarV0MGyc0B`^R13&-(4FEI%13&-`00007exItS&}a=bWYbMD0Aw^6BNGS% zOiclV7>tHSMuv<^qx_QANKrC?cSPR?-N&ByzGx*#pH$C{=rQQZaZ8Ju6FEq-G8=OsOo6xW9VmR z5`>q%#)ws`ncNDs3Oe6AV8PsNme zj>pOfn~t|T+jKa)t`3)~=W=p+STW~ucpT%F2()THkaN^_xPa*dDmj>jraGMTcE3y9 zXvQK0LLnNWV}sqRi}>AhtErB+YrN)cg)L>joM9UlcA~7-t0l&;Uh34g zT}&JXZa9r9I>(Gxba<}_Yii)pjbBXd^L?Q}amMA8rE9W5R=YxA{2z=@OWwRSjyzuDv; z>KsGn(m4j!kLzeQcpitS#5A^GhW*<%9l&Ey8$bq(VQ0L=1fy374H)9stJb&!VCdfj zI*x(p72Fc6d`uo@KXu(|)#^SL&4b=?aBK}<1H|bMan{EtfCnd`_naHOr!&R_?Bu9y ze-qw(PKLnyZ(Mc0CrhOT`%eqmGe)*(G#iRNwFRIW z1`o6xNLBVj`3!%U_&c&gGGgM!Gn2{sDkr8s29786pzIjr;6ANf4_tpsQTLb&AS@s) z+*$*%7ZR;1G++bm1q3{!bhbkgaj1SSo89Q^J;B9-wja+C&>zFY!2dVE>uCLN)c2pM@w^Z6ekbC5&$jfKlLJ++zg-3>Ys<*l;RX=6XV{JIx=JfQi^_pKbRWA(?;$ z<40>iAHY9dlzHNh!xVR)FPOs&KAmZu$Y4Igq6hnr7_HA3UjTwIV8$x2V8%EgA82pH z*dLn%>H?J;HfZt;Lk|lmC&)zRHSg{<1;av#O#}fEUlIA*Bp0Kc*YPk-D1pTcB4(QNm=LU=%17Os9=-1Oy z;91qu#YME62ijd1MOoc!M*FdCT84j@w5!lsuNLc4Id|cElBNka;9PbMI4*QzFjbm{ zqe9%f$63<%KpP6;hEJi48Vf`hGo`ra1J4yM*5J?GH5 zI3WN-FbwNF?=!gAwOYEI2CQl?iGqz7-R=(_s+yv-F(H z!nItzI@h9Ke%ztku|;n8eSc%*V?8$mi0)BbYv8Vdp>bG^J;=#o@NHO9#qV6_a^5o< zBh)+AM*E3>#|YOP>(pHNUE$IWBc;jA@r}Z=xoB9qmKH7Gw=LGv*J8igmw9%6J&{-%QIg8{{v>A_az|@s z7FG|6x~4K@c^2C|_bm!rOP|@IcnZ^c2-zFO!ZTS;{Z@%PwuM=jF|1asSBzGmM}>`o z;gf`D6rvD%;GIh^p%Bcp4MPMRMj$8me>3VnSIW`# z-@-ntSNo1FTRyArxix+l(Ao4qJDJetdR;H%W2yF>Uenm@1JoYBy1;4?^`JfGlo11! zk1Oy62BXqGKfTVcWxVGK0RYmiN4n(M@33xy;DivP1~ylvdvpfs*$cOk6(G_R7fc?L9gGA> z^G1((>!>F>)DVb77}gdL1y z27?%*0g4N(QSJF>zyR_%0>IpMyRRyXS*dNSae7rIgJR-XU6EmWHjA0@zBVztj8TB> z4MW*Vl%beBU0jB(!_8T%mY@V98ja20xgCp zCEdq6XE+Gp5zm7}ipDV%gF&KeqJmgcx`t-s9;8QUV9*Pm-p z>d{;-nBNXmap_xFFhVhn27u6F5Ma^N!4%N;^0b_>(_+^``nH>5qhOX6_@@MIUUgd$ zuI!ntu6X3Iz5JBBi0qX05QBCrsvxCWlpk%=*d4F^cSnqO-2ge&9f}JDc7P7hH=b5# zM}4rDpXGR)r^4Mxov?nlTx$Wa~kFmZ5qLH%m^%N1~| mkh}-t6U@Ek=0m*)o65B>G|KPWO#$iG{}*yaI8cxY-Ignv3l8l7 diff --git a/vignettes/manipulate_term_match_table.Rmd b/vignettes/manipulate_term_match_table.Rmd index aa06f85..5912b61 100644 --- a/vignettes/manipulate_term_match_table.Rmd +++ b/vignettes/manipulate_term_match_table.Rmd @@ -14,7 +14,7 @@ knitr::opts_chunk$set( collapse = TRUE, comment = "#>" ) -library(MARMoSET) +library("MARMoSET") ``` ## Structure @@ -121,8 +121,7 @@ subset_tmt <- rbind(subset_tmt, new_row) This so changed term matching table can be used with the function `match_terms()`. -```{R} - +```{r} subset_table <- one_group_match_terms(flat_json = flat_json, term_matching_table = subset_tmt, group_number = 1) diff --git a/vignettes/using_MARMoSET.Rmd b/vignettes/using_MARMoSET.Rmd index 39b6692..3b0511d 100644 --- a/vignettes/using_MARMoSET.Rmd +++ b/vignettes/using_MARMoSET.Rmd @@ -116,7 +116,7 @@ gradient_table <- one_gradient_table(flat_json = flat_json, vector_of_gradient_tables <- gradient_tables(flat_json = flat_json) -head(gradient_table, 3) +head(gradient_table, 2) ``` Finally to export all tables in a vector or one specific, the functions `save_group_table()` and `save_all_groups()`are helpful. The output of `gradient_tables()` or `match_terms()` goes in as `groups_vector` whereas the second argument, `output_path` expects a path with filename. `save_all_groups()` adds the group numbers automatically to each filename, `save_group_table()` takes it as third argument but doesn't add.