[Genabel-commits] r1556 - pkg/MetABEL/R

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Tue Jan 21 17:14:24 CET 2014


Author: lckarssen
Date: 2014-01-21 17:14:24 +0100 (Tue, 21 Jan 2014)
New Revision: 1556

Modified:
   pkg/MetABEL/R/metagwa.files.R
Log:
Made MetABEL's metagwa.files.R more compliant with our coding standards:
- Insert spaces after comma's
- No whitespace at end of line
- TRUE/FALSE written in full

This should contain no functional changes.


Modified: pkg/MetABEL/R/metagwa.files.R
===================================================================
--- pkg/MetABEL/R/metagwa.files.R	2014-01-21 15:55:41 UTC (rev 1555)
+++ pkg/MetABEL/R/metagwa.files.R	2014-01-21 16:14:24 UTC (rev 1556)
@@ -1,85 +1,130 @@
-"metagwa.files" <- 
-function(dir=".",pops,extens,maf=5,call=0.95,phwe=1.e-8,precorrect=TRUE,correct.pooled=FALSE) {
-	analysed.pops <- rep(TRUE,length(pops))
-	if (length(unique(pops)) != length(pops)) 
-		stop("Some population names are not unique!")
-	cpop <- 1
-	tryerr <- "try-error"
-	while (tryerr == "try-error") {
-		fname <- paste(dir,"/",pops[cpop],extens,sep="")
-		cat("Population",pops[cpop],", reading",fname)
-		df <- try(read.csv(file=fname,head=T,stringsAsFactors=FALSE))
-		if (class(df) == "try-error") {
-			warning(paste("File",fname,"can not be open. Skipping population",pops[cpop]),immediate.=TRUE)
-			tryerr <- "try-error"
-			analysed.pops[cpop] <- FALSE
-			cpop <- cpop + 1
-			if (cpop > length(pops)) stop("Ran out of populations...")
-			next;
-		}
-		if (maf>1) {
-			if (is.na(match("n",names(df)))) stop("Number of people (n) required to filter on number of rare allele copies")
-			norac <- pmin(2*df$n*df$effallelefreq,2*df$n*(1.-df$effallelefreq))
-			goods <- which(df$call>=call & norac >= maf & df$pexhwe >= phwe)
-			rm(norac)
-		} else {
-			goods <- which(df$call>=call & pmin(df$effallelefreq,1.-df$effallelefreq) >= maf & df$pexhwe >= phwe)
-		}
-		df <- df[goods,]
-		df <- df[!(df$allele1=="1" | df$allele2=="1"),]
-		cat(" done\n")
-		cat("Dimesions after filters are",dim(df),"\n")
-		if (dim(df)[1] <= 0) {
-			tryerr <- "try-error"
-			analysed.pops[cpop] <- FALSE
-			cpop <- cpop + 1
-			if (cpop > length(pops)) stop("Ran out of populations...")
-			warning(paste("Data in file",fname,", population",pops[cpop],": no SNPs left after filtering. Skipping"),immediate.=TRUE)
-			next;
-		}
-		tryerr <- "no"
-	}
-	df$npops <- rep(0,dim(df)[1])
-	df$npops[!is.na(df$beta)] <- 1
-	names1 <- df$name
-	for (pop in pops[(which(analysed.pops==TRUE)[2]):length(pops)]) {
-		cat("population ",pop,", ",sep="")
-		fname <- paste(dir,"/",pop,extens,sep="")
-		cat("reading",fname)
-		gc()
-		dft <- try(read.csv(file=fname,head=T,stringsAsFactors=FALSE))
-		if (class(dft) == "try-error") {
-			warning(paste("File",fname,"can not be open. Skipping population",pop),immediate.=TRUE)
-			analysed.pops[which(pops == pop)] <- FALSE
-			next;
-		}
-		cat(" done\n")
-		if (maf>1) {
-			if (is.na(match("n",names(dft)))) stop("Number of people (n) required to filter on number of rare allele copies")
-			norac <- pmin(2*dft$n*dft$effallelefreq,2*dft$n*(1.-dft$effallelefreq))
-			goods <- which(dft$call>=call & norac >= maf & dft$pexhwe >= phwe)
-			rm(norac)
-		} else {
-			goods <- which(dft$call>=call & pmin(dft$effallelefreq,1.-dft$effallelefreq) >= maf & dft$pexhwe >= phwe)
-		}
-		dft <- dft[goods,]
-		dft <- dft[which(!(dft$allele1=="1" | dft$allele2=="1")),]
-		cat("Dimesions after filters are",dim(dft),"\n")
-		if (dim(dft)[1] <= 0) {
-			warning(paste("Data in file",fname,", population",pop,": no SNPs left after filtering. Skipping"),immediate.=TRUE)
-			analysed.pops[which(pops == pop)] <- FALSE
-			next;
-		}
-		gc()
-		if (pop==(pops[analysed.pops])[2]) 
-			basepop <- (pops[analysed.pops])[1]
-		else 
-			basepop <- "POOLED"
-		df <- metagwa.tables(df,dft,name.x=basepop,name.y=pop,precorrect=precorrect,correct.pooled=correct.pooled)
-		cat("Dimesions after pooling are",dim(df),"\n")
-	}
-	write.csv(df,file=paste(dir,"/POOLED",extens,sep=""),row.names=F,quote=F)
-	out <- list()
-	out$analysed.pops <- pops[analysed.pops]
-	out
-}
+"metagwa.files" <-
+    function(dir=".", pops, extens, maf=5, call=0.95, phwe=1.e-8,
+             precorrect=TRUE, correct.pooled=FALSE) {
+
+        analysed.pops <- rep(TRUE, length(pops))
+        if (length(unique(pops)) != length(pops)) {
+            stop("Some population names are not unique!")
+        }
+
+        cpop <- 1
+        tryerr <- "try-error"
+        while (tryerr == "try-error") {
+            fname <- paste(dir, "/", pops[cpop], extens, sep="")
+            cat("Population", pops[cpop], ", reading", fname)
+            df <- try(read.csv(file=fname, head=TRUE, stringsAsFactors=FALSE))
+            if (class(df) == "try-error") {
+                warning(paste("File", fname,
+                              "can not be open. Skipping population",
+                              pops[cpop]), immediate.=TRUE)
+                tryerr <- "try-error"
+                analysed.pops[cpop] <- FALSE
+                cpop <- cpop + 1
+                if (cpop > length(pops)) stop("Ran out of populations...")
+                next;
+            }
+
+            if (maf>1) {
+                if (is.na(match("n", names(df)))) {
+                    stop("Number of people (n) required to filter on number of rare allele copies")
+                }
+
+                norac <- pmin(2 * df$n * df$effallelefreq, 2 * df$n *
+                              (1. - df$effallelefreq))
+                goods <- which(df$call >= call &
+                               norac >= maf &
+                               df$pexhwe >= phwe)
+                rm(norac)
+            } else {
+                goods <- which(df$call >= call &
+                               pmin(df$effallelefreq,
+                                    1. - df$effallelefreq) >= maf &
+                               df$pexhwe >= phwe)
+            }
+
+            df <- df[goods, ]
+            df <- df[!(df$allele1=="1" | df$allele2=="1"), ]
+            cat(" done\n")
+            cat("Dimesions after filters are", dim(df), "\n")
+
+            if (dim(df)[1] <= 0) {
+                tryerr <- "try-error"
+                analysed.pops[cpop] <- FALSE
+                cpop <- cpop + 1
+                if (cpop > length(pops))
+                    stop("Ran out of populations...")
+
+                warning(paste("Data in file", fname,
+                              ", population", pops[cpop],
+                              ": no SNPs left after filtering. Skipping"),
+                        immediate.=TRUE)
+                next;
+            }
+            tryerr <- "no"
+        }                               # END while (try-err)
+
+
+        df$npops <- rep(0, dim(df)[1])
+        df$npops[!is.na(df$beta)] <- 1
+        names1 <- df$name
+        for (pop in pops[(which(analysed.pops==TRUE)[2]):length(pops)]) {
+            cat("population ", pop, ", ", sep="")
+            fname <- paste(dir, "/", pop, extens, sep="")
+            cat("reading", fname)
+            gc()
+            dft <- try(read.csv(file=fname, head=TRUE, stringsAsFactors=FALSE))
+            if (class(dft) == "try-error") {
+                warning(paste("File", fname,
+                              "can not be open. Skipping population", pop),
+                        immediate.=TRUE)
+                analysed.pops[which(pops == pop)] <- FALSE
+                next;
+            }
+
+            cat(" done\n")
+            if (maf > 1) {
+                if (is.na(match("n", names(dft))))
+                    stop("Number of people (n) required to filter on number of rare allele copies")
+                norac <- pmin(2 * dft$n*dft$effallelefreq, 2 * dft$n *
+                              (1. - dft$effallelefreq))
+                goods <- which(dft$call>=call & norac >= maf & dft$pexhwe >= phwe)
+                rm(norac)
+            } else {
+                goods <- which(dft$call>=call &
+                               pmin(dft$effallelefreq,
+                                    1. - dft$effallelefreq) >= maf &
+                               dft$pexhwe >= phwe)
+            }
+
+            dft <- dft[goods, ]
+            dft <- dft[which(!(dft$allele1=="1" | dft$allele2=="1")), ]
+            cat("Dimesions after filters are", dim(dft), "\n")
+
+            if (dim(dft)[1] <= 0) {
+                warning(paste("Data in file", fname,
+                              ", population", pop,
+                              ": no SNPs left after filtering. Skipping"),
+                        immediate.=TRUE)
+                analysed.pops[which(pops == pop)] <- FALSE
+                next;
+            }
+            gc()
+
+            if (pop==(pops[analysed.pops])[2]) {
+                basepop <- (pops[analysed.pops])[1]
+            } else {
+                basepop <- "POOLED"
+            }
+
+            df <- metagwa.tables(df, dft, name.x=basepop, name.y=pop,
+                                 precorrect=precorrect,
+                                 correct.pooled=correct.pooled)
+            cat("Dimesions after pooling are", dim(df), "\n")
+        }
+
+        write.csv(df, file=paste(dir, "/POOLED", extens, sep=""),
+                  row.names=FALSE, quote=FALSE)
+        out <- list()
+        out$analysed.pops <- pops[analysed.pops]
+        out
+    }



More information about the Genabel-commits mailing list