.

6fc2266b · Egli Adrian (IT-SCI-API-PFI) · c74f225f · 6fc2266b
Commit 6fc2266b authored 5 years ago by Egli Adrian (IT-SCI-API-PFI)
--- a/notebooks/Editor2.ipynb
+++ b/notebooks/Editor2.ipynb
@@ -78,7 +78,7 @@
     "name": "stdout",
     "output_type": "stream",
     "text": [
-      "<flatland.utils.graphics_pil.PILSVG object at 0x000001FFD1ED30B8> <class 'flatland.utils.graphics_pil.PILSVG'>\n",
+      "<flatland.utils.graphics_pil.PILSVG object at 0x000001C03C7A3080> <class 'flatland.utils.graphics_pil.PILSVG'>\n",
      "<super: <class 'PILSVG'>, <PILSVG object>> <class 'super'>\n",
      " 0000000000000000 Background_#91D1DD.svg\n",
      "WE 0000000000000100 Gleis_Deadend.svg\n",
@@ -149,7 +149,7 @@
    {
     "data": {
      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "9112df48349a47eb8f3a790e1565c011",
+       "model_id": "82d6d69b02d14d51b773a3c2257844e6",
       "version_major": 2,
       "version_minor": 0
      },
@@ -159,36 +159,6 @@
     },
     "metadata": {},
     "output_type": "display_data"
-    },
-    {
-     "ename": "TypeError",
-     "evalue": "can not serialize 'numpy.int32' object",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[1;31mTypeError\u001b[0m                                 Traceback (most recent call last)",
-      "\u001b[1;32mc:\\users\\u216993\\appdata\\local\\programs\\python\\python36\\lib\\site-packages\\flatland_rl-0.1.1-py3.6.egg\\flatland\\utils\\editor.py\u001b[0m in \u001b[0;36msave\u001b[1;34m(self, event)\u001b[0m\n\u001b[0;32m    374\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    375\u001b[0m     \u001b[1;32mdef\u001b[0m \u001b[0msave\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mevent\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 376\u001b[1;33m         \u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mmodel\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0msave\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m    377\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    378\u001b[0m     \u001b[1;32mdef\u001b[0m \u001b[0mstep\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mevent\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
-      "\u001b[1;32mc:\\users\\u216993\\appdata\\local\\programs\\python\\python36\\lib\\site-packages\\flatland_rl-0.1.1-py3.6.egg\\flatland\\utils\\editor.py\u001b[0m in \u001b[0;36msave\u001b[1;34m(self)\u001b[0m\n\u001b[0;32m    670\u001b[0m         \u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mlog\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;34m\"save to \"\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0menv_filename\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m\" working dir: \"\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mos\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mgetcwd\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    671\u001b[0m         \u001b[1;31m# self.env.rail.save_transition_map(self.env_filename)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 672\u001b[1;33m         \u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0menv\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0msave\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0menv_filename\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m    673\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    674\u001b[0m     \u001b[1;32mdef\u001b[0m \u001b[0mregenerate\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mmethod\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;32mNone\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mnAgents\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;36m0\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0menv\u001b[0m\u001b[1;33m=\u001b[0m\u001b[1;32mNone\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
-      "\u001b[1;32mc:\\users\\u216993\\appdata\\local\\programs\\python\\python36\\lib\\site-packages\\flatland_rl-0.1.1-py3.6.egg\\flatland\\envs\\rail_env.py\u001b[0m in \u001b[0;36msave\u001b[1;34m(self, filename)\u001b[0m\n\u001b[0;32m    372\u001b[0m     \u001b[1;32mdef\u001b[0m \u001b[0msave\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mfilename\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    373\u001b[0m         \u001b[1;32mwith\u001b[0m \u001b[0mopen\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mfilename\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m\"wb\"\u001b[0m\u001b[1;33m)\u001b[0m \u001b[1;32mas\u001b[0m \u001b[0mfile_out\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 374\u001b[1;33m             \u001b[0mfile_out\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mwrite\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mget_full_state_msg\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m    375\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    376\u001b[0m     \u001b[1;32mdef\u001b[0m \u001b[0mload\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mself\u001b[0m\u001b[1;33m,\u001b[0m \u001b[0mfilename\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m:\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n",
-      "\u001b[1;32mc:\\users\\u216993\\appdata\\local\\programs\\python\\python36\\lib\\site-packages\\flatland_rl-0.1.1-py3.6.egg\\flatland\\envs\\rail_env.py\u001b[0m in \u001b[0;36mget_full_state_msg\u001b[1;34m(self)\u001b[0m\n\u001b[0;32m    343\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    344\u001b[0m         \u001b[0mmsgpack\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mpackb\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mgrid_data\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m--> 345\u001b[1;33m         \u001b[0mmsgpack\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mpackb\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0magent_data\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m    346\u001b[0m         \u001b[0mmsgpack\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mpackb\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0magent_static_data\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m    347\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n",
-      "\u001b[1;32mc:\\users\\u216993\\appdata\\local\\programs\\python\\python36\\lib\\site-packages\\msgpack\\__init__.py\u001b[0m in \u001b[0;36mpackb\u001b[1;34m(o, **kwargs)\u001b[0m\n\u001b[0;32m     44\u001b[0m     \u001b[0mSee\u001b[0m \u001b[1;33m:\u001b[0m\u001b[1;32mclass\u001b[0m\u001b[1;33m:\u001b[0m\u001b[0;31m`\u001b[0m\u001b[0mPacker\u001b[0m\u001b[0;31m`\u001b[0m \u001b[1;32mfor\u001b[0m \u001b[0moptions\u001b[0m\u001b[1;33m.\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m     45\u001b[0m     \"\"\"\n\u001b[1;32m---> 46\u001b[1;33m     \u001b[1;32mreturn\u001b[0m \u001b[0mPacker\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;33m**\u001b[0m\u001b[0mkwargs\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m.\u001b[0m\u001b[0mpack\u001b[0m\u001b[1;33m(\u001b[0m\u001b[0mo\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m\u001b[0;32m     47\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0;32m     48\u001b[0m \u001b[1;33m\u001b[0m\u001b[0m\n",
-      "\u001b[1;32mmsgpack\\_packer.pyx\u001b[0m in \u001b[0;36mmsgpack._cmsgpack.Packer.pack\u001b[1;34m()\u001b[0m\n",
-      "\u001b[1;32mmsgpack\\_packer.pyx\u001b[0m in \u001b[0;36mmsgpack._cmsgpack.Packer.pack\u001b[1;34m()\u001b[0m\n",
-      "\u001b[1;32mmsgpack\\_packer.pyx\u001b[0m in \u001b[0;36mmsgpack._cmsgpack.Packer.pack\u001b[1;34m()\u001b[0m\n",
-      "\u001b[1;32mmsgpack\\_packer.pyx\u001b[0m in \u001b[0;36mmsgpack._cmsgpack.Packer._pack\u001b[1;34m()\u001b[0m\n",
-      "\u001b[1;32mmsgpack\\_packer.pyx\u001b[0m in \u001b[0;36mmsgpack._cmsgpack.Packer._pack\u001b[1;34m()\u001b[0m\n",
-      "\u001b[1;32mmsgpack\\_packer.pyx\u001b[0m in \u001b[0;36mmsgpack._cmsgpack.Packer._pack\u001b[1;34m()\u001b[0m\n",
-      "\u001b[1;32mmsgpack\\_packer.pyx\u001b[0m in \u001b[0;36mmsgpack._cmsgpack.Packer._pack\u001b[1;34m()\u001b[0m\n",
-      "\u001b[1;31mTypeError\u001b[0m: can not serialize 'numpy.int32' object"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "Clear rails\n",
-      "Clear rails\n"
-     ]
    }
   ],
   "source": [
@@ -205,7 +175,7 @@
    {
     "data": {
      "application/vnd.jupyter.widget-view+json": {
-       "model_id": "2e4b58af24e84522a374d8bd7221c273",
+       "model_id": "047cd0c1a66e47ae9fcdbcef6eb6773d",
       "version_major": 2,
       "version_minor": 0
      },

 %% Cell type:markdown id: tags:

 # Rail Editor v0.2

 %% Cell type:code id: tags:

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

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

 %% Output

    cairo installed: OK

 %% Cell type:code id: tags:

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

 %% Output

-    <flatland.utils.graphics_pil.PILSVG object at 0x000001FFD1ED30B8> <class 'flatland.utils.graphics_pil.PILSVG'>
+    <flatland.utils.graphics_pil.PILSVG object at 0x000001C03C7A3080> <class 'flatland.utils.graphics_pil.PILSVG'>
    <super: <class 'PILSVG'>, <PILSVG object>> <class 'super'>
     0000000000000000 Background_#91D1DD.svg
    WE 0000000000000100 Gleis_Deadend.svg
    WW EE NN SS 1000010000100001 Gleis_Diamond_Crossing.svg
    WW EE 0000010000000001 Gleis_horizontal.svg
    EN SW 0000100000010000 Gleis_Kurve_oben_links.svg
    WN SE 0000000001001000 Gleis_Kurve_oben_rechts.svg
    ES NW 0001001000000000 Gleis_Kurve_unten_links.svg
    NE WS 0100000000000010 Gleis_Kurve_unten_rechts.svg
    NN SS 1000000000100000 Gleis_vertikal.svg
    NN SS EE WW ES NW SE WN 1001011001101001 Weiche_Double_Slip.svg
    EE WW EN SW 0000110000010001 Weiche_horizontal_oben_links.svg
    EE WW SE WN 0000010001001001 Weiche_horizontal_oben_rechts.svg
    EE WW ES NW 0001011000000001 Weiche_horizontal_unten_links.svg
    EE WW NE WS 0100010000000011 Weiche_horizontal_unten_rechts.svg
    NN SS EE WW NW ES 1001011000100001 Weiche_Single_Slip.svg
    NE NW ES WS 0101001000000010 Weiche_Symetrical.svg
    NN SS EN SW 1000100000110000 Weiche_vertikal_oben_links.svg
    NN SS SE WN 1000000001101000 Weiche_vertikal_oben_rechts.svg
    NN SS NW ES 1001001000100000 Weiche_vertikal_unten_links.svg
    NN SS NE WS 1100000000100010 Weiche_vertikal_unten_rechts.svg
    EW 0000000100000000 Bahnhof_#d50000_Deadend_links.svg
    NS 0010000000000000 Bahnhof_#d50000_Deadend_oben.svg
    WE 0000000000000100 Bahnhof_#d50000_Deadend_rechts.svg
    SN 0000000010000000 Bahnhof_#d50000_Deadend_unten.svg
    EE WW 0000010000000001 Bahnhof_#d50000_Gleis_horizontal.svg
    NN SS 1000000000100000 Bahnhof_#d50000_Gleis_vertikal.svg
    Clear rails


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


-    ---------------------------------------------------------------------------
-    TypeError                                 Traceback (most recent call last)
-    c:\users\u216993\appdata\local\programs\python\python36\lib\site-packages\flatland_rl-0.1.1-py3.6.egg\flatland\utils\editor.py in save(self, event)
-        374
-        375     def save(self, event):
-    --> 376         self.model.save()
-        377
-        378     def step(self, event):
-    c:\users\u216993\appdata\local\programs\python\python36\lib\site-packages\flatland_rl-0.1.1-py3.6.egg\flatland\utils\editor.py in save(self)
-        670         self.log("save to ", self.env_filename, " working dir: ", os.getcwd())
-        671         # self.env.rail.save_transition_map(self.env_filename)
-    --> 672         self.env.save(self.env_filename)
-        673
-        674     def regenerate(self, method=None, nAgents=0, env=None):
-    c:\users\u216993\appdata\local\programs\python\python36\lib\site-packages\flatland_rl-0.1.1-py3.6.egg\flatland\envs\rail_env.py in save(self, filename)
-        372     def save(self, filename):
-        373         with open(filename, "wb") as file_out:
-    --> 374             file_out.write(self.get_full_state_msg())
-        375
-        376     def load(self, filename):
-    c:\users\u216993\appdata\local\programs\python\python36\lib\site-packages\flatland_rl-0.1.1-py3.6.egg\flatland\envs\rail_env.py in get_full_state_msg(self)
-        343
-        344         msgpack.packb(grid_data)
-    --> 345         msgpack.packb(agent_data)
-        346         msgpack.packb(agent_static_data)
-        347
-    c:\users\u216993\appdata\local\programs\python\python36\lib\site-packages\msgpack\__init__.py in packb(o, **kwargs)
-         44     See :class:`Packer` for options.
-         45     """
-    ---> 46     return Packer(**kwargs).pack(o)
-         47
-         48
-    msgpack\_packer.pyx in msgpack._cmsgpack.Packer.pack()
-    msgpack\_packer.pyx in msgpack._cmsgpack.Packer.pack()
-    msgpack\_packer.pyx in msgpack._cmsgpack.Packer.pack()
-    msgpack\_packer.pyx in msgpack._cmsgpack.Packer._pack()
-    msgpack\_packer.pyx in msgpack._cmsgpack.Packer._pack()
-    msgpack\_packer.pyx in msgpack._cmsgpack.Packer._pack()
-    msgpack\_packer.pyx in msgpack._cmsgpack.Packer._pack()
-    TypeError: can not serialize 'numpy.int32' object
-
-    Clear rails
-    Clear rails
-
 %% 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)