From c3b672e2956fb066a2b3c1a10868ec12877e0623 Mon Sep 17 00:00:00 2001
From: Erik Nygren <erik.nygren@sbb.ch>
Date: Wed, 5 Jun 2019 11:24:07 +0200
Subject: [PATCH] added testing file

---
 torch_training/railway/complex_scene.pkl      | Bin 0 -> 1802 bytes
 .../railway/example_flatland_000.pkl          | Bin 0 -> 1345 bytes
 .../railway/example_flatland_001.pkl          | Bin 0 -> 2144 bytes
 .../railway/example_network_000.pkl           | Bin 0 -> 180 bytes
 .../railway/example_network_001.pkl           | Bin 0 -> 218 bytes
 .../railway/example_network_002.pkl           | Bin 0 -> 290 bytes
 .../railway/example_network_003.pkl           | Bin 0 -> 556 bytes
 torch_training/training_navigation.py         |  21 +++++++++---------
 8 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 torch_training/railway/complex_scene.pkl
 create mode 100644 torch_training/railway/example_flatland_000.pkl
 create mode 100644 torch_training/railway/example_flatland_001.pkl
 create mode 100644 torch_training/railway/example_network_000.pkl
 create mode 100644 torch_training/railway/example_network_001.pkl
 create mode 100644 torch_training/railway/example_network_002.pkl
 create mode 100644 torch_training/railway/example_network_003.pkl

diff --git a/torch_training/railway/complex_scene.pkl b/torch_training/railway/complex_scene.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..3225c39cd4675572ffca75776b37736ec4de7f31
GIT binary patch
literal 1802
zcmd^9F-`+95VS8>pyU$ZK-AO}DB=Ya6yy~sf+$KuLGA%ad;r-E4?uK0<$jRIVDH-N
zwa<4aAyILPWP80kJ3HRZ+voOW_jC~F2XP~!ue~kWQuhAp$T>O~sM5vVO;UghfF%3T
z35B+=m$Xke3=$$dxs`>lPSYfooOi(zz;U3Q?o}u-NW&?@o*NivX12jG6(E$>%_10%
zU}ga7NCXbd>;DC3#O*#NT7u|aOz2bh(qSKq+M})z5lFde5eHizPaMecq-LcN=wpj^
z>0UHWW_rlw^OI)I4hS~2xVLATHkumB|I4(LIj_6T>ndZjNwp4VN49;$WFj~YHt@la
zJa~?V@h9iuq(N3n$2Ld_l<s3aYWGdaP{Lo2A7}geV_&9E|1gZv#S({gM5V?`!21p~
z*HDV@^>*{z>>u{cy4gK`XjMq5rj=IGtY=HDrlnN#YprHxU6{2pYjvg7+^jRRF6{lW
NR`qhCWbuV???1W~UXK6(

literal 0
HcmV?d00001

diff --git a/torch_training/railway/example_flatland_000.pkl b/torch_training/railway/example_flatland_000.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..64de2138400ee32332402e25f9eac810b5c8bfad
GIT binary patch
literal 1345
zcmbVL%}T^T44&>3tv`sC#gpKo7azle2lpvtab?+y2e%Kf;0wqUym}FDK1$!fhcT06
zl1y7+aVTw?Nxm=nCiD8adRZ?&e%y`2)!k0Ivf$@D8R7w>roh3QAsFEJOkv7-wEJM_
zyz?Ve;<U74%Wmy}QtJi$jMUbia}g8-GZgNMlMGv}Fjl9|b=z5_-Oil5A8QL~DI<o%
z!dSE@g9vmp!7(6h%bVje7y@H#O;<NshF5o_d=*Zpb~L0SVv&I<;9udRK!2?=6HZQT
zM*z&$TFr2g?0uO3cd8_In5>QD(g4KQnFOOpFi-`etZsv`lKC54J#J0?77B4<3v(Xy
z?1rSFw}U>~FR^ovMr;XA!%jU2E6QZkB!P`oLEoSBwX)h2sTcwhH(Y{&tbK>6EROK^
zV)gXgY#uhvqFFz_x8dN>hog%&oLm*5+=u_E4<5c{<%5gg=_Kr3x1lN~!C!t+`r9w^
CM@TUM

literal 0
HcmV?d00001

diff --git a/torch_training/railway/example_flatland_001.pkl b/torch_training/railway/example_flatland_001.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..dcf8b8f51e3ce16c408c8d774bbbc7d29d6c242d
GIT binary patch
literal 2144
zcmZ`(OHLa>5S;-lu>^{Y6=e;az~TffvS3aTp(Fw}EWigqf`yl8%n_pOa)(@CZopyk
zs$W%gRok(wnV#-f@4foWJpa0Rxcl+meSYsQy7Zea52jhK|7AMb^U#J%^zlh0m<`ka
zI8;cFK{TsjUk|4*<^g7~#ts&^CU#;51;-HLJ&|}s9zUX%(hefw;ANL>320E4A~2{M
z?0Zb)Rj~O(NbBB?=qa8?Eu8w}vYVbxS@zT_VCD<y&{ZuXy_D^;3lgzis>a3A;S9DG
zL!-((o!YkFL$B0aAq5G-9Hk2<v#6}q!1of|PNOE>pwpwJ?#=LQnRC2i?xw%z(`MC<
zaALFvW3JA{rY8ni9%qXycT3ylqrb)?9{tquEGyK)IO?pFaYRHz<Dvfc?U?XMo-ZVi
z_}crhMPjZCIM{F@S(Nu7+NY~BvRaW{8+?b$b+f8Y5L$Dx7tKYmm@i`IuC#23@oMdr
z1Ry%3r1!G+Et2ykk>0c8yTo8+(WKr4;hNz%Nu-4Zs4`nM*H91NWV6M$eSX+9O4x9E
zUW^kfDww*9+UZo7vd&Ua2BzH%pDLWboXH;xIC5RCwH9W!7ZauJz|}Js3!hv9gw*6K
zwd2deD<c4_NwSsqfobxows_VksZmnrVEJY?Xeg)5VohXHWftO3+hUDl#`W96{Y;Yh
z`M!s|!BE4C((b6yK+tR|(hv~-=lbU7{rd6S<NA7i_x)`<9`^ls&~L}?1ov(`&OYG&
O5&K8|*nj#>`0GE%mI+t@

literal 0
HcmV?d00001

diff --git a/torch_training/railway/example_network_000.pkl b/torch_training/railway/example_network_000.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..e102e21735416747cb8bd9f231ce6e20fdf514c0
GIT binary patch
literal 180
zcmZo(l3tXVGHVtC91v!*oE2hVIP1W4mW2_7pd3bqSuAH+JV7Enf>0?q7bpq0fG~4y
fVtQ&`NpXB}Nn%N6^2EuLSQr^6v2reh2u}b2c7P-b

literal 0
HcmV?d00001

diff --git a/torch_training/railway/example_network_001.pkl b/torch_training/railway/example_network_001.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..a9c5cc97c9c4bf4159db2134756f17fa0c4fce87
GIT binary patch
literal 218
zcmZo(l3tXVGHVvgSr$eRa$$xtAY33R!~mD%5MTg-vkeNfzzlTGSqG-G9R_eYpgLrw
zXk3r8lhBNTxj_hGI7lx{h{Y4#SsVgu6Vp@kN{Zu)OA<>mlP6A|#K_1viGyJoM0f%K
DzA-u4

literal 0
HcmV?d00001

diff --git a/torch_training/railway/example_network_002.pkl b/torch_training/railway/example_network_002.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..37647ac2871801d2d08fd65276889e2b232c1170
GIT binary patch
literal 290
zcmYk0F%H5o3`HFp2_rFt49qzS14DZXQ~|2GFwh*J5*Mh_Ei+={D7h21lcGjh{(t`V
zf4#eBe~VEk3(F&+8`kNxNm`Y!00<mOHtg&V>0F7F0n0FxoFJa1g*3Xj+O>|M$#8V#
z)<2fFprIte(MdTTQXp1cYL%LlV<0Xa;Pg_HDifl1QWOnus>%Ac-TmQ*%ivqzU&9=B
PSOtJNAVR?HC*$b{C-_&s

literal 0
HcmV?d00001

diff --git a/torch_training/railway/example_network_003.pkl b/torch_training/railway/example_network_003.pkl
new file mode 100644
index 0000000000000000000000000000000000000000..658db6388315948bb1cfeb7dca6891f24cd4961f
GIT binary patch
literal 556
zcmZo(l3tXVGV2b5B+FSAM(jw40S(|)&EkpO6s)E*G62m&GabRjYtN{w5CH{b;S0yL
ziRr0%CB^Z@C5a`O$<roJVqj#P#3(U&5+f^+7N0zc8OUb=@>zg<79gJu$Y%%g*@1j^
J@nsP0699@Rbh`im

literal 0
HcmV?d00001

diff --git a/torch_training/training_navigation.py b/torch_training/training_navigation.py
index c473e52..2a4af22 100644
--- a/torch_training/training_navigation.py
+++ b/torch_training/training_navigation.py
@@ -32,21 +32,20 @@ env = RailEnv(width=20,
               height=20,
               rail_generator=random_rail_generator(cell_type_relative_proportion=transition_probability),
               number_of_agents=1)
-"""
+
 env = RailEnv(width=15,
               height=15,
               rail_generator=complex_rail_generator(nr_start_goal=10, nr_extra=10, min_dist=10, max_dist=99999, seed=0),
               number_of_agents=1)
 
 """
-env = RailEnv(width=20,
-              height=20,
-              rail_generator=rail_from_list_of_saved_GridTransitionMap_generator(
-                      ['../notebooks/temp.npy']),
-              number_of_agents=3)
 
-"""
-env_renderer = RenderTool(env, gl="QT")
+env = RailEnv(width=10,
+              height=20)
+env.load("./railway/complex_scene.pkl")
+env.reset(False, False)
+
+env_renderer = RenderTool(env, gl="PILSVG")
 handle = env.get_agent_handles()
 
 state_size = 105 * 2
@@ -120,7 +119,7 @@ def norm_obs_clip(obs, clip_min=-1, clip_max=1):
 for trials in range(1, n_trials + 1):
 
     # Reset environment
-    obs = env.reset()
+    obs = env.reset(False,False)
 
     final_obs = obs.copy()
     final_obs_next = obs.copy()
@@ -141,9 +140,9 @@ for trials in range(1, n_trials + 1):
     score = 0
     env_done = 0
     # Run episode
-    for step in range(100):
+    for step in range(360):
         if demo:
-            env_renderer.renderEnv(show=True)
+            env_renderer.renderEnv(show=True,show_observations=False)
         # print(step)
         # Action
         for a in range(env.get_num_agents()):
-- 
GitLab