Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into ccpomcp-fix-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Troi Williams authored and Troi Williams committed May 6, 2024
2 parents 835449d + 7eeb653 commit f90d0d7
Show file tree
Hide file tree
Showing 125 changed files with 905 additions and 599 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ on:
push:
branches: [ main, dev-latest ]
pull_request:
branches: [ main, dev-latest ]
types:
- opened
- reopened
- synchronize
- labeled
- unlabeled
- ready_for_review

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/pre_commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@ on:
branches:
- main
pull_request:
branches:
- main
- dev-latest
types:
- opened
- reopened
- synchronize
- labeled
- unlabeled
- ready_for_review

jobs:
pre-commit:
runs-on: ubuntu-latest
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/pypi_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
steps:
- name: Set Variables
if: startsWith(github.ref, 'refs/tags/v')
run: echo "RELEASE_NAME=\"Version ${{ github.ref_name }}\"" >> $GITHUB_ENV
run: echo "RELEASE_NAME=Version ${{ github.ref_name }}" >> $GITHUB_ENV

- uses: actions/setup-python@v5
with:
Expand All @@ -47,7 +47,7 @@ jobs:
working-directory: .
run: |
cd scripts
./pomdp_py_release.sh ${{ vars.RELEASE_ATTEMPT_COUNT }}
./pomdp_py_release.sh
- name: Upload to Test PyPi
uses: pypa/gh-action-pypi-publish@release/v1
Expand All @@ -58,12 +58,6 @@ jobs:
repository_url: https://test.pypi.org/legacy/
skip-existing: true

- name: Release artifact
uses: softprops/action-gh-release@v1
with:
name: ${{ env.RELEASE_NAME }}
files: dist/*.whl


pypi-publish:
name: publish to PyPi
Expand Down Expand Up @@ -104,7 +98,7 @@ jobs:
working-directory: .
run: |
cd scripts
./pomdp_py_release.sh ${{ vars.RELEASE_ATTEMPT_COUNT }}
./pomdp_py_release.sh
- name: Upload to PyPi
uses: pypa/gh-action-pypi-publish@release/v1
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ on:
push:
branches: [ "main", "dev-latest" ]
pull_request:
branches: [ "main", "dev-latest" ]
types:
- opened
- reopened
- synchronize
- labeled
- unlabeled
- ready_for_review

jobs:
build:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@ on:
push:
branches: [ main, dev-latest ]
pull_request:
branches: [ main, dev-latest ]
types:
- opened
- reopened
- synchronize
- labeled
- unlabeled
- ready_for_review

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ Changelog

Best viewed on `the website <https://h2r.github.io/pomdp-py/html/changelog.html>`_.

Version 1.3.5.1 (03/30/2024)
----------------------------
* Hot fixes for :py:mod:`~pomdp_py.representations.distribution.particles.WeightedParticles`.
* :py:mod:`~pomdp_py.framework.basics.Agent` can be created with a name.
* Bug fixes for release script and GHA workflow.

Version 1.3.5 (03/12/2024)
--------------------------
* Refactored :code:`_search` in :py:mod:`~pomdp_py.algorithms.po_uct.POUCT` to be more modular
Expand Down
8 changes: 4 additions & 4 deletions docs/html/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Overview: module code &#8212; pomdp_py 1.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=61cd365c" />
<title>Overview: module code &#8212; pomdp_py 1.3.5.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../_static/pygments.css?v=d1102ebc" />
<link rel="stylesheet" type="text/css" href="../_static/alabaster.css?v=51d35e29" />
<script src="../_static/documentation_options.js?v=4720776d"></script>
<script src="../_static/documentation_options.js?v=3fd01b6e"></script>
<script src="../_static/doctools.js?v=888ff710"></script>
<script src="../_static/sphinx_highlight.js?v=dc90522c"></script>
<link rel="icon" href="../_static/favicon.ico"/>
Expand All @@ -34,7 +34,7 @@



<p class="blurb">A framework to build and solve POMDP problems (v1.3.5).</p>
<p class="blurb">A framework to build and solve POMDP problems (v1.3.5.1).</p>



Expand Down
9 changes: 4 additions & 5 deletions docs/html/_modules/pomdp_py/algorithms/bsp/blqr.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>pomdp_py.algorithms.bsp.blqr &#8212; pomdp_py 1.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css?v=61cd365c" />
<title>pomdp_py.algorithms.bsp.blqr &#8212; pomdp_py 1.3.5.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css?v=d1102ebc" />
<link rel="stylesheet" type="text/css" href="../../../../_static/alabaster.css?v=51d35e29" />
<script src="../../../../_static/documentation_options.js?v=4720776d"></script>
<script src="../../../../_static/documentation_options.js?v=3fd01b6e"></script>
<script src="../../../../_static/doctools.js?v=888ff710"></script>
<script src="../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
<link rel="icon" href="../../../../_static/favicon.ico"/>
Expand All @@ -34,7 +34,7 @@



<p class="blurb">A framework to build and solve POMDP problems (v1.3.5).</p>
<p class="blurb">A framework to build and solve POMDP problems (v1.3.5.1).</p>



Expand All @@ -60,7 +60,6 @@ <h3>Navigation</h3>
<p class="caption" role="heading"><span class="caption-text">API References</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../api/modules.html">pomdp_py</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../problems/modules.html">problems</a></li>
</ul>


Expand Down
9 changes: 4 additions & 5 deletions docs/html/_modules/pomdp_py/problems/light_dark/env/env.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>pomdp_py.problems.light_dark.env.env &#8212; pomdp_py 1.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=61cd365c" />
<title>pomdp_py.problems.light_dark.env.env &#8212; pomdp_py 1.3.5.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=d1102ebc" />
<link rel="stylesheet" type="text/css" href="../../../../../_static/alabaster.css?v=51d35e29" />
<script src="../../../../../_static/documentation_options.js?v=4720776d"></script>
<script src="../../../../../_static/documentation_options.js?v=3fd01b6e"></script>
<script src="../../../../../_static/doctools.js?v=888ff710"></script>
<script src="../../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
<link rel="icon" href="../../../../../_static/favicon.ico"/>
Expand All @@ -34,7 +34,7 @@



<p class="blurb">A framework to build and solve POMDP problems (v1.3.5).</p>
<p class="blurb">A framework to build and solve POMDP problems (v1.3.5.1).</p>



Expand All @@ -60,7 +60,6 @@ <h3>Navigation</h3>
<p class="caption" role="heading"><span class="caption-text">API References</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../../api/modules.html">pomdp_py</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../../problems/modules.html">problems</a></li>
</ul>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>pomdp_py.problems.light_dark.env.plotting &#8212; pomdp_py 1.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=61cd365c" />
<title>pomdp_py.problems.light_dark.env.plotting &#8212; pomdp_py 1.3.5.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=d1102ebc" />
<link rel="stylesheet" type="text/css" href="../../../../../_static/alabaster.css?v=51d35e29" />
<script src="../../../../../_static/documentation_options.js?v=4720776d"></script>
<script src="../../../../../_static/documentation_options.js?v=3fd01b6e"></script>
<script src="../../../../../_static/doctools.js?v=888ff710"></script>
<script src="../../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
<link rel="icon" href="../../../../../_static/favicon.ico"/>
Expand All @@ -34,7 +34,7 @@



<p class="blurb">A framework to build and solve POMDP problems (v1.3.5).</p>
<p class="blurb">A framework to build and solve POMDP problems (v1.3.5.1).</p>



Expand All @@ -60,7 +60,6 @@ <h3>Navigation</h3>
<p class="caption" role="heading"><span class="caption-text">API References</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../../api/modules.html">pomdp_py</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../../problems/modules.html">problems</a></li>
</ul>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>pomdp_py.problems.load_unload.load_unload &#8212; pomdp_py 1.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css?v=61cd365c" />
<title>pomdp_py.problems.load_unload.load_unload &#8212; pomdp_py 1.3.5.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css?v=d1102ebc" />
<link rel="stylesheet" type="text/css" href="../../../../_static/alabaster.css?v=51d35e29" />
<script src="../../../../_static/documentation_options.js?v=4720776d"></script>
<script src="../../../../_static/documentation_options.js?v=3fd01b6e"></script>
<script src="../../../../_static/doctools.js?v=888ff710"></script>
<script src="../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
<link rel="icon" href="../../../../_static/favicon.ico"/>
Expand All @@ -34,7 +34,7 @@



<p class="blurb">A framework to build and solve POMDP problems (v1.3.5).</p>
<p class="blurb">A framework to build and solve POMDP problems (v1.3.5.1).</p>



Expand All @@ -60,7 +60,6 @@ <h3>Navigation</h3>
<p class="caption" role="heading"><span class="caption-text">API References</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../api/modules.html">pomdp_py</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../problems/modules.html">problems</a></li>
</ul>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>pomdp_py.problems.maze.domain.observation &#8212; pomdp_py 1.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=61cd365c" />
<title>pomdp_py.problems.maze.domain.observation &#8212; pomdp_py 1.3.5.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=d1102ebc" />
<link rel="stylesheet" type="text/css" href="../../../../../_static/alabaster.css?v=51d35e29" />
<script src="../../../../../_static/documentation_options.js?v=4720776d"></script>
<script src="../../../../../_static/documentation_options.js?v=3fd01b6e"></script>
<script src="../../../../../_static/doctools.js?v=888ff710"></script>
<script src="../../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
<link rel="icon" href="../../../../../_static/favicon.ico"/>
Expand All @@ -34,7 +34,7 @@



<p class="blurb">A framework to build and solve POMDP problems (v1.3.5).</p>
<p class="blurb">A framework to build and solve POMDP problems (v1.3.5.1).</p>



Expand All @@ -60,7 +60,6 @@ <h3>Navigation</h3>
<p class="caption" role="heading"><span class="caption-text">API References</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../../api/modules.html">pomdp_py</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../../problems/modules.html">problems</a></li>
</ul>


Expand Down
9 changes: 4 additions & 5 deletions docs/html/_modules/pomdp_py/problems/maze/domain/state.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>pomdp_py.problems.maze.domain.state &#8212; pomdp_py 1.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=61cd365c" />
<title>pomdp_py.problems.maze.domain.state &#8212; pomdp_py 1.3.5.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=d1102ebc" />
<link rel="stylesheet" type="text/css" href="../../../../../_static/alabaster.css?v=51d35e29" />
<script src="../../../../../_static/documentation_options.js?v=4720776d"></script>
<script src="../../../../../_static/documentation_options.js?v=3fd01b6e"></script>
<script src="../../../../../_static/doctools.js?v=888ff710"></script>
<script src="../../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
<link rel="icon" href="../../../../../_static/favicon.ico"/>
Expand All @@ -34,7 +34,7 @@



<p class="blurb">A framework to build and solve POMDP problems (v1.3.5).</p>
<p class="blurb">A framework to build and solve POMDP problems (v1.3.5.1).</p>



Expand All @@ -60,7 +60,6 @@ <h3>Navigation</h3>
<p class="caption" role="heading"><span class="caption-text">API References</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../../api/modules.html">pomdp_py</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../../problems/modules.html">problems</a></li>
</ul>


Expand Down
9 changes: 4 additions & 5 deletions docs/html/_modules/pomdp_py/problems/maze/env/env.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>pomdp_py.problems.maze.env.env &#8212; pomdp_py 1.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=61cd365c" />
<title>pomdp_py.problems.maze.env.env &#8212; pomdp_py 1.3.5.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=d1102ebc" />
<link rel="stylesheet" type="text/css" href="../../../../../_static/alabaster.css?v=51d35e29" />
<script src="../../../../../_static/documentation_options.js?v=4720776d"></script>
<script src="../../../../../_static/documentation_options.js?v=3fd01b6e"></script>
<script src="../../../../../_static/doctools.js?v=888ff710"></script>
<script src="../../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
<link rel="icon" href="../../../../../_static/favicon.ico"/>
Expand All @@ -34,7 +34,7 @@



<p class="blurb">A framework to build and solve POMDP problems (v1.3.5).</p>
<p class="blurb">A framework to build and solve POMDP problems (v1.3.5.1).</p>



Expand All @@ -60,7 +60,6 @@ <h3>Navigation</h3>
<p class="caption" role="heading"><span class="caption-text">API References</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../../api/modules.html">pomdp_py</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../../problems/modules.html">problems</a></li>
</ul>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>pomdp_py.problems.multi_object_search.agent.agent &#8212; pomdp_py 1.3.5 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=61cd365c" />
<title>pomdp_py.problems.multi_object_search.agent.agent &#8212; pomdp_py 1.3.5.1 documentation</title>
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css?v=d1102ebc" />
<link rel="stylesheet" type="text/css" href="../../../../../_static/alabaster.css?v=51d35e29" />
<script src="../../../../../_static/documentation_options.js?v=4720776d"></script>
<script src="../../../../../_static/documentation_options.js?v=3fd01b6e"></script>
<script src="../../../../../_static/doctools.js?v=888ff710"></script>
<script src="../../../../../_static/sphinx_highlight.js?v=dc90522c"></script>
<link rel="icon" href="../../../../../_static/favicon.ico"/>
Expand All @@ -34,7 +34,7 @@



<p class="blurb">A framework to build and solve POMDP problems (v1.3.5).</p>
<p class="blurb">A framework to build and solve POMDP problems (v1.3.5.1).</p>



Expand All @@ -60,7 +60,6 @@ <h3>Navigation</h3>
<p class="caption" role="heading"><span class="caption-text">API References</span></p>
<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../../api/modules.html">pomdp_py</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../../problems/modules.html">problems</a></li>
</ul>


Expand Down
Loading

0 comments on commit f90d0d7

Please sign in to comment.