Merge aee51aa into e8a42cf

JuliaPOMDP · Sep 24, 2019 · f605546 · f605546
2 parents e8a42cf + aee51aa
commit f605546
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,11 @@
 language: julia
 os:
   - linux
+  - osx
+  - windows
 julia:
-  - 0.7
   - 1.0
+  - 1.1
 notifications:
   email: false
 git:

diff --git a/Project.toml b/Project.toml
@@ -4,15 +4,15 @@ repo = "https://github.com/JuliaPOMDP/AEMS.jl"
 version = "0.1.1"
 
 [deps]
-POMDPs = "a93abf59-7444-517b-a68a-c42f96afdd7d"
-POMDPPolicies = "182e52fb-cfd0-5e46-8c26-fd0667c990f4"
+BeliefUpdaters = "8bb6e9a1-7d73-552c-a44a-e5dc5634aac4"
+D3Trees = "e3df1716-f71e-5df9-9e2d-98e193103c45"
+FIB = "13b007ba-0ca8-5af2-9adf-bc6a6301e25a"
 POMDPModelTools = "08074719-1b2a-587c-a292-00f91cc44415"
+POMDPPolicies = "182e52fb-cfd0-5e46-8c26-fd0667c990f4"
 POMDPSimulators = "e0d0a172-29c6-5d4e-96d0-f262df5d01fd"
-Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
-FIB = "13b007ba-0ca8-5af2-9adf-bc6a6301e25a"
-D3Trees = "e3df1716-f71e-5df9-9e2d-98e193103c45"
-BeliefUpdaters = "8bb6e9a1-7d73-552c-a44a-e5dc5634aac4"
 POMDPTesting = "92e6a534-49c2-5324-9027-86e3c861ab81"
+POMDPs = "a93abf59-7444-517b-a68a-c42f96afdd7d"
+Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 
 [extras]
 POMDPModels = "355abbd5-f08e-5560-ac9e-8b5f2592a0ca"

diff --git a/src/bounds.jl b/src/bounds.jl
@@ -49,8 +49,8 @@ end
 function solve(solver::FixedActionSolver, pomdp::POMDP)
 
     # convenience variables
-    ns = n_states(pomdp)
-    na = n_actions(pomdp)
+    ns = length(states(pomdp))
+    na = length(actions(pomdp))
     state_list = ordered_states(pomdp)
     action_list = ordered_actions(pomdp)
 

diff --git a/src/simulate.jl b/src/simulate.jl
@@ -21,7 +21,7 @@ function simulate(sim::TestSimulator, pomdp::POMDP, policy::AEMSPlanner, updater
     while !isterminal(pomdp, s) && step <= sim.max_steps # TODO also check for terminal observation
         a = action(policy, b)
 
-        (sp, o, r) = generate_sor(pomdp, s, a, sim.rng)
+        (sp, o, r) = gen(DDNOut(:sp, :o, :r), pomdp, s, a, sim.rng)
 
         r_total += disc*r
 

diff --git a/src/solver.jl b/src/solver.jl
@@ -116,8 +116,8 @@ function update_root(planner::AEMSPlanner, a, o)
     if planner.root_manager != :user
         error("User is trying to update root but (root_manager != :user).")
     end
-    ai = action_index(planner.pomdp, a)
-    oi = obs_index(planner.pomdp, o)
+    ai = actionindex(planner.pomdp, a)
+    oi = obsindex(planner.pomdp, o)
 
     original_root = get_root(planner.G)