Merge pull request #11 from JuliaPOMDP/pomdptools_ci_updates

POMDPTools and CI Updates
JuliaPOMDP · Dec 20, 2023 · 511d5da · 511d5da · dylan-asmar · Dec 20, 2023
2 parents b136141 + 5fe8b48
commit 511d5da
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 53 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -1,16 +1,36 @@
 name: CI
-
-on: [push, pull_request]
-
+on:
+  push:
+    branches:
+      - master
+    tags: '*'
+  pull_request:
 jobs:
   test:
-    runs-on: ubuntu-latest
-
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - "1"
+          - "1.6" # minimum supported version
+        os:
+          - ubuntu-latest
+          - macOS-latest
+          - windows-latest
+        arch:
+          - x64
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: julia-actions/setup-julia@v1
         with:
-          version: '1'
-          arch: x64
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - uses: julia-actions/cache@v1
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v3
+        with:
+          files: lcov.info
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
 Manifest.toml
-test/Manifest.toml
+.vscode
diff --git a/.travis.yml b/.travis.yml
diff --git a/Project.toml b/Project.toml
@@ -1,30 +1,27 @@
 name = "FiniteHorizonValueIteration"
 uuid = "c7772946-478f-4fc8-9340-5223c2489741"
 authors = ["Tomáš Omasta"]
-version = "0.3.0"
+version = "0.3.1"
 
 [deps]
 FiniteHorizonPOMDPs = "8a13bbfe-798e-11e9-2f1c-eba9ee5ef093"
 POMDPLinter = "f3bd98c0-eb40-45e2-9eb1-f2763262d755"
-POMDPModelTools = "08074719-1b2a-587c-a292-00f91cc44415"
+POMDPTools = "7588e00f-9cae-40de-98dc-e0c70c48cdd7"
 POMDPs = "a93abf59-7444-517b-a68a-c42f96afdd7d"
 ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
 
 [compat]
-FiniteHorizonPOMDPs = "0.3"
+FiniteHorizonPOMDPs = "0.4"
 POMDPLinter = "0.1"
-POMDPModelTools = "0.3"
-ProgressMeter = "1.5"
+POMDPTools = "0.1"
 POMDPs = "0.9"
-julia = "1.5"
+ProgressMeter = "1.8"
+julia = "1.6"
 
 [extras]
 DiscreteValueIteration = "4b033969-44f6-5439-a48b-c11fa3648068"
 POMDPModels = "355abbd5-f08e-5560-ac9e-8b5f2592a0ca"
-POMDPPolicies = "182e52fb-cfd0-5e46-8c26-fd0667c990f4"
-POMDPSimulators = "e0d0a172-29c6-5d4e-96d0-f262df5d01fd"
-POMDPTesting = "92e6a534-49c2-5324-9027-86e3c861ab81"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "DiscreteValueIteration", "POMDPModels", "POMDPTesting", "POMDPPolicies", "POMDPSimulators"]
+test = ["Test", "DiscreteValueIteration", "POMDPModels"]
diff --git a/README.md b/README.md
@@ -1,23 +1,23 @@
 # FiniteHorizonValueIteration
-[![Build Status](https://travis-ci.org/JuliaPOMDP/FiniteHorizonValueIteration.jl.svg?branch=master)](https://travis-ci.org/JuliaPOMDP/FiniteHorizonValueIteration.jl)
-[![Coverage Status](https://coveralls.io/repos/github/JuliaPOMDP/FiniteHorizonValueIteration.jl/badge.svg?branch=master)](https://coveralls.io/github/JuliaPOMDP/FiniteHorizonValueIteration.jl?branch=master)
+
+[![CI](https://github.com/JuliaPOMDP/FiniteHorizonValueIteration.jl/actions/workflows/CI.yml/badge.svg)](https://github.com/JuliaPOMDP/FiniteHorizonValueIteration.jl/actions/workflows/CI.yml)
+[![codecov.io](http://codecov.io/github/JuliaPOMDP/FiniteHorizonValueIteration.jl/coverage.svg?branch=master)](http://codecov.io/github/JuliaPOMDP/FiniteHorizonValueIteration.jl?branch=master)
 
 The package contains a finite horizon MDP solver for discrete problems. This algorithm is a modified version of infinite horizon value iteration.
 
 ## Installation
 
-You must have [POMDPs.jl](https://github.com/JuliaPOMDP/POMDPs.jl) installed. To install `FiniteHorizonValueIteration`, run the following command:
+To install `FiniteHorizonValueIteration`, run the following command:
 
 ```julia
-using POMDPs
 using Pkg
-POMDPs.add_registry() # TODO: Is this still needed?
 Pkg.add("FiniteHorizonValueIteration")
 ```
 
 ## Usage
 
-```
+```julia
+using POMDPs
 using FiniteHorizonValueIteration
 
 mdp = MyMDP() # initialize MDP

diff --git a/src/FiniteHorizonValueIteration.jl b/src/FiniteHorizonValueIteration.jl
@@ -1,8 +1,8 @@
 module FiniteHorizonValueIteration
 
 using POMDPs
+using POMDPTools
 using FiniteHorizonPOMDPs
-using POMDPModelTools
 import POMDPs: Solver, solve, Policy, action, value
 import POMDPLinter: @POMDP_require, @req, @subreq
 import ProgressMeter: @showprogress

diff --git a/src/solver.jl b/src/solver.jl
@@ -109,7 +109,7 @@ function solve(solver::FiniteHorizonSolver, m::MDP)
     fhpolicy = FiniteHorizonValuePolicy(m)
     util = zeros(length(stage_states(m, horizon(m) + 1)))
 
-    @showprogress 1 "Computing..." for stage=horizon(m):-1:1
+    @showprogress dt=1 desc="Computing..." for stage=horizon(m):-1:1
         if solver.verbose
             println("Stage: $stage")
         end

diff --git a/test/instances/1DCustomFHGW.jl b/test/instances/1DCustomFHGW.jl
@@ -1,6 +1,6 @@
 using POMDPs
+using POMDPTools
 using FiniteHorizonPOMDPs
-using POMDPModelTools
 
 
 #####################

diff --git a/test/instances/1DInfiniteHorizonGridWorld.jl b/test/instances/1DInfiniteHorizonGridWorld.jl
@@ -1,6 +1,6 @@
 using POMDPs
+using POMDPTools
 using FiniteHorizonPOMDPs
-using POMDPModelTools
 
 
 struct FHExampleState

diff --git a/test/instances/Pyramid.jl b/test/instances/Pyramid.jl
@@ -1,6 +1,6 @@
 using POMDPs
+using POMDPTools
 using FiniteHorizonPOMDPs
-using POMDPModelTools
 
 
 #####################

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -1,7 +1,7 @@
 using FiniteHorizonValueIteration
 using Test
 using POMDPs
-using POMDPModelTools
+using POMDPTools
 using DiscreteValueIteration
 using FiniteHorizonPOMDPs