gym-examples 3.0.132__py3-none-any.whl → 3.0.134__py3-none-any.whl

gym_examples/__init__.py

@@ -6,4 +6,4 @@ register(
      max_episode_steps=50,
 )
 
-__version__ = "3.0.132"
+__version__ = "3.0.134"

gym_examples/envs/wsn_env.py

@@ -59,10 +59,19 @@ class WSNRoutingEnv(gym.Env):
         # Initialize the position of the sensors randomly
 
         # Define observation space
-        self.observation_space = Tuple(
-            tuple([self._get_observation_space() for _ in range(self.n_sensors)])
-        )
-        self.action_space = Tuple(tuple([Discrete(self.n_sensors + 1)] * self.n_agents))
+        # self.observation_space = Tuple(
+        #     tuple([self._get_observation_space() for _ in range(self.n_sensors)])
+        # )
+
+        self.observation_space = gym.spaces.Dict({
+            'remaining_energy': gym.spaces.Box(low=0, high=initial_energy, shape=(len(self.remaining_energy),), dtype=np.float32),
+            'consumption_energy': gym.spaces.Box(low=0, high=initial_energy, shape=(len(self.remaining_energy),), dtype=np.float32),
+            'sensor_positions': gym.spaces.Box(low=lower_bound, high=upper_bound, shape=(len(self.sensor_positions), 2), dtype=np.float32),
+            'number_of_packets': gym.spaces.Box(low=0, high=self.n_sensors * initial_number_of_packets + 1, shape=(len(self.number_of_packets),), dtype=int)
+        })
+
+        # self.action_space = Tuple(tuple([Discrete(self.n_sensors + 1)] * self.n_agents))
+        self.action_space = gym.spaces.MultiDiscrete([self.n_sensors + 1] * self.n_agents)
 
         self.reset()        
 
@@ -179,32 +188,31 @@ class WSNRoutingEnv(gym.Env):
     #              'number_of_packets': np.array([d])
     #             } for e, p, d in zip(self.remaining_energy, self.sensor_positions, self.number_of_packets)]
 
-    def _get_obs(self):
-        validate_vec = [elt for elt in zip(self.remaining_energy, self.sensor_positions, self.number_of_packets)]
-        print("\n==============================")
-        print(f"validate_vec: {validate_vec}")
-        print("==============================\n")
-        remaining_energy = np.array([e for e, _, _, _ in zip(self.remaining_energy, self.sensor_positions, self.number_of_packets)])
-        consumption_energy = np.array([initial_energy - e for e, _, _, _ in zip(self.remaining_energy, self.sensor_positions, self.number_of_packets)])
-        sensor_positions = np.stack(self.sensor_positions, axis=0)
-        number_of_packets = np.array([d for _, _, _, d in zip(self.remaining_energy, self.sensor_positions, self.number_of_packets)])
+    # def _get_observation_space(self):
+    #     return Dict({
+    #         'remaining_energy': Box(low=0, high=initial_energy, shape=(1,), dtype=np.float64),
+    #         'consumption_energy': Box(low=0, high=initial_energy, shape=(1,), dtype=np.float64),
+    #         'sensor_positions': Box(low=lower_bound, high=upper_bound, shape=(2,), dtype=np.float64),
+    #         'number_of_packets': Box(low=0, high=self.n_sensors * initial_number_of_packets + 1, shape=(1,), dtype=int)
+    #     })
 
+    def _get_obs(self):
         return {
-            'remaining_energy': remaining_energy,
-            'consumption_energy': consumption_energy,
-            'sensor_positions': sensor_positions,
-            'number_of_packets': number_of_packets
+            'remaining_energy': np.array(self.remaining_energy),
+            'consumption_energy': np.array([initial_energy - e for e in self.remaining_energy]),
+            'sensor_positions': np.stack(self.sensor_positions, axis=0),
+            'number_of_packets': np.array(self.number_of_packets)
         }
 
-
     def _get_observation_space(self):
-        return Dict({
-            'remaining_energy': Box(low=0, high=initial_energy, shape=(1,), dtype=np.float64),
-            'consumption_energy': Box(low=0, high=initial_energy, shape=(1,), dtype=np.float64),
-            'sensor_positions': Box(low=lower_bound, high=upper_bound, shape=(2,), dtype=np.float64),
-            'number_of_packets': Box(low=0, high=self.n_sensors * initial_number_of_packets + 1, shape=(1,), dtype=int)
+        return gym.spaces.Dict({
+            'remaining_energy': gym.spaces.Box(low=0, high=initial_energy, shape=(len(self.remaining_energy),), dtype=np.float32),
+            'consumption_energy': gym.spaces.Box(low=0, high=initial_energy, shape=(len(self.remaining_energy),), dtype=np.float32),
+            'sensor_positions': gym.spaces.Box(low=lower_bound, high=upper_bound, shape=(len(self.sensor_positions), 2), dtype=np.float32),
+            'number_of_packets': gym.spaces.Box(low=0, high=self.n_sensors * initial_number_of_packets + 1, shape=(len(self.number_of_packets),), dtype=int)
         })
 
+
     def get_state(self):
         return self._get_obs()
     

{gym_examples-3.0.132.dist-info → gym_examples-3.0.134.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gym-examples
-Version: 3.0.132
+Version: 3.0.134
 Summary: A custom environment for multi-agent reinforcement learning focused on WSN routing.
 Home-page: https://github.com/gedji/CODES.git
 Author: Georges Djimefo

gym_examples-3.0.134.dist-info/RECORD

@@ -0,0 +1,7 @@
+gym_examples/__init__.py,sha256=NDW_AoYQPwLsSSYhRWfejgVCkMyXx98eNpLQEYLe4-8,194
+gym_examples/envs/__init__.py,sha256=lgMe4pyOuUTgTBUddM0iwMlETsYTwFShny6ifm8PGM8,53
+gym_examples/envs/wsn_env.py,sha256=dwIYGkIGyeuhF2jmq4WoOGcgzN2ytfAqrU-WPIIxoOI,23289
+gym_examples-3.0.134.dist-info/METADATA,sha256=ZBMLM_U-MRZze2R6hKGKYG9kcoO5sdoYd2a15ytT-68,412
+gym_examples-3.0.134.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+gym_examples-3.0.134.dist-info/top_level.txt,sha256=rJRksoAF32M6lTLBEwYzRdo4PgtejceaNnnZ3HeY_Rk,13
+gym_examples-3.0.134.dist-info/RECORD,,

gym_examples-3.0.132.dist-info/RECORD

@@ -1,7 +0,0 @@
-gym_examples/__init__.py,sha256=dU8-YolQl-paevg9jiwQvDHFef9CiXOcJwH8ta5MNc8,194
-gym_examples/envs/__init__.py,sha256=lgMe4pyOuUTgTBUddM0iwMlETsYTwFShny6ifm8PGM8,53
-gym_examples/envs/wsn_env.py,sha256=5W5u9zooiRStpvilzRYpm1OhLsN2kB9f7n7tNRaKog0,22551
-gym_examples-3.0.132.dist-info/METADATA,sha256=xwTGNgMRovwGjacZqazoL43Sq9H2o8YIIKTKjvDqlRU,412
-gym_examples-3.0.132.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-gym_examples-3.0.132.dist-info/top_level.txt,sha256=rJRksoAF32M6lTLBEwYzRdo4PgtejceaNnnZ3HeY_Rk,13
-gym_examples-3.0.132.dist-info/RECORD,,