[Genabel-commits] r1353 - pkg/GenABEL/R

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

Author: lckarssen
Date: 2013-10-30 17:26:39 +0100 (Wed, 30 Oct 2013)
New Revision: 1353

Modified:
   pkg/GenABEL/R/GC.R
   pkg/GenABEL/R/GC_ovdom.R
   pkg/GenABEL/R/PGC.R
Log:
Fixed a few small typos in error messages and intro text in a few GenABEL functions.


Modified: pkg/GenABEL/R/GC.R
===================================================================
--- pkg/GenABEL/R/GC.R	2013-10-29 14:56:29 UTC (rev 1352)
+++ pkg/GenABEL/R/GC.R	2013-10-30 16:26:39 UTC (rev 1353)
@@ -1,7 +1,7 @@
 #' Genomic control for various model of inheritance using VIF
 #' 
 #' This function estimates corrected statistic using genomic control
-#' for diffrent models (recessive,dominant,additive etc.),
+#' for different models (recessive,dominant,additive etc.),
 #' using VIF. VIF coefficients are estimated
 #' by optimizing diffrent error functions: regress,
 #' median and ks.test.
@@ -179,11 +179,11 @@
 	#Chi2=qchisq(Chi2,1)
 	data_p <- data[ind.function]
 	if (proportion>1.0 || proportion<=0) 
-		stop("proportion argument should be greater then zero and less than or equal to one")
+		stop("proportion argument should be greater than zero and less than or equal to one")
 	ntp <- round(proportion*length(data_p))
-	if (ntp<1) stop("no valid measurments")
+	if (ntp<1) stop("no valid measurements")
 	if (ntp==1) {
-		warning(paste("One measurment, Lambda = 1 returned"))
+		warning(paste("One measurement, Lambda = 1 returned"))
 		return(list(estimate=1.0,se=999.99))
 	}
 	if (ntp<10) warning(paste("number of points is too small:",ntp))

Modified: pkg/GenABEL/R/GC_ovdom.R
===================================================================
--- pkg/GenABEL/R/GC_ovdom.R	2013-10-29 14:56:29 UTC (rev 1352)
+++ pkg/GenABEL/R/GC_ovdom.R	2013-10-30 16:26:39 UTC (rev 1353)
@@ -1,9 +1,9 @@
 #' Genomic control for overdimunant model of inheritance using VIF
 #' 
 #' This function estimates the corrected statistic using genomic control
-#' for overdimunant model,
+#' for the overdominant model,
 #' using VIF. VIF coefficients are estimated
-#' by optimizing diffrent error functions: regress,
+#' by optimizing different error functions: regress,
 #' median and ks.test.
 #'  
 #' @param data Input vector of Chi square statistic
@@ -143,11 +143,11 @@
 	#Chi2=qchisq(Chi2,1)
 	data_p <- data[ind.function]
 	if (proportion>1.0 || proportion<=0) 
-		stop("proportion argument should be greater then zero and less than or equal to one")
+		stop("proportion argument should be greater than zero and less than or equal to one")
 	ntp <- round(proportion*length(data_p))
-	if (ntp<1) stop("no valid measurments")
+	if (ntp<1) stop("no valid measurements")
 	if (ntp==1) {
-		warning(paste("One measurment, Lambda = 1 returned"))
+		warning(paste("One measurement, Lambda = 1 returned"))
 		return(list(estimate=1.0,se=999.99))
 	}
 	if (ntp<10) warning(paste("number of points is too small:",ntp))

Modified: pkg/GenABEL/R/PGC.R
===================================================================
--- pkg/GenABEL/R/PGC.R	2013-10-29 14:56:29 UTC (rev 1352)
+++ pkg/GenABEL/R/PGC.R	2013-10-30 16:26:39 UTC (rev 1353)
@@ -1,9 +1,9 @@
 #' Polynomial genomic control
 #' 
 #' This function estimates the genomic controls
-#' for diffrent model and degrees of freedom,
+#' for different models and degrees of freedom,
 #' using polinom function. Polinomic coefficients are estimated
-#' by optimizing diffrent error functions: regress,
+#' by optimizing different error functions: regress,
 #' median and ks.test.
 #' 
 #' @param data Input vector of Chi square statistic
@@ -60,11 +60,11 @@
     #N=sum(!is.na(data[ind.function]))
 	data_p <- data[ind.function]
 	if (proportion>1.0 || proportion<=0) 
-		stop("proportion argument should be greater then zero and less than or equal to one")
+		stop("proportion argument should be greater than zero and less than or equal to one")
 	ntp <- round(proportion*length(data_p))
-	if (ntp<1) stop("no valid measurments")
+	if (ntp<1) stop("no valid measurements")
 	if (ntp==1) {
-		warning(paste("One measurment, Lambda = 1 returned"))
+		warning(paste("One measurement, Lambda = 1 returned"))
 		return(list(estimate=1.0,se=999.99))
 	}
 	if (ntp<10) warning(paste("number of points is too small:",ntp))