Dev (#254)

Some minor changes: - Change order of arguments in `simulate` - Limit version for `NestedTuples` - New method for `iid` - Rewind version for release
cscherrer · Apr 9, 2021 · 0440210 · 0440210 · cscherrer · Apr 9, 2021
1 parent fd50a7c
commit 0440210
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Soss"
 uuid = "8ce77f84-9b61-11e8-39ff-d17a774bf41c"
 author = ["Chad Scherrer <chad.scherrer@gmail.com>"]
-version = "0.19.0"
+version = "0.17.0"
 
 [deps]
 ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -56,7 +56,7 @@ MacroTools = "0.5"
 MappedArrays = "0.3, 0.4"
 MeasureTheory = "0.6,0.7"
 NamedTupleTools = "0.12, 0.13"
-NestedTuples = "0.1,0.2, 0.3"
+NestedTuples = "0.3"
 RecipesBase = "0.7,0.8, 1"
 Reexport = "1"
 Requires = "1"

diff --git a/src/Soss.jl b/src/Soss.jl
@@ -62,7 +62,7 @@ include("distributions/iid.jl")
 # include("distributions/markovchain.jl")
 
 include("primitives/rand.jl")
-include("simulate.jl")
+include("primitives/simulate.jl")
 include("primitives/logdensity.jl")
 include("primitives/xform.jl")
 include("primitives/likelihood-weighting.jl")

diff --git a/src/distributions/iid.jl b/src/distributions/iid.jl
@@ -1,3 +1,4 @@
 export iid
 
 iid(n) = dist -> (dist ^ n)
+iid(n::Int...) = dist -> (dist ^ n)
diff --git a/src/simulate.jl → src/primitives/simulate.jl b/src/simulate.jl → src/primitives/simulate.jl
@@ -119,7 +119,7 @@ using MeasureTheory: AbstractMeasure
 
 simulate(μ::AbstractMeasure; trace_assignments=false) = simulate(Random.GLOBAL_RNG, μ; trace_assignments)
 
-simulate(rng::AbstractRNG, μ::AbstractMeasure; trace_assignments=false) = rand(rng, sampletype(μ),  μ)
+simulate(rng::AbstractRNG, μ::AbstractMeasure; trace_assignments=false) = rand(rng, μ)
 
 @gg function _simulate(M::Type{<:TypeLevel}, _m::Model, _args, trace_assignments::Val{V}) where {V}
     trace_assignments = V