Browse code

importing ff_matrix class from oligoClasses

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@49144 bc3139a8-67e5-0310-9ffc-ced21a209358

Rob Scharp authored on 30/08/2010 19:41:12
Showing2 changed files

... ...
@@ -57,17 +57,17 @@ importFrom(mvtnorm, dmvnorm)
57 57
 importFrom(ellipse, ellipse)
58 58
 
59 59
 importFrom(ff, ffdf, physical.ff, physical.ffdf, ffrowapply)
60
-
61 60
 ## It is important not to import these classes from oligoClasses
62 61
 ## Doing so causes the following errors:
63 62
 ## N.AA(container)[index, ] <- someMatrix
64 63
 ##Error in function (classes, fdef, mtable)  :
65 64
 ##  unable to find an inherited method for function "medianA.AA<-", for signature "CNSet", "ff_matrix"
66 65
 ##importClassesFrom(oligoClasses, ffdf, ff_matrix)
66
+importClassesFrom(oligoClasses, ff_matrix)
67 67
 
68 68
 ## Important to export these classes
69 69
 ##exportClasses(ff_or_matrix, ff_matrix, ffdf)
70
-exportClasses(ff_or_matrix)
70
+##exportClasses(ff_or_matrix)
71 71
 exportMethods(lines)
72 72
 exportMethods(CA, CB)
73 73
 export(crlmm,
... ...
@@ -85,13 +85,13 @@ export(constructIlluminaCNSet)
85 85
 export(totalCopynumber)
86 86
 export(cnrma, cnrma2)
87 87
 exportMethods(A, B, nuA, nuB, phiA, phiB, corr, tau2, Ns, medians, mads)
88
-export(genotypeSummary,
89
-       shrinkSummary,
88
+##export(genotypeSummary,
89
+##       shrinkSummary,
90 90
 ##       estimateCnParameters,
91 91
 ##       shrinkGenotypeSummaries,
92 92
 ##       summarizeSnps,
93 93
 ##       constructIlluminaAssayData,
94
-       ACN, C1, C2, C3)
94
+##       ACN, C1, C2, C3)
95 95
 ## For debugging
96 96
 ## exportPattern("^[^\\.]")
97 97
 
... ...
@@ -1,5 +1,3 @@
1 1
 setOldClass("ellipse")
2
-setOldClass("ff_matrix")
3 2
 setOldClass("ffdf")
4
-##setClassUnion("ff_or_matrix", c("ff_matrix", "matrix", "ffdf"))
5 3
 setClassUnion("ff_or_matrix", c("ff_matrix", "matrix"))