Fix test errors from JuliaLang/julia#10748

JuliaData · Apr 24, 2015 · e96635f · e96635f
1 parent 3289a1a
commit e96635f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/RDA.jl b/src/RDA.jl
@@ -117,9 +117,9 @@ typealias RList RVector{Any, 0x13}  # "list" in R == Julia cell array
 
 typealias RDATag UInt32
 
-isobj(fl::RDATag) = @compat Bool(fl & 0x00000100)
-hasattr(fl::RDATag) = @compat Bool(fl & 0x00000200)
-hastag(fl::RDATag) = @compat Bool(fl & 0x00000400)
+isobj(fl::RDATag) = (fl & 0x00000100) != 0
+hasattr(fl::RDATag) = (fl & 0x00000200) != 0
+hastag(fl::RDATag) = (fl & 0x00000400) != 0
 
 if VERSION < v"0.4-"
     sxtype = uint8

diff --git a/src/statsmodels/formula.jl b/src/statsmodels/formula.jl
@@ -299,7 +299,7 @@ function ModelMatrix(mf::ModelFrame)
     ff = trms.factors[:, fetrms]
     ## need to be cautious here to avoid evaluating cols for a factor with many levels
     ## if the factor doesn't occur in the fetrms
-    rows = Bool[x for x in sum(ff, 2)]
+    rows = Bool[x != 0 for x in sum(ff, 2)]
     ff = ff[rows, :]
     cc = [cols(col) for col in columns(mf.df[:, rows])]
     for j in 1:size(ff,2)