Merge branch 'master' into exploration-policies

JuliaPOMDP · Mar 19, 2020 · faeaf75 · faeaf75
2 parents 7d8b5ca + 555637d
commit faeaf75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/alpha_vector.jl b/src/alpha_vector.jl
@@ -28,7 +28,10 @@ end
 
 @deprecate AlphaVectorPolicy(pomdp::POMDP, alphas) AlphaVectorPolicy(pomdp, alphas, ordered_actions(pomdp))
 
-AlphaVectorPolicy(m::POMDP, alphas::AbstractVector, amap) = AlphaVectorPolicy(m, length(states(m)), alphas, amap)
+function AlphaVectorPolicy(m::POMDP, alphas::AbstractVector, amap)
+    AlphaVectorPolicy(m, length(states(m)), alphas,
+                      convert(Vector{actiontype(m)}, amap))
+end
 
 # assumes alphas is |S| x (number of alpha vecs)
 function AlphaVectorPolicy(p::POMDP, alphas::Matrix{Float64}, action_map)
@@ -39,7 +42,8 @@ function AlphaVectorPolicy(p::POMDP, alphas::Matrix{Float64}, action_map)
         push!(alpha_vecs, vec(alphas[:,i]))
     end
 
-    AlphaVectorPolicy(p, length(states(p)), alpha_vecs, action_map)
+    AlphaVectorPolicy(p, length(states(p)), alpha_vecs,
+                      convert(Vector{actiontype(p)}, action_map))
 end
 
 updater(p::AlphaVectorPolicy) = DiscreteUpdater(p.pomdp)

diff --git a/test/test_alpha_policy.jl b/test/test_alpha_policy.jl
@@ -37,4 +37,8 @@ let
 
     @test value(policy, b0) == 0.0
     @test action(policy, b0) == true
+
+    # JuliaPOMDP/SARSOP.jl#39
+    policy = AlphaVectorPolicy(pomdp, alphas, convert(BitArray, ordered_actions(pomdp)))
+    policy = AlphaVectorPolicy(pomdp, collect(alphas[:, i] for i in 1:size(alphas, 2)), convert(BitArray, ordered_actions(pomdp)))
 end