demo.py is no simply working

3ba970a0 · Egli Adrian (IT-SCI-API-PFI) · d1c6a975 · 3ba970a0 · 3ba970a0 · 3ba970a0
Commit 3ba970a0 authored 5 years ago by Egli Adrian (IT-SCI-API-PFI)
--- a/env-data/railway/example_network_000.pkl
+++ b/env-data/railway/example_network_000.pkl
--- a/env-data/railway/example_network_001.pkl
+++ b/env-data/railway/example_network_001.pkl
--- a/env-data/railway/example_network_002.pkl
+++ b/env-data/railway/example_network_002.pkl
--- a/examples/demo.py
+++ b/examples/demo.py
@@ -132,39 +132,16 @@ class Demo:
        handle = self.env.get_agent_handles()
        return handle

-    def run_demo(self, max_nbr_of_steps=100):
+    def run_demo(self, max_nbr_of_steps=30):
        action_dict = dict()
-        time_obs = deque(maxlen=2)
-        action_prob = [0] * 4
-        agent_obs = [None] * self.env.get_num_agents()
-        agent_next_obs = [None] * self.env.get_num_agents()

        # Reset environment
        obs = self.env.reset(False, False)

-        for a in range(self.env.get_num_agents()):
-            data, distance = self.env.obs_builder.split_tree(tree=np.array(obs[a]), num_features_per_node=5, current_depth=0)
-
-            data = norm_obs_clip(data)
-            distance = norm_obs_clip(distance)
-            obs[a] = np.concatenate((data, distance))
-
-        for i in range(2):
-            time_obs.append(obs)
-
-        # env.obs_builder.util_print_obs_subtree(tree=obs[0], num_elements_per_node=5)
-        for a in range(self.env.get_num_agents()):
-            agent_obs[a] = np.concatenate((time_obs[0][a], time_obs[1][a]))
-
        for step in range(max_nbr_of_steps):
-
-            time.sleep(.2)
-
-            # print(step)
            # Action
            for a in range(self.env.get_num_agents()):
-                action = np.random.choice(self.action_size) #self.agent.act(agent_obs[a])
-                action_prob[action] += 1
+                action = 2 #np.random.choice(self.action_size) #self.agent.act(agent_obs[a])
                action_dict.update({a: action})

            print(action_dict)
@@ -173,20 +150,7 @@ class Demo:

            # Environment step
            next_obs, all_rewards, done, _ = self.env.step(action_dict)
-            for a in range(self.env.get_num_agents()):
-                data, distance = self.env.obs_builder.split_tree(tree=np.array(next_obs[a]), num_features_per_node=5,
-                                                                 current_depth=0)
-                data = norm_obs_clip(data)
-                distance = norm_obs_clip(distance)
-                next_obs[a] = np.concatenate((data, distance))
-
-            # Update replay buffer and train agent
-            for a in range(self.env.get_num_agents()):
-                agent_next_obs[a] = np.concatenate((time_obs[0][a], time_obs[1][a]))
-
-            time_obs.append(next_obs)

-            agent_obs = agent_next_obs.copy()
            if done['__all__']:
                break


--- a/notebooks/Editor2.ipynb
+++ b/notebooks/Editor2.ipynb
@@ -9,9 +9,18 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 9,
   "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": 10,
   "metadata": {},
   "outputs": [],
   "source": [
@@ -32,7 +41,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 11,
   "metadata": {},
   "outputs": [
    {
@@ -54,7 +63,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 12,
   "metadata": {},
   "outputs": [],
   "source": [
@@ -63,7 +72,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 13,
   "metadata": {},
   "outputs": [
    {
@@ -97,7 +106,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 14,
   "metadata": {
    "scrolled": false
   },
@@ -105,7 +114,7 @@
    {
     "data": {
      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "7b66ea9348c9477f881ff27456987363",
+       "model_id": "31e3248d9a0e4b5da8f2439abd13558d",
       "version_major": 2,
       "version_minor": 0
      },
@@ -123,7 +132,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 15,
   "metadata": {
    "scrolled": false
   },
@@ -131,7 +140,7 @@
    {
     "data": {
      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "ffa0f869fe8a4921a7415384b75c1ded",
+       "model_id": "c22754b330ce490383eb05972bc96afe",
       "version_major": 2,
       "version_minor": 0
      },
@@ -150,7 +159,7 @@
  },
  {
   "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 16,
   "metadata": {},
   "outputs": [
    {
@@ -159,7 +168,7 @@
       "(0, 0)"
      ]
     },
-     "execution_count": 8,
+     "execution_count": 16,
     "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.

 %% 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)