[Genabel-commits] r2076 - pkg/MultiABEL/R

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

Author: shenxia
Date: 2018-05-15 07:09:24 +0200 (Tue, 15 May 2018)
New Revision: 2076

Modified:
   pkg/MultiABEL/R/MultiSummary.R
Log:


Modified: pkg/MultiABEL/R/MultiSummary.R
===================================================================
--- pkg/MultiABEL/R/MultiSummary.R	2018-05-15 04:33:16 UTC (rev 2075)
+++ pkg/MultiABEL/R/MultiSummary.R	2018-05-15 05:09:24 UTC (rev 2076)
@@ -123,7 +123,7 @@
 			if (n.eff < 5*m) {
 				warning('Effective sample size < 5 times number of phenotypes. Consider argument high.dim = TRUE.')
 			}
-			pv <- pf(fstat, m, n - m - 1, lower.tail = FALSE)	
+			pv <- pf(scan1$fstat, m, n - m - 1, lower.tail = FALSE)	
 		} else {
 			pv <- pf(fs, m, n.eff - m - 1, lower.tail = FALSE)	
 			# scan1 <- .Fortran('MultiSummaryLoopDirectFstat', k = as.integer(k), m = as.integer(m), nn = as.numeric(n), 
@@ -155,7 +155,7 @@
 			if (n.eff < 5*m) {
 				warning('Effective sample size < 5 times number of phenotypes. Consider argument high.dim = TRUE.')
 			}
-			pv <- pf(fstat, m, n - m - 1, lower.tail = FALSE)	
+			pv <- pf(scan1$fstat, m, n - m - 1, lower.tail = FALSE)	
 		} else {
 			pv <- pf(fs, m, n.eff - m - 1, lower.tail = FALSE)	
 			# scan1 <- .Fortran('MultiSummaryLoopDirectFstat', k = as.integer(k), m = as.integer(m), nn = as.numeric(n), 
@@ -187,7 +187,7 @@
 			if (n.eff < 5*m) {
 				warning('Effective sample size < 5 times number of phenotypes. Consider argument high.dim = TRUE.')
 			}
-			pv <- pf(fstat, m, n - m - 1, lower.tail = FALSE)	
+			pv <- pf(scan1$fstat, m, n - m - 1, lower.tail = FALSE)	
 		} else {
 			pv <- pf(fs, m, n.eff - m - 1, lower.tail = FALSE)	
 			# scan1 <- .Fortran('MultiSummaryLoopDirectFstat', k = as.integer(k), m = as.integer(m), nn = as.numeric(n), 
@@ -219,7 +219,7 @@
 			if (n.eff < 5*m) {
 				warning('Effective sample size < 5 times number of phenotypes. Consider argument high.dim = TRUE.')
 			}
-			pv <- pf(fstat, m, n - m - 1, lower.tail = FALSE)	
+			pv <- pf(scan1$fstat, m, n - m - 1, lower.tail = FALSE)	
 		} else {
 			pv <- pf(fs, m, n.eff - m - 1, lower.tail = FALSE)	
 			# scan1 <- .Fortran('MultiSummaryLoopDirectFstat', k = as.integer(k), m = as.integer(m), nn = as.numeric(n),