gym-examples 3.0.766__py3-none-any.whl → 3.0.768__py3-none-any.whl

gym_examples/__init__.py

@@ -5,4 +5,4 @@ register(
      entry_point="gym_examples.envs:WSNRoutingEnv",
 )
 
-__version__ = "3.0.766"
+__version__ = "3.0.768"

gym_examples/envs/wsn_env.py

@@ -150,7 +150,7 @@ class WSNRoutingEnv(gym.Env):
         self.number_of_steps += 1
         self.steps += 1 
         # rewards = [-max_reward] * self.n_sensors
-        reward_init = np.array([0] * input_dim)
+        reward_init = [0] * input_dim
         rewards = [reward_init] * self.n_sensors
         dones = [False] * self.n_sensors
         for i, action in enumerate(actions):
@@ -159,7 +159,7 @@ class WSNRoutingEnv(gym.Env):
             
             if (action == i):
                 continue  # Skip if sensor tries to transmit data to itself
-
+            
             if action == self.n_sensors:
                 if self.distance_to_base[i] > self.coverage_radius:
                     continue  # Skip if the distance to the base station is greater than the coverage radius
@@ -195,16 +195,20 @@ class WSNRoutingEnv(gym.Env):
                     continue  # Skip if the sensor does not have enough energy to transmit data to the next hop
                 
                 self.update_sensor_energies(i, transmission_energy)
+                # Update the metrics
+                self.total_energy_consumed += transmission_energy
+                self.total_packets_sent_by_sensors += self.number_of_packets[i]
 
                 if self.remaining_energy[action] < reception_energy:
                     # self.remaining_energy[action] = 0
+                    self.packet_latency[i] = 0 # Reset the latency of the packet
+                    self.number_of_packets[i] = 0 # Reset the number of packets of the sensor i
                     continue  # Skip if the next hop does not have enough energy to receive data
 
                 self.update_sensor_energies(action, reception_energy) 
 
                 # Update the metrics
-                self.total_energy_consumed += transmission_energy + reception_energy
-                self.total_packets_sent_by_sensors += self.number_of_packets[i]
+                self.total_energy_consumed += reception_energy
                 self.packet_latency[action] += self.packet_latency[i] + latency_per_hop
                 self.packet_latency[i] = 0
 
@@ -488,7 +492,7 @@ class WSNRoutingEnv(gym.Env):
         query_vector = np.array([max_reward] * d) # Basically, the target is the base station
 
         # Similarities between the query vector and the rewards
-        similarities = [np.dot(query_vector, reward) for reward in rewards]
+        similarities = [np.dot(query_vector, reward) for reward in rewards if isinstance(reward, np.ndarray)]
 
         # Similarities scaling
         similarities = [similarity / np.sqrt(d) for similarity in similarities]
@@ -498,7 +502,7 @@ class WSNRoutingEnv(gym.Env):
         attention_weights = [np.exp(similarity) / denominator for similarity in similarities]
 
         # Weighted sum of the rewards
-        final_reward = sum([attention_weight * reward for attention_weight, reward in zip(attention_weights, rewards)])
+        final_reward = sum([attention_weight * reward for attention_weight, reward in zip(attention_weights, rewards) if isinstance(reward, np.ndarray)])
 
         return np.sum(final_reward)
 

{gym_examples-3.0.766.dist-info → gym_examples-3.0.768.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gym-examples
-Version: 3.0.766
+Version: 3.0.768
 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.768.dist-info/RECORD

@@ -0,0 +1,7 @@
+gym_examples/__init__.py,sha256=ErBo6hRVSUgQvxu0zaJqLRmZM9LTYXQ_1HIgV4bg01o,166
+gym_examples/envs/__init__.py,sha256=lgMe4pyOuUTgTBUddM0iwMlETsYTwFShny6ifm8PGM8,53
+gym_examples/envs/wsn_env.py,sha256=baJSRHpxNnasenWc-lGGjeHvXkJQaSLSpr_pSP9SrmQ,26864
+gym_examples-3.0.768.dist-info/METADATA,sha256=U9TYdpAF3BmSEktZwNYaDSjCV3bjKezIUbAMsQBgfGs,412
+gym_examples-3.0.768.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+gym_examples-3.0.768.dist-info/top_level.txt,sha256=rJRksoAF32M6lTLBEwYzRdo4PgtejceaNnnZ3HeY_Rk,13
+gym_examples-3.0.768.dist-info/RECORD,,

gym_examples-3.0.766.dist-info/RECORD

@@ -1,7 +0,0 @@
-gym_examples/__init__.py,sha256=oGBLNhUkMsxNUxrD6aMbIe9qHF4IwLFTzFobdBSE9pM,166
-gym_examples/envs/__init__.py,sha256=lgMe4pyOuUTgTBUddM0iwMlETsYTwFShny6ifm8PGM8,53
-gym_examples/envs/wsn_env.py,sha256=YyPRExlOFIEDI0NLhaAX6LwOmJgGLw5WU8G-pvD8wVc,26532
-gym_examples-3.0.766.dist-info/METADATA,sha256=QMrQjl8_UfOylLp1Aw0TvEtriDzm576Rji5sTS2gtZk,412
-gym_examples-3.0.766.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-gym_examples-3.0.766.dist-info/top_level.txt,sha256=rJRksoAF32M6lTLBEwYzRdo4PgtejceaNnnZ3HeY_Rk,13
-gym_examples-3.0.766.dist-info/RECORD,,