From 8ef31ac3602f53844c3fe76e9bede4322527804e Mon Sep 17 00:00:00 2001
From: hagrid67 <jdhwatson@gmail.com>
Date: Tue, 21 May 2019 22:30:46 +0100
Subject: [PATCH] updated instructions in editor notebook. removed logging of
filename for each keypress (silly)
---
flatland/utils/editor.py | 2 +-
notebooks/Editor2.ipynb | 57 ++++++++++++++++++++++++++--------------
2 files changed, 39 insertions(+), 20 deletions(-)
diff --git a/flatland/utils/editor.py b/flatland/utils/editor.py
index 222883b..7e813d7 100644
--- a/flatland/utils/editor.py
+++ b/flatland/utils/editor.py
@@ -599,7 +599,7 @@ class EditorModel(object):
self.redraw()
def setFilename(self, filename):
- self.log("filename = ", filename, type(filename))
+ # self.log("filename = ", filename, type(filename))
self.env_filename = filename
def load(self):
diff --git a/notebooks/Editor2.ipynb b/notebooks/Editor2.ipynb
index f2481d0..7a55510 100644
--- a/notebooks/Editor2.ipynb
+++ b/notebooks/Editor2.ipynb
@@ -56,15 +56,7 @@
"cell_type": "code",
"execution_count": 4,
"metadata": {},
- "outputs": [
- {
- "name": "stdout",
- "output_type": "stream",
- "text": [
- "cpu\n"
- ]
- }
- ],
+ "outputs": [],
"source": [
"from flatland.utils.editor import EditorMVC, EditorModel, View, Controller"
]
@@ -93,14 +85,14 @@
"metadata": {},
"source": [
"## Instructions\n",
- "- Drag to draw\n",
- " - improved dead-ends\n",
- "- Shift-Drag to erase rails\n",
- " - erasing dead ends not yet automated - drag right across them\n",
+ "- Drag to draw (improved dead-ends)\n",
+ "- Shift-Drag to erase rails (erasing dead ends not yet automated - drag right across them)\n",
"- ctrl-click to add agent\n",
" - direction chosen randomly to fit rail\n",
"- ctrl-shift-click to add target for last agent\n",
- " - target can be moved by repeating "
+ " - target can be moved by repeating\n",
+ "- to Resize the env (cannot preserve work):\n",
+ " - select \"Regen\" tab, set regen size slider, click regenerate."
]
},
{
@@ -113,7 +105,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "6b1f996bbb834fcc962c80041465ac2d",
+ "model_id": "4bff3defb8dc40fb8c2ba74bdbd3c231",
"version_major": 2,
"version_minor": 0
},
@@ -123,6 +115,13 @@
},
"metadata": {},
"output_type": "display_data"
+ },
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "len: 190 <class 'bytes'> temp.pkl /home/jeremy/projects/aicrowd/rl-trains/notebooks\n"
+ ]
}
],
"source": [
@@ -139,7 +138,7 @@
{
"data": {
"application/vnd.jupyter.widget-view+json": {
- "model_id": "bf8e0dd6aa564b42a5ec3aa19c31a679",
+ "model_id": "961d8340f5d444c3b7a31f6684249233",
"version_major": 2,
"version_minor": 0
},
@@ -155,14 +154,34 @@
"mvc.view.wOutput.clear_output()\n",
"mvc.view.wOutput"
]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 8,
+ "metadata": {},
+ "outputs": [
+ {
+ "data": {
+ "text/plain": [
+ "(0, 0)"
+ ]
+ },
+ "execution_count": 8,
+ "metadata": {},
+ "output_type": "execute_result"
+ }
+ ],
+ "source": [
+ "len(mvc.editor.env.agents), len(mvc.editor.env.agents_static)"
+ ]
}
],
"metadata": {
"hide_input": false,
"kernelspec": {
- "display_name": "Python 3",
+ "display_name": "ve367",
"language": "python",
- "name": "python3"
+ "name": "ve367"
},
"language_info": {
"codemirror_mode": {
@@ -174,7 +193,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.6.5"
+ "version": "3.6.7"
},
"latex_envs": {
"LaTeX_envs_menu_present": true,
--
GitLab