Make VariableOrderAccumulator use regular Dict

Author: mhauru

src/default_accumulators.jl

@@ -57,7 +57,7 @@ struct VariableOrderAccumulator{Eltype<:Integer,VNType<:VarName} <: AbstractAccu
     "the number of observations"
     num_produce::Eltype
     "mapping of variable names to their order in the model"
-    order::OrderedDict{VNType,Eltype}
+    order::Dict{VNType,Eltype}
 end
 
 """
@@ -176,7 +176,7 @@ end
 function Base.convert(
     ::Type{VariableOrderAccumulator{ElType,VnType}}, acc::VariableOrderAccumulator
 ) where {ElType,VnType}
-    order = OrderedDict{VnType,ElType}()
+    order = Dict{VnType,ElType}()
     for (k, v) in acc.order
         order[convert(VnType, k)] = convert(ElType, v)
     end

src/simple_varinfo.jl

@@ -125,15 +125,15 @@ Evaluation in transformed space of course also works:
 
 ```jldoctest simplevarinfo-general
 julia> vi = DynamicPPL.settrans!!(SimpleVarInfo((x = -1.0,)), true)
-Transformed SimpleVarInfo((x = -1.0,), (LogPrior = LogPriorAccumulator(0.0), LogLikelihood = LogLikelihoodAccumulator(0.0), VariableOrder = VariableOrderAccumulator(0, OrderedDict{VarName, Int64}())))
+Transformed SimpleVarInfo((x = -1.0,), (LogPrior = LogPriorAccumulator(0.0), LogLikelihood = LogLikelihoodAccumulator(0.0), VariableOrder = VariableOrderAccumulator(0, Dict{VarName, Int64}())))
 
 julia> # (✓) Positive probability mass on negative numbers!
        getlogjoint(last(DynamicPPL.evaluate!!(m, vi, DynamicPPL.DefaultContext())))
 -1.3678794411714423
 
 julia> # While if we forget to indicate that it's transformed:
        vi = DynamicPPL.settrans!!(SimpleVarInfo((x = -1.0,)), false)
-SimpleVarInfo((x = -1.0,), (LogPrior = LogPriorAccumulator(0.0), LogLikelihood = LogLikelihoodAccumulator(0.0), VariableOrder = VariableOrderAccumulator(0, OrderedDict{VarName, Int64}())))
+SimpleVarInfo((x = -1.0,), (LogPrior = LogPriorAccumulator(0.0), LogLikelihood = LogLikelihoodAccumulator(0.0), VariableOrder = VariableOrderAccumulator(0, Dict{VarName, Int64}())))
 
 julia> # (✓) No probability mass on negative numbers!
        getlogjoint(last(DynamicPPL.evaluate!!(m, vi, DynamicPPL.DefaultContext())))

test/accumulators.jl

@@ -35,7 +35,7 @@ using DynamicPPL:
                 VariableOrderAccumulator() ==
                 VariableOrderAccumulator{Int}() ==
                 VariableOrderAccumulator{Int}(0) ==
-                VariableOrderAccumulator(0, OrderedDict{VarName,Int}())
+                VariableOrderAccumulator(0, Dict{VarName,Int}())
         end
 
         @testset "addition and incrementation" begin
@@ -92,7 +92,7 @@ using DynamicPPL:
                 LogLikelihoodAccumulator(1.0), val, logjac, vn, dist
             ) == LogLikelihoodAccumulator(1.0)
             @test accumulate_assume!!(VariableOrderAccumulator(1), val, logjac, vn, dist) ==
-                VariableOrderAccumulator(1, OrderedDict{VarName,Int}((vn => 1)))
+                VariableOrderAccumulator(1, Dict{VarName,Int}((vn => 1)))
         end
 
         @testset "accumulate_observe" begin