Notebook is working (Flatland3)

a6701ab3 · adrian_egli2 · f74f3463 · a6701ab3
Commit a6701ab3 authored 2 years ago by adrian_egli2
--- a/notebooks/Simple_Rendering_Demo.ipynb
+++ b/notebooks/Simple_Rendering_Demo.ipynb
@@ -48,7 +48,8 @@
    "import flatland.core.env\n",
    "import flatland.utils.rendertools as rt\n",
    "from flatland.envs.rail_env import RailEnv\n",
-    "from flatland.envs.rail_generators import random_rail_generator\n",
+    "from flatland.envs.rail_generators import sparse_rail_generator\n",
+    "from flatland.envs.line_generators import sparse_line_generator\n",
    "from flatland.envs.observations import TreeObsForRailEnv\n",
    "from flatland.envs.predictions import ShortestPathPredictorForRailEnv"
   ]
@@ -77,13 +78,26 @@
   "outputs": [],
   "source": [
    "nAgents = 3\n",
-    "fnMethod = random_rail_generator(cell_type_relative_proportion=[1] * 11)\n",
-    "env = RailEnv(width=20,\n",
-    "                  height=10,\n",
-    "                  rail_generator=fnMethod,\n",
-    "                  number_of_agents=nAgents,\n",
-    "                  obs_builder_object=TreeObsForRailEnv(max_depth=3, predictor=ShortestPathPredictorForRailEnv()))\n",
-    "env.reset()"
+    "n_cities = 2\n",
+    "max_rails_between_cities = 2\n",
+    "max_rails_in_city = 4\n",
+    "seed = 0\n",
+    "env = RailEnv(\n",
+    "        width=20,\n",
+    "        height=30,\n",
+    "        rail_generator=sparse_rail_generator(\n",
+    "            max_num_cities=n_cities,\n",
+    "            seed=seed,\n",
+    "            grid_mode=True,\n",
+    "            max_rails_between_cities=max_rails_between_cities,\n",
+    "            max_rail_pairs_in_city=max_rails_in_city\n",
+    "        ),\n",
+    "        line_generator=sparse_line_generator(),\n",
+    "        number_of_agents=nAgents,\n",
+    "        obs_builder_object=TreeObsForRailEnv(max_depth=3, predictor=ShortestPathPredictorForRailEnv())\n",
+    "    )\n",
+    "\n",
+    "init_observation = env.reset()"
   ]
  },
  {

 %% Cell type:markdown id: tags:

 # Plot the Env and some trees

 %% Cell type:code id: tags:

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

 %% Cell type:code id: tags:

 ``` python
 import jpy_canvas
 import random
 import time
 import sys
 ```

 %% Cell type:code id: tags:

 ``` python
 # in case you need to tweak your PYTHONPATH...
 sys.path.append("../flatland")
 ```

 %% Cell type:code id: tags:

 ``` python
 import flatland.core.env
 import flatland.utils.rendertools as rt
 from flatland.envs.rail_env import RailEnv
-from flatland.envs.rail_generators import random_rail_generator
+from flatland.envs.rail_generators import sparse_rail_generator
+from flatland.envs.line_generators import sparse_line_generator
 from flatland.envs.observations import TreeObsForRailEnv
 from flatland.envs.predictions import ShortestPathPredictorForRailEnv
 ```

 %% Cell type:code id: tags:

 ``` python
 from IPython.core.display import display, HTML
 display(HTML("<style>.container { width:90% !important; }</style>"))
 ```

 %% Cell type:markdown id: tags:

 # Generate

 %% Cell type:code id: tags:

 ``` python
 nAgents = 3
-fnMethod = random_rail_generator(cell_type_relative_proportion=[1] * 11)
-env = RailEnv(width=20,
-                  height=10,
-                  rail_generator=fnMethod,
-                  number_of_agents=nAgents,
-                  obs_builder_object=TreeObsForRailEnv(max_depth=3, predictor=ShortestPathPredictorForRailEnv()))
-env.reset()
+n_cities = 2
+max_rails_between_cities = 2
+max_rails_in_city = 4
+seed = 0
+env = RailEnv(
+        width=20,
+        height=30,
+        rail_generator=sparse_rail_generator(
+            max_num_cities=n_cities,
+            seed=seed,
+            grid_mode=True,
+            max_rails_between_cities=max_rails_between_cities,
+            max_rail_pairs_in_city=max_rails_in_city
+        ),
+        line_generator=sparse_line_generator(),
+        number_of_agents=nAgents,
+        obs_builder_object=TreeObsForRailEnv(max_depth=3, predictor=ShortestPathPredictorForRailEnv())
+    )
+
+init_observation = env.reset()
 ```

 %% Cell type:markdown id: tags:

 # Render

 %% Cell type:code id: tags:

 ``` python
 oRT = rt.RenderTool(env,gl="PILSVG")
 oRT.render_env(show_observations=False,show_predictions=True)
 img = oRT.get_image()
 ```

 %% Cell type:code id: tags:

 ``` python
 jpy_canvas.Canvas(img)
 ```

 %% Cell type:code id: tags:

 ``` python
 oRT = rt.RenderTool(env,gl="PIL")
 oRT.render_env(show_observations=False,show_predictions=True)
 img = oRT.get_image()
 ```

 %% Cell type:code id: tags:

 ``` python
 jpy_canvas.Canvas(img)
 ```