Merge pull request #3 from jenzopr/master

Fix mclapply error on windows #2
rhondabacher · Nov 29, 2016 · acbddad · acbddad
2 parents 025fbe0 + a606f0e
commit acbddad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/R/GetSlopes.R b/R/GetSlopes.R
@@ -20,8 +20,10 @@ GetSlopes <- function(Data, SeqDepth = 0, Tau = .5, NCores) {
 
 	Genes <- names(which(NumNonZeros >= 10)) ##filter for now	
 	LogData <- redobox(Data, 0) #log data
-
-
+
+	if (.Platform$OS.type == "windows") {
+		NCores = 1
+	}
 	AllReg <- unlist(mclapply(X = 1:length(Genes), FUN = quickreg, InputData = list(LogData, SeqDepth, Genes, Tau), mc.cores = NCores))
 
 	return(AllReg)

diff --git a/R/SCnorm.R b/R/SCnorm.R
@@ -128,7 +128,7 @@ SCnorm <- function(Data, Conditions, OutputName, PLOT = T, PropToUse = .25, outl
 
   checkCountDepth(Data = Data, NormalizedData = NORMDATA,
                   Conditions = Conditions, OutputName = "SCnorm_NormalizedData_FinalK", PLOT = PLOT,
-                  FilterCellProportion = FilterCellProportion, FilterExpression = FilterExpression)
+                  FilterCellProportion = FilterCellProportion, FilterExpression = FilterExpression, NCores = NCores)