parabellum 0.2.17__py3-none-any.whl → 0.2.19__py3-none-any.whl

parabellum/env.py

@@ -33,7 +33,7 @@ class Scenario:
 # default scenario
 scenarios = {
     "default": Scenario(
-        jnp.eye(128, dtype=jnp.uint8),
+        jnp.eye(64, dtype=jnp.uint8),
         jnp.array([[80, 0], [16, 12]]),
         jnp.array([[0, 80], [0, 20]]),
         jnp.zeros((19,), dtype=jnp.uint8),

parabellum/vis.py

@@ -1,4 +1,6 @@
-"""Visualizer for the Parabellum environment"""
+"""
+Visualizer for the Parabellum environment
+"""
 
 from tqdm import tqdm
 import jax.numpy as jnp
@@ -37,7 +39,7 @@ class Visualizer(SMAXVisualizer):
         # remove fig and ax from super
         self.fig, self.ax = None, None
         self.bg = (0, 0, 0) if darkdetect.isDark() else (255, 255, 255)
-        self.fg = (235, 235, 235) if darkdetect.isDark() else (20, 20, 20)
+        self.fg = (255, 255, 255) if darkdetect.isDark() else (0, 0, 0)
         self.s = 1000
         self.scale = self.s / self.env.map_width
         self.action_seq = [action for _, _, action in state_seq]  # bcs SMAX bug
@@ -57,7 +59,7 @@ class Visualizer(SMAXVisualizer):
                     state_seq, action_seq, save_fname.replace(".mp4", f"_{i}.mp4")
                 )
         else:
-            state_seq = env.expand_state_seq(self.state_seq)
+            state_seq = self.env.expand_state_seq(self.state_seq)
             self.animate_one(state_seq, self.action_seq, save_fname)
 
     def animate_one(self, state_seq, action_seq, save_fname):
@@ -65,6 +67,8 @@ class Visualizer(SMAXVisualizer):
         pygame.init()  # initialize pygame
         terrain = np.array(self.env.terrain_raster)
         rgb_array = np.zeros((terrain.shape[0], terrain.shape[1], 3), dtype=np.uint8)
+        if darkdetect.isLight():
+            rgb_array += 255
         rgb_array[terrain == 1] = self.fg
         mask_surface = pygame.surfarray.make_surface(rgb_array)
         mask_surface = pygame.transform.scale(mask_surface, (self.s, self.s))
@@ -91,7 +95,7 @@ class Visualizer(SMAXVisualizer):
         # save the images
         clip = ImageSequenceClip(frames, fps=48)
         clip.write_videofile(save_fname, fps=48)
-        # clip.write_gif(save_fname.replace(".mp4", ".gif"), fps=24)
+        clip.write_gif(save_fname.replace(".mp4", ".gif"), fps=24)
         pygame.quit()
 
         return clip
@@ -124,6 +128,9 @@ class Visualizer(SMAXVisualizer):
             # work out which agents are being shot
 
     def render_action(self, screen, action):
+        if self.env.action_type != "discrete":
+            return
+
         def coord_fn(idx, n, team):
             return (
                 self.s / 20 if team == 0 else self.s - self.s / 20,
@@ -238,7 +245,7 @@ if __name__ == "__main__":
     # exit()
 
     n_envs = 2
-    env = Parabellum(scenarios["default"])
+    env = Parabellum(scenarios["default"], action_type="discrete")
     rng, reset_rng = random.split(random.PRNGKey(0))
     reset_key = random.split(reset_rng, n_envs)
     obs, state = vmap(env.reset)(reset_key)
@@ -248,7 +255,7 @@ if __name__ == "__main__":
         rng, act_rng, step_rng = random.split(rng, 3)
         act_key = random.split(act_rng, (len(env.agents), n_envs))
         act = {
-            a: jnp.ones_like(vmap(env.action_space(a).sample)(act_key[i]))
+            a: vmap(env.action_space(a).sample)(act_key[i])
             for i, a in enumerate(env.agents)
         }
         step_key = random.split(step_rng, n_envs)

{parabellum-0.2.17.dist-info → parabellum-0.2.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: parabellum
-Version: 0.2.17
+Version: 0.2.19
 Summary: Parabellum environment for parallel warfare simulation
 Home-page: https://github.com/syrkis/parabellum
 License: MIT

parabellum-0.2.19.dist-info/RECORD

@@ -0,0 +1,8 @@
+parabellum/__init__.py,sha256=TjZVlHZdi7CEm0gjagm3j6epPZxjR6C9G3CYtX7d-2o,142
+parabellum/env.py,sha256=Z8zpdCaEi5HFwN0Vd2hukOarkPSg0EKZErTRts3JQ5E,16023
+parabellum/map.py,sha256=SQeNl1kkGsnnqYoo-60zJNv36fD-8VSKasiS1_WARao,410
+parabellum/run.py,sha256=0IWpqcQ_qfFeElbupF5vOs_CByFfpXYuGGUHYuurFM4,3412
+parabellum/vis.py,sha256=JFVTnBg-LV4jZNw6cysU6NS8ZxeMpg5wz3JOi-lrnzY,10699
+parabellum-0.2.19.dist-info/METADATA,sha256=DsEBAlESj8BwGSphmPPylStoXH_g_x_Iy3WJ3KEwjc0,3223
+parabellum-0.2.19.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+parabellum-0.2.19.dist-info/RECORD,,

parabellum-0.2.17.dist-info/RECORD

@@ -1,8 +0,0 @@
-parabellum/__init__.py,sha256=TjZVlHZdi7CEm0gjagm3j6epPZxjR6C9G3CYtX7d-2o,142
-parabellum/env.py,sha256=d6agGy-kTRIg_r0QKCL_7iztzwhaTfsb4yhtUQfdgx0,16024
-parabellum/map.py,sha256=SQeNl1kkGsnnqYoo-60zJNv36fD-8VSKasiS1_WARao,410
-parabellum/run.py,sha256=0IWpqcQ_qfFeElbupF5vOs_CByFfpXYuGGUHYuurFM4,3412
-parabellum/vis.py,sha256=oNRucG1pX1PKqrY-UVhRzx0PdFl9svH8cq5uDb4MCno,10559
-parabellum-0.2.17.dist-info/METADATA,sha256=ZFIfGi5TwUVucprOu2jSyfrjfwxQBazUr1DqRJauw4s,3223
-parabellum-0.2.17.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-parabellum-0.2.17.dist-info/RECORD,,