...

13c34d6c · Egli Adrian (IT-SCI-API-PFI) · fd1eafda · 13c34d6c · 13c34d6c · 13c34d6c
Commit 13c34d6c authored 5 years ago by Egli Adrian (IT-SCI-API-PFI)
--- a/env-data/railway/example_flatland_001.pkl
+++ b/env-data/railway/example_flatland_001.pkl
--- a/env-data/railway/example_network_003.pkl
+++ b/env-data/railway/example_network_003.pkl
--- a/examples/demo.py
+++ b/examples/demo.py
 import os
+import time
 import random

 import numpy as np
@@ -137,9 +138,18 @@ class Demo:
        _ = self.env.reset(False, False)

        for step in range(max_nbr_of_steps):
+
+            time.sleep(.1)
+
            # Action
            for iAgent in range(self.env.get_num_agents()):
                action = 2
+
+                if True:
+                    if not ((step) % 2 == 0):
+                        if iAgent % 2 == 1:
+                            action = 0
+
                if False:
                    agent = self.env.agents[iAgent]
                    trial = 0
@@ -150,6 +160,7 @@ class Demo:
                            break
                action_dict.update({iAgent: action})

+
            self.renderer.renderEnv(show=True, action_dict=action_dict)

            # Environment step
@@ -180,7 +191,18 @@ if False:
    demo_002.run_demo()
    demo_002 = None

-demo_flatland_000 = Demo(Scenario_Generator.load_scenario('./env-data/railway/example_flatland_000.pkl'))
+    demo_flatland_000 = Demo(Scenario_Generator.load_scenario('./env-data/railway/example_flatland_000.pkl'))
+    demo_flatland_000.renderer.resize()
+    demo_flatland_000.run_demo(1800)
+    demo_flatland_000 = None
+
+    demo_flatland_000 = Demo(Scenario_Generator.load_scenario('./env-data/railway/example_flatland_001.pkl'))
+    demo_flatland_000.renderer.resize()
+    demo_flatland_000.run_demo(1800)
+    demo_flatland_000 = None
+
+
+demo_flatland_000 = Demo(Scenario_Generator.load_scenario('./env-data/railway/example_network_003.pkl'))
 demo_flatland_000.renderer.resize()
 demo_flatland_000.run_demo(1800)
 demo_flatland_000 = None
--- a/flatland/envs/rail_env.py
+++ b/flatland/envs/rail_env.py
@@ -201,8 +201,8 @@ class RailEnv(Environment):
                continue

            if self.dones[iAgent]:  # this agent has already completed...
-                print("rail_env.py @", currentframe().f_back.f_lineno, " agent ", iAgent,
-                      "has already completed : why action will not be executed!!!!? ADRIAN")
+                # print("rail_env.py @", currentframe().f_back.f_lineno, " agent ", iAgent,
+                #       "has already completed : why action will not be executed!!!!? ADRIAN")
                continue
            action = action_dict[iAgent]


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