Merge pull request #4 from awellis:dev

Add exponentially decaying bounds

src/DiffusionModels.jl

@@ -10,6 +10,7 @@ export AbstractSigma, ConstSigma, VarSigma
 export AbstractBounds
 export AbstractConstBounds, ConstSymBounds, ConstAsymBounds
 export AbstractVarBounds, VarSymBounds, VarAsymBounds
+export DecayingBound, DecayingBounds
 export AbstractNDT, NonDecisionTime
 export DiffusionModel
 

src/boundtypes.jl

@@ -63,3 +63,30 @@ function get(b::AbstractVarBounds)
     lo = b.lo
     return (hi = hi, lo = lo)
 end
+
+
+# function decayingbound(type::String, b0::Real, κ::Real, Δt::Real, tmax::Real) 
+#       type ∈ ["upper", "lower"] || error("Bound type needs to be upper or lower.")
+#       type = type == "upper" ? 1 : -1
+#       x = range(0, tmax, step = Δt)
+#       type .* (exp.(b0 .- κ.*x))
+# end
+
+@with_kw struct DecayingBound
+    bound::Array{Float64,1}
+
+    function DecayingBound(type::String, b0::Real, κ::Real, Δt::Real, tmax::Real)
+        type ∈ ["upper", "lower"] || error("Bound type needs to be upper or lower.")
+        type = type == "upper" ? 1 : -1
+        x = range(0, tmax, step = Δt)
+        return new(type .* (exp.(b0 .- κ.*x)))
+    end
+end
+
+@with_kw struct DecayingBounds <: AbstractVarBounds
+    hi::Array{Float64,1}
+    lo::Array{Float64,1}
+    function DecayingBounds(upper::DecayingBound, lower::DecayingBound)
+        return new(upper.bound, lower.bound)
+    end
+end

src/ndttypes.jl

@@ -3,7 +3,7 @@ abstract type AbstractNDT end
     lower::T
     upper::T
     function NonDecisionTime{T}(lower::T, upper::T) where T<:Real
-        @assert 0 < lower < upper
+        @assert 0 <= lower < upper
         new(lower, upper)
     end
 end

test/runtests.jl

@@ -15,9 +15,6 @@ choice, rt = rand(dm, 100)
 
 
 
-
-
-
 # or using the basic type constructor:
 
 drift = [1.2]