updates to include discretespace

src/ABMEv.jl

@@ -22,7 +22,7 @@ module ABMEv
 
     @reexport using Distributions, DataFrames
 
-    export GraphSpace,ContinuousSegment,DiscreteSegment,RealSpace,
+    export GraphSpace,ContinuousSegment,DiscreteSegment,RealSpace,NaturalSpace,
         AbstractSpacesTuple,get_inc
     export update_rates!
     export AbstractAgent,Agent,get_fitness,get_x,get_t,get_dim,

src/ABMEv_Space.jl

@@ -47,9 +47,11 @@ end
 """
 $(TYPEDEF)
 
-A real pace with dimension N and type T
+A real space with dimension N and type T
 """
 struct RealSpace{N,T} <: AbstractSpace{N,T,IsFinite{false}} end
+struct NaturalSpace{N,T} <: AbstractSpace{N,T,IsFinite{false}} end
+
 
 # TODO: find a way to put a type on D in get_inc
 
@@ -61,6 +63,14 @@ function _get_inc(D,s::AbstractSpace{Dim,T,I}) where {Dim,T<:AbstractFloat,I<:Is
     end
 end
 
+function _get_inc(D,s::AbstractSpace{Dim,T,I}) where {Dim,T<:Integer,I<:IsFinite{false}}
+    if Dim > 1
+        return Tuple(round.(T,D .*randn(Float32,Dim)))
+    else
+        return round(D * randn(Float32))
+    end
+end
+
 """
 $(SIGNATURES)
 Returns increment corresponding to space `s`

test/space_agent.jl

@@ -7,6 +7,7 @@ mysegment = DiscreteSegment(1,10)
 mygraph = GraphSpace(SimpleGraph(10,10))
 real2d = RealSpace{2,Float64}()
 myline = RealSpace{1,Float16}()
+mydiscreteline = NaturalSpace{1,Int8}()
 mycontinuoussegment = ContinuousSegment(-1.,1.)
 myspace = (mysegment,mygraph,myline)
 myspace2 = (mysegment,mycontinuoussegment,real2d)
@@ -23,8 +24,11 @@ myspace2 = (mysegment,mycontinuoussegment,real2d)
 
     # increment on infinite spaces
     @test ABMEv._get_inc(0.,myline) ≈ (0.)
+    @test ABMEv._get_inc(0.,mydiscreteline) ≈ (0.)
     @test !(ABMEv._get_inc(1.,myline) ≈ 0.)
     @test !(get_inc(1,1.,myline) ≈ 0.)
+    @test !(get_inc(1,1.,mydiscreteline) ≈ 0.)
+
 
     @test typeof(ABMEv._get_inc([1.,0.],real2d)) == Tuple{Float64,Float64}
     @test typeof(get_inc([1.,0.],[1.,0.],real2d)) == Tuple{Float64,Float64}