-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from ut-amrl/cleanup
Cleanup - update readem, remove print commands, update docs
- Loading branch information
Showing
7,938 changed files
with
1,355,691 additions
and
1,263 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,24 @@ | ||
[submodule "submodules/ut_multirobot_sim"] | ||
path = submodules/ut_multirobot_sim | ||
url = https://github.com/ut-amrl/ut_multirobot_sim.git | ||
ignore = dirty | ||
[submodule "submodules/graph_navigation"] | ||
path = submodules/graph_navigation | ||
url = https://github.com/ut-amrl/graph_navigation.git | ||
ignore = dirty | ||
[submodule "submodules/amrl_msgs"] | ||
path = submodules/amrl_msgs | ||
url = https://github.com/ut-amrl/amrl_msgs.git | ||
ignore = dirty | ||
[submodule "submodules/amrl_maps"] | ||
path = submodules/amrl_maps | ||
url = https://github.com/ut-amrl/amrl_maps.git | ||
ignore = dirty | ||
[submodule "submodules/pips"] | ||
path = submodules/pips | ||
url = https://github.com/ut-amrl/pips.git | ||
ignore = dirty | ||
[submodule "submodules/pedsim_ros/src/pedsim_ros"] | ||
path = submodules/pedsim_ros/src/pedsim_ros | ||
url = https://github.com/simon-andrews/pedsim_ros.git | ||
ignore = dirty |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,53 @@ | ||
# SocialGym 2.0 | ||
## SocialGym2.0: Simulator for Multi-Agent Social Robot Navigation in Shared Human Spaces | ||
<!-- <h1 style="text-align: center;"> SocialGym 2 </h1> --> | ||
|
||
This is the codebase for our multi-agent simulator for real world robots for social navigation. | ||
<p align="center"> | ||
<img src="https://drive.google.com/uc?id=1F1hEwQiFuwT7OGwYrJ6t8O9NqrlNk4RH" width="400" /> | ||
</p> | ||
|
||
Find the documentation (currently under active development) at https://amrl.cs.utexas.edu/social_gym/index.html | ||
This is the codebase for our multi-agent simulator for real world social navigation. Installation instructions ca be found below. Tutorials are provided in the [**documentation**](https://amrl.cs.utexas.edu/social_gym/index.html) (currently under active development). | ||
|
||
<!-- | ||
<p align="center"> | ||
<img src="https://obj.umiacs.umd.edu/badue-accepted/sim_demo.gif" width="400" /> | ||
</p> --> | ||
# Read the paper | ||
[**SOCIALGYM 2.0: Simulator for Multi-Agent Social Robot Navigation in Shared Human Spaces**]() | ||
|
||
<br> | ||
|
||
# Installation | ||
|
||
**Note**: We require you have installed Docker and Python 3.8 (version 3.8 may not be necessary but it's what we use) | ||
|
||
**WARNING**: The authors of this project have had numerous issues with Docker and Docker-Compose when installed via snap. We recommend uninstalling docker and docker-compose if you have GPU-related issues with the docker images and installing them via `apt`. | ||
|
||
--- | ||
|
||
### 1.) Clone the repo and checkout main | ||
|
||
```shell | ||
git clone [email protected]:ut-amrl/social_gym.git | ||
git checkout main | ||
``` | ||
|
||
### 2.) Install requirements and run the install script | ||
|
||
```shell | ||
python3 ./scripts/install_config_runner.py | ||
``` | ||
|
||
### 3.) Run the Config Runner! | ||
|
||
```shell | ||
python3 config_runner/run.py -c 1_31_23/door/sacadrl.json | ||
``` | ||
|
||
This should open an RVIS window (looks like a 2D grid with options on the side-panels). If you do NOT see this window, there's a problem with the docker file. First try running | ||
```shell | ||
sudo xhost + | ||
``` | ||
and repeat the command. If it still fails to show windows then try adding `--network host` | ||
to the file `{PROJECT_ROOT}/config_runner/run.sh` on lines where we are setting docker environment variables. Otherwise, look up stuff like "cannot display window from docker container" -- this is critical for Social Gym to work. | ||
|
||
## If you use this code, please cite the following | ||
--- | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
# Sphinx build info version 1 | ||
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. | ||
config: 3d11c1b419095fa5e8888f76408e859f | ||
config: 42c756fe409f51a6f22e850571573aa9 | ||
tags: 645f666f9bcd5a90fca523b33c5a78b7 |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+56.5 KB
docs/.doctrees/_site/modules/src.environment.environment_types.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+113 KB
docs/.doctrees/_site/modules/src.environment.observations.types.doctree
Binary file not shown.
Binary file added
BIN
+20.7 KB
docs/.doctrees/_site/modules/src.environment.observations.types.manual_zone.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+24.2 KB
docs/.doctrees/_site/modules/src.environment.rewards.types.manual_zone.doctree
Binary file not shown.
Binary file added
BIN
+15.3 KB
docs/.doctrees/_site/modules/src.environment.rewards.wrappers.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+6.35 KB
docs/.doctrees/_site/venv/lib/python3.8/site-packages/Jinja2-3.1.2.dist-info/LICENSE.doctree
Binary file not shown.
Binary file added
BIN
+6.35 KB
...octrees/_site/venv/lib/python3.8/site-packages/MarkupSafe-2.1.2.dist-info/LICENSE.doctree
Binary file not shown.
Binary file added
BIN
+7.4 KB
docs/.doctrees/_site/venv/lib/python3.8/site-packages/idna-3.4.dist-info/LICENSE.doctree
Binary file not shown.
Binary file added
BIN
+4.89 KB
...doctrees/_site/venv/lib/python3.8/site-packages/imagesize-1.4.1.dist-info/LICENSE.doctree
Binary file not shown.
Binary file added
BIN
+13.4 KB
....doctrees/_site/venv/lib/python3.8/site-packages/mdit_py_plugins/container/README.doctree
Binary file not shown.
Binary file added
BIN
+8.46 KB
docs/.doctrees/_site/venv/lib/python3.8/site-packages/mdit_py_plugins/deflist/README.doctree
Binary file not shown.
Binary file added
BIN
+34.1 KB
docs/.doctrees/_site/venv/lib/python3.8/site-packages/mdit_py_plugins/texmath/README.doctree
Binary file not shown.
Binary file added
BIN
+3.04 KB
...env/lib/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/base.doctree
Binary file not shown.
Binary file added
BIN
+2.88 KB
...nv/lib/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/class.doctree
Binary file not shown.
Binary file added
BIN
+4.87 KB
...v/lib/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/module.doctree
Binary file not shown.
Binary file added
BIN
+6.35 KB
....doctrees/_site/venv/lib64/python3.8/site-packages/Jinja2-3.1.2.dist-info/LICENSE.doctree
Binary file not shown.
Binary file added
BIN
+6.36 KB
...trees/_site/venv/lib64/python3.8/site-packages/MarkupSafe-2.1.2.dist-info/LICENSE.doctree
Binary file not shown.
Binary file added
BIN
+7.41 KB
docs/.doctrees/_site/venv/lib64/python3.8/site-packages/idna-3.4.dist-info/LICENSE.doctree
Binary file not shown.
Binary file added
BIN
+4.89 KB
...ctrees/_site/venv/lib64/python3.8/site-packages/imagesize-1.4.1.dist-info/LICENSE.doctree
Binary file not shown.
Binary file added
BIN
+13.4 KB
...octrees/_site/venv/lib64/python3.8/site-packages/mdit_py_plugins/container/README.doctree
Binary file not shown.
Binary file added
BIN
+8.46 KB
....doctrees/_site/venv/lib64/python3.8/site-packages/mdit_py_plugins/deflist/README.doctree
Binary file not shown.
Binary file added
BIN
+34.1 KB
....doctrees/_site/venv/lib64/python3.8/site-packages/mdit_py_plugins/texmath/README.doctree
Binary file not shown.
Binary file added
BIN
+3.04 KB
...v/lib64/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/base.doctree
Binary file not shown.
Binary file added
BIN
+2.88 KB
.../lib64/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/class.doctree
Binary file not shown.
Binary file added
BIN
+4.88 KB
...lib64/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/module.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/installation/installation__deprecated.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+48.9 KB
(210%)
docs/.doctrees/modules/src.environment.environment_types.doctree
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/modules/src.environment.observations.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/modules/src.environment.observations.types.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/modules/src.environment.observations.types.manual_zone.doctree
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+4.71 KB
(100%)
docs/.doctrees/modules/src.environment.rewards.types.doctree
Binary file not shown.
Binary file modified
BIN
+1.59 KB
(110%)
docs/.doctrees/modules/src.environment.rewards.types.manual_zone.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/modules/src.environment.rewards.wrappers.doctree
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/modules/src.environment.scenarios.types.doctree
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib/python3.8/site-packages/Jinja2-3.1.2.dist-info/LICENSE.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib/python3.8/site-packages/MarkupSafe-2.1.2.dist-info/LICENSE.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib/python3.8/site-packages/idna-3.4.dist-info/LICENSE.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib/python3.8/site-packages/imagesize-1.4.1.dist-info/LICENSE.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib/python3.8/site-packages/mdit_py_plugins/container/README.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib/python3.8/site-packages/mdit_py_plugins/deflist/README.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib/python3.8/site-packages/mdit_py_plugins/texmath/README.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...env/lib/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/base.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...nv/lib/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/class.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...v/lib/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/module.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib64/python3.8/site-packages/Jinja2-3.1.2.dist-info/LICENSE.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib64/python3.8/site-packages/MarkupSafe-2.1.2.dist-info/LICENSE.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib64/python3.8/site-packages/idna-3.4.dist-info/LICENSE.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib64/python3.8/site-packages/imagesize-1.4.1.dist-info/LICENSE.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib64/python3.8/site-packages/mdit_py_plugins/container/README.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib64/python3.8/site-packages/mdit_py_plugins/deflist/README.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
docs/.doctrees/venv/lib64/python3.8/site-packages/mdit_py_plugins/texmath/README.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...v/lib64/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/base.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
.../lib64/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/class.doctree
Binary file not shown.
Binary file modified
BIN
+0 Bytes
(100%)
...lib64/python3.8/site-packages/sphinx/ext/autosummary/templates/autosummary/module.doctree
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,132 @@ | ||
<!DOCTYPE html> | ||
<html class="writer-html5" lang="en" > | ||
<head> | ||
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" /> | ||
|
||
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> | ||
<title>Making docs — Social Gym 2.0 documentation</title> | ||
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" /> | ||
<link rel="stylesheet" href="../../_static/css/theme.css" type="text/css" /> | ||
<!--[if lt IE 9]> | ||
<script src="../../_static/js/html5shiv.min.js"></script> | ||
<![endif]--> | ||
|
||
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script> | ||
<script src="../../_static/jquery.js"></script> | ||
<script src="../../_static/underscore.js"></script> | ||
<script src="../../_static/doctools.js"></script> | ||
<script src="../../_static/js/theme.js"></script> | ||
<link rel="index" title="Index" href="../../genindex.html" /> | ||
<link rel="search" title="Search" href="../../search.html" /> | ||
</head> | ||
|
||
<body class="wy-body-for-nav"> | ||
<div class="wy-grid-for-nav"> | ||
<nav data-toggle="wy-nav-shift" class="wy-nav-side"> | ||
<div class="wy-side-scroll"> | ||
<div class="wy-side-nav-search" > | ||
<a href="../../index.html" class="icon icon-home"> Social Gym 2.0 | ||
<img src="../../_static/SG2_LOGO.png" class="logo" alt="Logo"/> | ||
</a> | ||
<div role="search"> | ||
<form id="rtd-search-form" class="wy-form" action="../../search.html" method="get"> | ||
<input type="text" name="q" placeholder="Search docs" /> | ||
<input type="hidden" name="check_keywords" value="yes" /> | ||
<input type="hidden" name="area" value="default" /> | ||
</form> | ||
</div> | ||
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu"> | ||
<ul> | ||
<li class="toctree-l1"><a class="reference internal" href="../../installation/installation.html">Installation</a></li> | ||
<li class="toctree-l1"><a class="reference internal" href="../../installation/advanced_usage.html">Advanced Usage</a></li> | ||
<li class="toctree-l1"><a class="reference internal" href="../../intro/features.html">What’s new in Social Gym 2.0 from the original release?</a></li> | ||
<li class="toctree-l1"><a class="reference internal" href="../../intro/making_a_new_scene.html">How to make a new Scene</a></li> | ||
<li class="toctree-l1"><a class="reference internal" href="../../intro/training_and_eval.html">Training and Evaluation with ConfigRunner</a></li> | ||
<li class="toctree-l1"><a class="reference internal" href="../../intro/advanced_training_and_eval.html">Advanced Training and Evaluation</a></li> | ||
<li class="toctree-l1"><a class="reference internal" href="../../contributing/making_docs.html">Making docs</a></li> | ||
</ul> | ||
|
||
</div> | ||
</div> | ||
</nav> | ||
|
||
<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" > | ||
<i data-toggle="wy-nav-top" class="fa fa-bars"></i> | ||
<a href="../../index.html">Social Gym 2.0</a> | ||
</nav> | ||
|
||
<div class="wy-nav-content"> | ||
<div class="rst-content"> | ||
<div role="navigation" aria-label="Page navigation"> | ||
<ul class="wy-breadcrumbs"> | ||
<li><a href="../../index.html" class="icon icon-home"></a></li> | ||
<li class="breadcrumb-item active">Making docs</li> | ||
<li class="wy-breadcrumbs-aside"> | ||
<a href="../../_sources/_site/contributing/making_docs.md.txt" rel="nofollow"> View page source</a> | ||
</li> | ||
</ul> | ||
<hr/> | ||
</div> | ||
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article"> | ||
<div itemprop="articleBody"> | ||
|
||
<section id="making-docs"> | ||
<h1>Making docs<a class="headerlink" href="#making-docs" title="Permalink to this headline"></a></h1> | ||
<p>The source code for all the documentation can be found in <code class="docutils literal notranslate"><span class="pre">{PROJECT_ROOT}/docs_src</span></code></p> | ||
<p>We use <a class="reference external" href="https://www.sphinx-doc.org/en/master/">Sphinx</a> to create our documentation and host it in Github Pages.</p> | ||
<p>Check out <code class="docutils literal notranslate"><span class="pre">docs_src/index.rst</span></code> for the layout of the pages (starting on line 6). That file will point to the source doc | ||
for each of the pages on the site. Everything is written in markdown currently, so when you find the <code class="docutils literal notranslate"><span class="pre">.md</span></code> file, you | ||
can add/change/create new pages in markdown.</p> | ||
<p>Creating a new doc requires that you make a <code class="docutils literal notranslate"><span class="pre">filename.md</span></code> and then point to it in the <code class="docutils literal notranslate"><span class="pre">index.rst</span></code> file (similar to the | ||
previous docs).</p> | ||
<p>You can use <code class="docutils literal notranslate"><span class="pre">./auto_build.sh</span></code> to see your changes to the documentation site live (it will update your local version | ||
as you save files.) The service is usually hosted on http://127.0.0.1:8000 but it will also tell you where the local | ||
version of the site is.</p> | ||
<section id="uploading-changes"> | ||
<h2>Uploading changes<a class="headerlink" href="#uploading-changes" title="Permalink to this headline"></a></h2> | ||
<section id="run-build-sh"> | ||
<h3>1.) Run <code class="docutils literal notranslate"><span class="pre">./build.sh</span></code><a class="headerlink" href="#run-build-sh" title="Permalink to this headline"></a></h3> | ||
</section> | ||
<section id="run-git-add-sh"> | ||
<h3>2.) Run <code class="docutils literal notranslate"><span class="pre">./git_add.sh</span></code><a class="headerlink" href="#run-git-add-sh" title="Permalink to this headline"></a></h3> | ||
</section> | ||
<section id="the-files-are-now-staged-in-git-you-can-do"> | ||
<h3>3.) The files are now staged in git, you can do<a class="headerlink" href="#the-files-are-now-staged-in-git-you-can-do" title="Permalink to this headline"></a></h3> | ||
<div class="highlight-shell notranslate"><div class="highlight"><pre><span></span>git commit -m <span class="s2">"Doc changes"</span> | ||
git push | ||
</pre></div> | ||
</div> | ||
<p>and the website should update within the next 5-10minutes.</p> | ||
</section> | ||
</section> | ||
</section> | ||
|
||
|
||
</div> | ||
</div> | ||
<footer> | ||
|
||
<hr/> | ||
|
||
<div role="contentinfo"> | ||
<p>© Copyright 2022, Zayne Sprague, Jarrett Holtz, Rohan Chandra, Joydeep Biswas.</p> | ||
</div> | ||
|
||
Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a | ||
<a href="https://github.com/readthedocs/sphinx_rtd_theme">theme</a> | ||
provided by <a href="https://readthedocs.org">Read the Docs</a>. | ||
|
||
|
||
</footer> | ||
</div> | ||
</div> | ||
</section> | ||
</div> | ||
<script> | ||
jQuery(function () { | ||
SphinxRtdTheme.Navigation.enable(true); | ||
}); | ||
</script> | ||
|
||
</body> | ||
</html> |
Oops, something went wrong.