Skip to content

Commit 4e82129

Browse files
committed
fix hca and other warning
1 parent 262bb3f commit 4e82129

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

R/DataProcessing.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,8 @@ getMS2spectrumInfoForCluster <- function(dataList, clusterDataList, treeLabel){
14401440
#fragmentsX <- dataList$fragmentMasses[featuresIntersection]
14411441
#fragmentsY <- apply(X = data.numericmatrix(dataList$featureMatrix[clusterMembersPrecursors, featuresIntersection]), MARGIN = 2, FUN = mean)
14421442
fragmentsX <- dataList$fragmentMasses[featuresUnion]
1443-
fragmentsY <- apply(X = data.numericmatrix(dataList$featureMatrix[clusterMembersPrecursors, featuresUnion]), MARGIN = 2, FUN = mean)
1443+
#fragmentsY <- apply(X = data.numericmatrix(dataList$featureMatrix[clusterMembersPrecursors, featuresUnion]), MARGIN = 2, FUN = mean)
1444+
fragmentsY <- apply( X = data.matrix(dataList$featureMatrix[clusterMembersPrecursors, featuresUnion, drop = FALSE]), MARGIN = 2, FUN = mean )
14441445

14451446
selectedPositive <- clusterDataList$innerNodeFeaturesCountsMatrix[clusterIndex, featuresUnion]
14461447
coverageSelected <- selectedPositive / numberOfClusterMembers

R/parsePeakAbundanceMatrixQF.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ parsePeakAbundanceMatrixQF <- function(qfeatures,
4040
dataFrame <- cbind(rowData(qfeatures)[[1]][,cols_to_keep] ,assay(qfeatures))
4141
#workaround for avoiding change in colnames during coercion
4242
cnames <- colnames(dataFrame)
43-
dataFrame <- as.data.frame(dataFrame, check.names = FALSE)
43+
dataFrame <- as.data.frame(dataFrame)
4444
colnames(dataFrame) <- cnames
4545
oldFormat <- ncol(colData(qfeatures))==3
4646
numRowDataCols <- ncol(rowData(qfeatures)[[1]])

0 commit comments

Comments
 (0)