gym-examples 2.0.23__py3-none-any.whl → 2.0.24__py3-none-any.whl

gym_examples/__init__.py

@@ -6,4 +6,4 @@ register(
      max_episode_steps=50,
 )
 
-__version__ = "2.0.23"
+__version__ = "2.0.24"

gym_examples/envs/wsn_env.py

@@ -10,7 +10,7 @@ import torch.nn as nn
 import torch.nn.functional as F
 
 # Define the network parameters for the final reward function
-input_dim = 4  # number of individual rewards
+input_dim = 5  # number of individual rewards
 output_dim = 1  # final reward
 
 
@@ -116,9 +116,9 @@ class WSNRoutingEnv(gym.Env):
                 rewards[i] = self.compute_individual_rewards(i, action, neighbors_i, remaining_energy_before)
             self.number_of_packets[i] = 0 # Reset the number of packets of the sensor i
             # Calculate final reward
-            rewards_individual = torch.tensor(rewards[i], dtype=torch.double)                
-            final_reward = net(rewards_individual)
-            # final_reward = sum(rewards[i])
+            # rewards_individual = torch.tensor(rewards[i], dtype=torch.double)                
+            # final_reward = net(rewards_individual)
+            final_reward = sum(rewards[i])
             rewards[i] = final_reward
 
         for i in range(self.n_sensors):
@@ -247,6 +247,18 @@ class WSNRoutingEnv(gym.Env):
 
             return 1 - normalized_dispersion_remaining_energy
     
+    def compute_reward_number_of_packets(self, i, action, neighbors_i):
+        '''
+        Compute the reward based on the number of packets to transmit
+        '''
+        if len(neighbors_i) == 1:
+            return 1
+        else:
+            total_number_of_packets = np.sum([self.number_of_packets[x] for x in neighbors_i])
+            normalized_number_of_packets = self.number_of_packets[action] / total_number_of_packets
+
+            return 1 - normalized_number_of_packets
+
     def compute_individual_rewards(self, i, action, neighbors_i, remaining_energy_before):
         '''
         Compute the individual rewards
@@ -255,8 +267,9 @@ class WSNRoutingEnv(gym.Env):
         reward_distance = self.compute_reward_distance(action, neighbors_i)
         reward_consumption_energy = self.compute_reward_consumption_energy(action, neighbors_i)
         reward_dispersion_remaining_energy = self.compute_reward_dispersion_remaining_energy(i, action, neighbors_i, remaining_energy_before)
+        reward_number_of_packets = self.compute_reward_number_of_packets(i, action, neighbors_i)
 
-        return [reward_angle, reward_distance, reward_consumption_energy, reward_dispersion_remaining_energy]
+        return [reward_angle, reward_distance, reward_consumption_energy, reward_dispersion_remaining_energy, reward_number_of_packets]
     
     def integrate_mobility(self):
         '''

{gym_examples-2.0.23.dist-info → gym_examples-2.0.24.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+gym_examples/__init__.py,sha256=cfrZU0rlt-uBEIIfos7Z0TRaI2NgwTZmM5YVG4ojpTE,193
+gym_examples/envs/__init__.py,sha256=lgMe4pyOuUTgTBUddM0iwMlETsYTwFShny6ifm8PGM8,53
+gym_examples/envs/wsn_env.py,sha256=HXDG3mR-GXlkwlPAf8xOvzbAk-Gj_sf5nFpsG-z7SEs,15757
+gym_examples-2.0.24.dist-info/METADATA,sha256=p7X6WjQuMnFSqIr0oO4U_Iexvi3pRG_15678VqCXPl8,411
+gym_examples-2.0.24.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+gym_examples-2.0.24.dist-info/top_level.txt,sha256=rJRksoAF32M6lTLBEwYzRdo4PgtejceaNnnZ3HeY_Rk,13
+gym_examples-2.0.24.dist-info/RECORD,,

gym_examples-2.0.23.dist-info/RECORD

@@ -1,7 +0,0 @@
-gym_examples/__init__.py,sha256=jx0XO8I1avcMbJsh7BVmAGpYzIAkkRP0DDTR3aQxyRE,193
-gym_examples/envs/__init__.py,sha256=lgMe4pyOuUTgTBUddM0iwMlETsYTwFShny6ifm8PGM8,53
-gym_examples/envs/wsn_env.py,sha256=RuLxE06OdmbSmc0m5fnCqQUY1KCbJi7w8JeDJ3Hr-Zc,15135
-gym_examples-2.0.23.dist-info/METADATA,sha256=zCJTDwK0zUTvFR__gP98UNDycf84DOpTERdX6ykDJSg,411
-gym_examples-2.0.23.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-gym_examples-2.0.23.dist-info/top_level.txt,sha256=rJRksoAF32M6lTLBEwYzRdo4PgtejceaNnnZ3HeY_Rk,13
-gym_examples-2.0.23.dist-info/RECORD,,