update

PharmCat · Aug 3, 2021 · 407990d · 407990d
1 parent cdde32e
commit 407990d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MetidaBase"
 uuid = "075456b7-4006-432f-9324-2f8453996c49"
 authors = ["PharmCat <[email protected]> and contributors"]
-version = "0.3.0"
+version = "0.3.1"
 
 [deps]
 #StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"

diff --git a/src/abstracttype.jl b/src/abstracttype.jl
@@ -16,6 +16,8 @@ abstract type AbstractLMMDataBlocks end
 
 abstract type AbstractData end
 
+abstract type AbstractDataSet{AbstractData} end
+
 # All have field: id::Dict
 abstract type AbstractIdData <: AbstractData end
 
@@ -41,4 +43,4 @@ abstract type AbstractSubject <: AbstractIdData end
 abstract type AbstractSubjectResult{AbstractSubject} <: AbstractIDResult{AbstractSubject} end
 
 
-# Descriptive 
+# Descriptive
diff --git a/src/types.jl b/src/types.jl
@@ -82,7 +82,7 @@ end
 ################################################################################
 # DATASET
 ################################################################################
-struct DataSet{T <: AbstractData}
+struct DataSet{T <: AbstractData} <: AbstractDataSet{AbstractData}
     ds::Vector{T}
 end
 

diff --git a/src/utils.jl b/src/utils.jl
@@ -12,3 +12,7 @@ function indsdict!(d::Dict{T}, cdata::Tuple) where T
     end
     d
 end
+
+
+isnanormissing(x::Number) = isnan(x)
+isnanormissing(x::Missing) = true
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,7 @@ function indsdict!(d::Dict{T}, cdata::Tuple) where T @@
         end
         d
     end
+    isnanormissing(x::Number) = isnan(x)
+    isnanormissing(x::Missing) = true