Browse code

Remove locally defined "organism" and "organism<-" generics (the former was actually defined twice) and import BiocGenerics so the locally defined methods get attached to the new "organism" and "organism<-" generics from BiocGenerics. Also remove the "getOrganism" and "setOrganism" generics and methods. They were (a) not exported (even though the class-IcaSet.Rd man pages contained aliases for them), (b) not used internally, and (c) redundant with the "organism" and "organism<-" methods.

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

Herve Pages authored on 19/03/2015 00:33:15
Showing 4 changed files

... ...
@@ -1,7 +1,7 @@
1 1
 Package: MineICA
2 2
 Type: Package
3 3
 Title: Analysis of an ICA decomposition obtained on genomics data
4
-Version: 1.7.0
4
+Version: 1.7.1
5 5
 Date: 2012-03-16
6 6
 Author: Anne Biton
7 7
 Maintainer: Anne Biton <anne.biton@gmail.com>
... ...
@@ -15,11 +15,11 @@ Description: The goal of MineICA is to perform Independent Component
15 15
         graph.
16 16
 License: GPL-2
17 17
 LazyLoad: yes
18
+Depends: R (>= 2.10), methods, BiocGenerics (>= 0.13.8), Biobase, plyr,
19
+        ggplot2, scales, foreach, xtable, biomaRt, gtools, GOstats, cluster,
20
+        marray, mclust, RColorBrewer, colorspace, igraph, Rgraphviz, graph,
21
+        annotate, Hmisc, fastICA, JADE
18 22
 Imports: AnnotationDbi, lumi, fpc, lumiHumanAll.db
19
-Depends: R (>= 2.10), Biobase, plyr, ggplot2, scales, foreach, xtable,
20
-        biomaRt, gtools, GOstats, cluster, marray, mclust,
21
-        RColorBrewer, colorspace, igraph, Rgraphviz, graph, annotate,
22
-        Hmisc, fastICA, JADE, methods
23 23
 Suggests: biomaRt, GOstats, cluster, hgu133a.db, mclust, igraph,
24 24
         breastCancerMAINZ, breastCancerTRANSBIG, breastCancerUPP,
25 25
         breastCancerVDX
... ...
@@ -45,9 +45,6 @@ setGeneric ( "chipManu<-" , function ( object, value ){ standardGeneric ( "chipM
45 45
 setGeneric ( "getTypeID" , function ( object ){ standardGeneric ( "getTypeID" )})
46 46
 setGeneric ( "typeID<-" , function ( object, value){ standardGeneric ( "typeID<-" )})
47 47
 setGeneric ( "typeID" , function ( object ){ standardGeneric ( "typeID" )})
48
-setGeneric ( "getOrganism" , function ( object ){ standardGeneric ( "getOrganism" )})
49
-setGeneric ( "organism<-" , function ( object, value){ standardGeneric ( "organism<-" )})
50
-setGeneric ( "organism" , function ( object ){ standardGeneric ( "organism" )})
51 48
 setGeneric ( "getMart" , function ( object ){ standardGeneric ( "getMart" )})
52 49
 setGeneric ( "mart<-" , function ( object, value){ standardGeneric ( "mart<-" )})
53 50
 setGeneric ( "mart" , function ( object ){ standardGeneric ( "mart" )})
... ...
@@ -72,8 +69,6 @@ setGeneric ( "setPackage<-" , function ( object, value ){ standardGeneric ( "set
72 69
 setGeneric ( "package<-" , function ( object, value ){ standardGeneric ( "package<-" )})
73 70
 setGeneric ( "setTypeID<-" , function ( object, value ){ standardGeneric ( "setTypeID<-" )})
74 71
 setGeneric ( "typeID<-" , function ( object, value ){ standardGeneric ( "typeID<-" )})
75
-setGeneric ( "setOrganism<-" , function ( object, value ){ standardGeneric ( "setOrganism<-" )})
76
-setGeneric ( "organism<-" , function ( object, value ){ standardGeneric ( "organism<-" )})
77 72
 setGeneric ( "setMart<-" , function ( object, value ){ standardGeneric ( "setMart<-" )})
78 73
 setGeneric ( "mart<-" , function ( object, value ){ standardGeneric ( "mart<-" )})
79 74
                          
... ...
@@ -553,12 +553,6 @@ setMethod( "organism" ,"IcaSet" ,
553 553
       }
554 554
 )
555 555
 
556
-setMethod( "getOrganism" ,"IcaSet" ,
557
-       function (object){
558
-           return (object@organism)
559
-      }
560
-)
561
-
562 556
 setMethod( "mart" ,"IcaSet" ,
563 557
        function (object){
564 558
            return (object@mart)
... ...
@@ -873,17 +867,6 @@ setReplaceMethod( f="mart",
873 867
       }
874 868
 )
875 869
 
876
-setReplaceMethod( f="setOrganism",
877
-      signature = "IcaSet" ,
878
-       definition = function (object, value){
879
-           object@organism <- value
880
-           validObject (object)
881
-           return (object)
882
-      }
883
-)
884
-
885
-
886
-
887 870
 setReplaceMethod(
888 871
       f = "package" ,
889 872
       signature = "IcaSet" ,
... ...
@@ -23,10 +23,6 @@
23 23
 \alias{organism<-}
24 24
 \alias{organism,IcaSet-method}
25 25
 \alias{organism<-,IcaSet-method}
26
-\alias{organism<-,IcaSet,character-method}
27
-\alias{setOrganism,IcaSet-method}
28
-\alias{getOrganism,IcaSet-method}
29
-
30 26
 
31 27
 \alias{mart}
32 28
 \alias{mart<-}