@@ -26,13 +26,13 @@ output = MSstatsConvert:::.cleanRawDIANN(input, quantificationColumn = "Fragment
2626.validateOutput(output )
2727
2828# Q-value filtering
29- expect_qvalue_cutoff <- function (output , col , cutoff , intensity_col = NULL ) {
29+ expect_qvalue_cutoff <- function (output , col , cutoff ) {
3030 expect_equal(
3131 sum(output [[col ]] > cutoff ),
32- sum(output [[intensity_col ]] == 0 & output [[col ]] > cutoff ),
32+ sum(output [[" Intensity " ]] == 0 & output [[col ]] > cutoff ),
3333 info = sprintf(
3434 " All rows with %s > %s should have %s == 0" ,
35- col , cutoff , intensity_col
35+ col , cutoff , " Intensity "
3636 )
3737 )
3838 expect_equal(
@@ -45,12 +45,12 @@ expect_qvalue_cutoff <- function(output, col, cutoff, intensity_col = NULL) {
4545 )
4646}
4747output <- MSstatsConvert ::: .cleanRawDIANN(input , global_qvalue_cutoff = 0.005 )
48- expect_qvalue_cutoff(output , " DetectionQValue" , 0.005 , " Intensity " )
48+ expect_qvalue_cutoff(output , " DetectionQValue" , 0.005 )
4949output <- MSstatsConvert ::: .cleanRawDIANN(input , qvalue_cutoff = 0.00001 )
50- expect_qvalue_cutoff(output , " LibQValue" , 0.00001 , " Intensity " )
50+ expect_qvalue_cutoff(output , " LibQValue" , 0.00001 )
5151output <- MSstatsConvert ::: .cleanRawDIANN(input , pg_qvalue_cutoff = 0.001 )
52- expect_qvalue_cutoff(output , " LibPGQValue" , 0.001 , " Intensity " )
52+ expect_qvalue_cutoff(output , " LibPGQValue" , 0.001 )
5353output <- MSstatsConvert ::: .cleanRawDIANN(input , MBR = FALSE , qvalue_cutoff = 0.001 )
54- expect_qvalue_cutoff(output , " GlobalQValue" , 0.001 , " Intensity " )
54+ expect_qvalue_cutoff(output , " GlobalQValue" , 0.001 )
5555output <- MSstatsConvert ::: .cleanRawDIANN(input , MBR = FALSE , pg_qvalue_cutoff = 0.0002 )
56- expect_qvalue_cutoff(output , " GlobalPGQValue" , 0.0002 , " Intensity " )
56+ expect_qvalue_cutoff(output , " GlobalPGQValue" , 0.0002 )
0 commit comments