git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@49141 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -57,16 +57,12 @@ setGeneric("madB.AB<-", function(object, value) standardGeneric("madB.AB<-")) |
57 | 57 |
setGeneric("madB.BB<-", function(object, value) standardGeneric("madB.BB<-")) |
58 | 58 |
|
59 | 59 |
setGeneric("tau2A.AA", function(object) standardGeneric("tau2A.AA")) |
60 |
-##setGeneric("tau2A.AB", function(object) standardGeneric("tau2A.AB")) |
|
61 | 60 |
setGeneric("tau2A.BB", function(object) standardGeneric("tau2A.BB")) |
62 | 61 |
setGeneric("tau2B.AA", function(object) standardGeneric("tau2B.AA")) |
63 |
-##setGeneric("tau2B.AB", function(object) standardGeneric("tau2B.AB")) |
|
64 | 62 |
setGeneric("tau2B.BB", function(object) standardGeneric("tau2B.BB")) |
65 | 63 |
setGeneric("tau2A.AA<-", function(object, value) standardGeneric("tau2A.AA<-")) |
66 |
-##setGeneric("tau2A.AB<-", function(object, value) standardGeneric("tau2A.AB<-")) |
|
67 | 64 |
setGeneric("tau2A.BB<-", function(object, value) standardGeneric("tau2A.BB<-")) |
68 | 65 |
setGeneric("tau2B.AA<-", function(object, value) standardGeneric("tau2B.AA<-")) |
69 |
-##setGeneric("tau2B.AB<-", function(object, value) standardGeneric("tau2B.AB<-")) |
|
70 | 66 |
setGeneric("tau2B.BB<-", function(object, value) standardGeneric("tau2B.BB<-")) |
71 | 67 |
|
72 | 68 |
setGeneric("corrAA", function(object) standardGeneric("corrAA")) |
... | ... |
@@ -86,16 +82,12 @@ setGeneric("phiPrimeA", function(object) standardGeneric("phiPrimeA")) |
86 | 82 |
setGeneric("phiPrimeB", function(object) standardGeneric("phiPrimeB")) |
87 | 83 |
setGeneric("phiPrimeA<-", function(object, value) standardGeneric("phiPrimeA<-")) |
88 | 84 |
setGeneric("phiPrimeB<-", function(object, value) standardGeneric("phiPrimeB<-")) |
89 |
-setGeneric("sigma2A", function(object) standardGeneric("sigma2A")) |
|
90 |
-setGeneric("sigma2B", function(object) standardGeneric("sigma2B")) |
|
91 | 85 |
setGeneric("tau2A", function(object) standardGeneric("tau2A")) |
92 | 86 |
setGeneric("tau2B", function(object) standardGeneric("tau2B")) |
93 | 87 |
setGeneric("nuA<-", function(object, value) standardGeneric("nuA<-")) |
94 | 88 |
setGeneric("nuB<-", function(object, value) standardGeneric("nuB<-")) |
95 | 89 |
setGeneric("phiA<-", function(object, value) standardGeneric("phiA<-")) |
96 | 90 |
setGeneric("phiB<-", function(object, value) standardGeneric("phiB<-")) |
97 |
-setGeneric("sigma2A<-", function(object, value) standardGeneric("sigma2A<-")) |
|
98 |
-setGeneric("sigma2B<-", function(object, value) standardGeneric("sigma2B<-")) |
|
99 | 91 |
setGeneric("tau2A<-", function(object, value) standardGeneric("tau2A<-")) |
100 | 92 |
setGeneric("tau2B<-", function(object, value) standardGeneric("tau2B<-")) |
101 | 93 |
setGeneric("flags<-", function(object, value) standardGeneric("flags<-")) |
... | ... |
@@ -27,8 +27,6 @@ setMethod("phiPrimeA", signature=signature(object="CNSet"), function(object) { |
27 | 27 |
setMethod("phiPrimeB", signature=signature(object="CNSet"), function(object) { |
28 | 28 |
assayDataElement(batchStatistics(object), "phiPrimeB") |
29 | 29 |
}) |
30 |
-setMethod("sigma2A", signature=signature(object="CNSet"), function(object) sigma2(object, "A")) |
|
31 |
-setMethod("sigma2B", signature=signature(object="CNSet"), function(object) sigma2(object, "B")) |
|
32 | 30 |
setMethod("tau2A", signature=signature(object="CNSet"), function(object) tau2(object, "A")) |
33 | 31 |
setMethod("tau2B", signature=signature(object="CNSet"), function(object) tau2(object, "B")) |
34 | 32 |
|
... | ... |
@@ -286,16 +284,6 @@ setReplaceMethod("phiB", signature=signature(object="CNSet", value="ff_or_matrix |
286 | 284 |
linearParamElementReplace(object, "phiB", value) |
287 | 285 |
}) |
288 | 286 |
|
289 |
-setReplaceMethod("sigma2A", signature=signature(object="CNSet", value="ff_or_matrix"), |
|
290 |
- function(object, value){ |
|
291 |
- linearParamElementReplace(object, "sig2A", value) |
|
292 |
-}) |
|
293 |
- |
|
294 |
-setReplaceMethod("sigma2B", signature=signature(object="CNSet", value="ff_or_matrix"), |
|
295 |
- function(object, value){ |
|
296 |
- linearParamElementReplace(object, "sig2B", value) |
|
297 |
-}) |
|
298 |
- |
|
299 | 287 |
setReplaceMethod("tau2A", signature=signature(object="CNSet", value="ff_or_matrix"), |
300 | 288 |
function(object, value){ |
301 | 289 |
linearParamElementReplace(object, "tau2A", value) |
... | ... |
@@ -20,10 +20,6 @@ linesCNSet <- function(x, y, batch, copynumber, x.axis="A", ...){ |
20 | 20 |
tau2B <- taus[, "B", "AA", ] |
21 | 21 |
sigma2A <- taus[, "A", "AA", ] |
22 | 22 |
sigma2B <- taus[, "B", "BB", ] |
23 |
-## tau2A <- tau2(object, "A")[marker.index, batch.index] |
|
24 |
-## tau2B <- tau2(object, "B")[marker.index, batch.index] |
|
25 |
-## sigma2A <- sigma2(object, "A")[marker.index, batch.index] |
|
26 |
-## sigma2B <- sigma2(object, "B")[marker.index, batch.index] |
|
27 | 23 |
cors <- corr(object, i=marker.index, j=batch.index)[, , ] |
28 | 24 |
corrAB <- cors[["AB"]] |
29 | 25 |
corrAA <- cors[["AA"]] |