Use Missing instead of nullable:

- Fix Nullable{T} to Union{T, Missing} for ordinariness.
- Test requirement update for RCall to 0.10.0, which also uses Missing.

NEWS.md

@@ -1,3 +1,6 @@
+- v0.4.1
+  - Fix Nullable{T} to Union{T, Missing}
+  - Other minor updates for Julia 0.7
 - v0.4.0
   - Add in phylogenetic diversity
   - Create a formal API (in `API.jl`) for extending to new types of diversity

REQUIRE

@@ -1,3 +1,4 @@
 julia 0.6
 DataFrames 0.9.0
 Phylo 0.2.0
+Missings

src/Metacommunity.jl

@@ -1,4 +1,5 @@
 using DataFrames
+using Missings
 
 """
     Metacommunity{FP, ARaw, AProcessed, Part, Sim}
@@ -40,7 +41,7 @@ mutable struct Metacommunity{FP, ARaw, AProcessed, Sim, Part} <:
     scale::FP
     types::Sim
     partition::Part
-    ordinariness::Nullable{AProcessed}
+    ordinariness::Union{AProcessed, Missing}
 
     function Metacommunity{FP, ARaw, AProcessed,
                            Sim, Part}(abundances::ARaw,
@@ -54,7 +55,7 @@ mutable struct Metacommunity{FP, ARaw, AProcessed, Sim, Part} <:
                   "partition and type list")
         processedabundances, scale = _calcabundance(types, matrix)
         new{FP, ARaw, AProcessed, Sim, Part}(abundances, processedabundances, scale,
-                                             types, part, Nullable{AProcessed}())
+                                             types, part, missing)
     end
 end
 
@@ -148,10 +149,10 @@ end
 
 import Diversity.API._getordinariness!
 function _getordinariness!(meta::Metacommunity)
-    if isnull(meta.ordinariness)
+    if ismissing(meta.ordinariness)
         meta.ordinariness = _calcordinariness(meta.types, meta.processedabundances, meta.scale)
     end
-    get(meta.ordinariness)
+    meta.ordinariness
 end
 
 import Diversity.API._getscale

test/REQUIRE

@@ -1,4 +1,4 @@
 Distances 0.3.2
 StatsBase 0.10.0
-RCall 0.7.3
+RCall 0.10.0
 Compat 0.33.0

test/test_Metacommunity.jl

@@ -4,6 +4,7 @@ using Compat.Test
 using Diversity
 using Diversity.API
 using DataFrames
+using Missings
 
 three = [0.3
          0.3
@@ -62,9 +63,9 @@ g2 = GeneralTypes(eye(2))
 @testset "Metacommunity" begin
     @test gettypes(meta) == ms
     @test getpartition(meta) == oc_count
-    @test isnull(meta.ordinariness)
+    @test ismissing(meta.ordinariness)
     @test getordinariness!(meta) ≈ [0.3, 0.6, 1.0]
-    @test !isnull(meta.ordinariness)
+    @test !ismissing(meta.ordinariness)
     @test getabundance(Metacommunity(ab3, g2, sc)) ≈
         getabundance(Metacommunity(abf, g2, sc))
     @test_warn "not normalised" Metacommunity(ab3 * 1.0, eye(2))