Browse code

(1.25.5) Fix issue with normalize.quantiles.use.target when there are NA in matrix for non-pthread builds (notably windows)

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/preprocessCore@86028 bc3139a8-67e5-0310-9ffc-ced21a209358

Ben Bolstad authored on 04/02/2014 04:34:08
Showing 3 changed files

... ...
@@ -1,5 +1,5 @@
1 1
 Package: preprocessCore
2
-Version: 1.25.4
2
+Version: 1.25.5
3 3
 Title: A collection of pre-processing functions
4 4
 Author: Benjamin Milo Bolstad <bmb@bmbolstad.com>
5 5
 Maintainer: Benjamin Milo Bolstad <bmb@bmbolstad.com>
... ...
@@ -1984,7 +1984,7 @@ int qnorm_c_determine_target_l(double *data, size_t rows, size_t cols, double *t
1984 1984
   Free(args);  
1985 1985
 
1986 1986
 #else
1987
-  normalize_determine_target(data,row_mean,rows,cols,0,cols-1);
1987
+  determine_target(data,row_mean,rows,cols,0,cols-1);
1988 1988
 #endif
1989 1989
   
1990 1990
   if (rows == targetrows){
... ...
@@ -49,3 +49,6 @@ if (all(abs(y.norm.target.truth - normalize.quantiles.determine.target(y)) < err
49 49
 if (all(abs(normalize.quantiles.use.target(y,y.norm.target.truth) - y.norm.truth) < err.tol,na.rm=TRUE) != TRUE){
50 50
 		stop("Disagreement in normalize.quantiles.use.target(y)")
51 51
 }
52
+
53
+
54
+