[Genabel-commits] r1993 - in pkg/MultiABEL: . R

[noreply at r-forge.r-project.org]

Author: shenxia
Date: 2015-06-04 13:04:04 +0200 (Thu, 04 Jun 2015)
New Revision: 1993

Modified:
   pkg/MultiABEL/DESCRIPTION
   pkg/MultiABEL/NAMESPACE
   pkg/MultiABEL/R/Multivariate.R
Log:
R-Forge build failed. Moved dependencies to "Suggests" for a rebuild

Modified: pkg/MultiABEL/DESCRIPTION
===================================================================
--- pkg/MultiABEL/DESCRIPTION	2015-06-03 21:46:27 UTC (rev 1992)
+++ pkg/MultiABEL/DESCRIPTION	2015-06-04 11:04:04 UTC (rev 1993)
@@ -6,15 +6,13 @@
 Author: Xia Shen
 Maintainer: Xia Shen <xia.shen at ki.se>
 Description: Performing multivariate
-    genome-wide association (MVGWA) analyses. The modules are
-    compatible with existing *ABEL data formats. The GWA
-    analyses can be done on individual level data or on
-    single-trait GWA summary statistics only.
+    genome-wide association (MVGWA) analyses. 
 Depends:
     R (>= 2.10),
-    GenABEL,
-    DatABEL,
     svMisc
+Suggests:
+    GenABEL,
+    DatABEL
 License: GPL (>= 2)
 LazyLoad: yes
 Packaged: 2015-06-02 02:00:18 CET; xia

Modified: pkg/MultiABEL/NAMESPACE
===================================================================
--- pkg/MultiABEL/NAMESPACE	2015-06-03 21:46:27 UTC (rev 1992)
+++ pkg/MultiABEL/NAMESPACE	2015-06-04 11:04:04 UTC (rev 1993)
@@ -1,4 +1,4 @@
 useDynLib(MultiABEL)
-import("GenABEL", "DatABEL", "svMisc")
+import("svMisc")
 export("Multivariate", "MultiRep", "MultiMeta", "load.summary", "MultiSummary")
 exportClasses("multi.summary")
\ No newline at end of file

Modified: pkg/MultiABEL/R/Multivariate.R
===================================================================
--- pkg/MultiABEL/R/Multivariate.R	2015-06-03 21:46:27 UTC (rev 1992)
+++ pkg/MultiABEL/R/Multivariate.R	2015-06-04 11:04:04 UTC (rev 1993)
@@ -60,6 +60,9 @@
 #' 
 `Multivariate` <- function(gwaa.data = NULL, phenofile = NULL, genofile = NULL, outfile = 'Multivariate_GWAS_results.txt', 
                            trait.cols, covariate.cols = NULL, cuts = 20, ...) {
+	if (!require(GenABEL) | !require(DatABEL)) {
+		stop('GenABEL and DatABEL packages required!')
+	}
     cat('loading data ...')
     if (length(trait.cols) == 1) {
 		stop('select multiple traits to analyze!')