git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@53846 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -2159,6 +2159,7 @@ imputeAcrossBatch <- function(N.AA, N.AB, N.BB, |
2159 | 2159 |
return(list(res, updated)) |
2160 | 2160 |
} |
2161 | 2161 |
|
2162 |
+ |
|
2162 | 2163 |
calculatePosteriorMean <- function(object, type=c("SNP", "NP", "X.SNP", "X.NP"), verbose=TRUE, |
2163 | 2164 |
prior.prob=c(1/7, 1/7, 3/7, 1/7, 1/7), |
2164 | 2165 |
CN=0:4, scale.sd=1){ |
... | ... |
@@ -2183,6 +2184,9 @@ calculatePosteriorMean <- function(object, type=c("SNP", "NP", "X.SNP", "X.NP"), |
2183 | 2184 |
posteriorMean=pM) |
2184 | 2185 |
assayData(object) <- tmp |
2185 | 2186 |
} |
2187 |
+======= |
|
2188 |
+ |
|
2189 |
+>>>>>>> fixed cyclic namespace dependency by updating version dependencies in DESCRIPTION, and updating other bioc packages |
|
2186 | 2190 |
## add new assay data element for posterior probabilities |
2187 | 2191 |
mylabel <- function(marker.type){ |
2188 | 2192 |
switch(marker.type, |