demo

14729f22 · Egli Adrian (IT-SCI-API-PFI) · 13c34d6c · 14729f22 · 14729f22 · 14729f22
Commit 14729f22 authored 5 years ago by Egli Adrian (IT-SCI-API-PFI)
--- a/env-data/railway/example_network_003.pkl
+++ b/env-data/railway/example_network_003.pkl
--- a/examples/demo.py
+++ b/examples/demo.py
@@ -147,9 +147,14 @@ class Demo:

                if True:
                    if not ((step) % 2 == 0):
-                        if iAgent % 2 == 1:
+                        if iAgent == 3:
                            action = 0

+                    if not ((step) % 2 == 0):
+                        if iAgent == 4:
+                            action = 0
+
+
                if False:
                    agent = self.env.agents[iAgent]
                    trial = 0

--- a/notebooks/Editor2.ipynb
+++ b/notebooks/Editor2.ipynb
@@ -9,18 +9,9 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 1,
   "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "The autoreload extension is already loaded. To reload it, use:\n",
-      "  %reload_ext autoreload\n"
-     ]
-    }
-   ],
+   "outputs": [],
   "source": [
    "%load_ext autoreload\n",
    "%autoreload 2"
@@ -28,7 +19,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 2,
   "metadata": {},
   "outputs": [],
   "source": [
@@ -41,7 +32,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 3,
   "metadata": {},
   "outputs": [
    {
@@ -63,7 +54,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 4,
   "metadata": {},
   "outputs": [],
   "source": [
@@ -72,7 +63,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 5,
   "metadata": {},
   "outputs": [
    {
@@ -107,7 +98,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 6,
   "metadata": {
    "scrolled": false
   },
@@ -115,7 +106,7 @@
    {
     "data": {
      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "d412a331f4af4b61a680cc7e79265499",
+       "model_id": "95562eba9d7b4a2794d8d65721413e04",
       "version_major": 2,
       "version_minor": 0
      },
@@ -133,7 +124,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 23,
+   "execution_count": 7,
   "metadata": {
    "scrolled": false
   },
@@ -141,7 +132,7 @@
    {
     "data": {
      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "125052fec212492e96b6114be02fdce0",
+       "model_id": "0fe475488df94151afbfe8dc1e1050e8",
       "version_major": 2,
       "version_minor": 0
      },
@@ -160,7 +151,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": 8,
   "metadata": {},
   "outputs": [
    {
@@ -169,7 +160,7 @@
       "(0, 0)"
      ]
     },
-     "execution_count": 24,
+     "execution_count": 8,
     "metadata": {},
     "output_type": "execute_result"
    }

 %% Cell type:markdown id: tags:

 # Rail Editor v0.2

 %% Cell type:code id: tags:

 ``` python
 %load_ext autoreload
 %autoreload 2
 ```

-%% Output
-
-    The autoreload extension is already loaded. To reload it, use:
-      %reload_ext autoreload
-
 %% Cell type:code id: tags:

 ``` python
 import numpy as np
 from numpy import array
 import ipywidgets
 import IPython
 from IPython.core.display import display, HTML
 ```

 %% Cell type:code id: tags:

 ``` python
 display(HTML("<style>.container { width:95% !important; }</style>"))
 ```

 %% Output


 %% Cell type:code id: tags:

 ``` python
 from flatland.utils.editor import EditorMVC, EditorModel, View, Controller
 ```

 %% Cell type:code id: tags:

 ``` python
 mvc = EditorMVC(sGL="PIL" ) # sGL="PIL")
 ```

 %% Output


 %% Cell type:markdown id: tags:

 ## Instructions
 - Drag to draw (improved dead-ends)
 - Shift-Drag to erase rails (erasing dead ends not yet automated - drag right across them)
 - ctrl-click to add agent
  - direction chosen randomly to fit rail
 - ctrl-shift-click to add target for last agent
  - target can be moved by repeating
 - to Resize the env (cannot preserve work):
  - select "Regen" tab, set regen size slider, click regenerate.
 - alt-click remove all rails from cell

 %% Cell type:code id: tags:

 ``` python
 mvc.view.display()
 ```

 %% Output


 %% Cell type:code id: tags:

 ``` python
 mvc.view.wOutput.clear_output()
 mvc.view.wOutput
 ```

 %% Output


 %% Cell type:code id: tags:

 ``` python
 len(mvc.editor.env.agents), len(mvc.editor.env.agents_static)
 ```

 %% Output

    (0, 0)