gym-examples 2.0.80__py3-none-any.whl → 2.0.81__py3-none-any.whl

gym_examples/__init__.py

@@ -6,4 +6,4 @@ register(
      max_episode_steps=50,
 )
 
-__version__ = "2.0.80"
+__version__ = "2.0.81"

gym_examples/envs/wsn_env.py

@@ -57,7 +57,7 @@ class WSNRoutingEnv(gym.Env):
         self.episode_count = 0
         self.scale_displacement = 0.01 * (upper_bound - lower_bound) # scale of the random displacement of the sensors
         self.epsilon = 1e-10 # small value to avoid division by zero
-        self.rewards_individual = [0] * self.n_sensors
+        # self.rewards_individual = [0] * self.n_sensors
         # Initialize the position of the sensors randomly
         self.sensor_positions = np.random.rand(self.n_sensors, 2) * (upper_bound - lower_bound) + lower_bound
         self.distance_to_base = np.linalg.norm(self.sensor_positions - base_station_position, axis=1)
@@ -75,11 +75,11 @@ class WSNRoutingEnv(gym.Env):
     def reset(self):
         # print individual rewards
         
-        if self.rewards_individual != []:
-            print("\n=================================================")
-            print(f"Episode: {self.episode_count}")
-            print(f"Rewards: {self.rewards_individual}")
-            print("=================================================\n")
+        # if self.rewards_individual != []:
+        #     print("\n=================================================")
+        #     print(f"Episode: {self.episode_count}")
+        #     print(f"Rewards: {self.rewards_individual}")
+        #     print("=================================================\n")
         # Initialize remaining energy of each sensor to initial_energy joule
         self.remaining_energy = np.ones(self.n_sensors) * initial_energy
         self.consumption_energy = np.zeros(self.n_sensors)
@@ -89,7 +89,7 @@ class WSNRoutingEnv(gym.Env):
 
     def step(self, actions):
         rewards = [0] * self.n_sensors
-        self.rewards_individual = [0] * self.n_sensors
+        # self.rewards_individual = [0] * self.n_sensors
         dones = [False] * self.n_sensors
         for i, action in enumerate(actions):
             
@@ -106,6 +106,9 @@ class WSNRoutingEnv(gym.Env):
                 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
+
                 # Calculate the energy consumption and remaining for transmitting data to the base station
                 transmission_energy = self.transmission_energy(self.number_of_packets[i], self.distance_to_base[i])
                 self.update_sensor_energies(i, transmission_energy)
@@ -113,6 +116,9 @@ class WSNRoutingEnv(gym.Env):
                 dones[i] = True       
             else:
                 distance = np.linalg.norm(self.sensor_positions[i] - self.sensor_positions[action])
+                if distance > self.coverage_radius:
+                    continue  # Skip if the distance to the next hop is greater than the coverage radius
+
                 transmission_energy = self.transmission_energy(self.number_of_packets[i], distance)
                 reception_energy = self.reception_energy(self.number_of_packets[i])
                 self.update_sensor_energies(i, transmission_energy)  
@@ -125,7 +131,7 @@ class WSNRoutingEnv(gym.Env):
             # Calculate final reward
             # rewards_individual = torch.tensor(rewards[i], dtype=torch.double)                
             # final_reward = net(rewards_individual)
-            self.rewards_individual[i] = rewards[i]
+            # self.rewards_individual[i] = rewards[i]
             final_reward = np.sum(rewards[i]) 
             rewards[i] = final_reward
 
@@ -133,7 +139,7 @@ class WSNRoutingEnv(gym.Env):
         # rewards = [0.5 * r + 0.5 * (self.network_reward_consumption_energy() + self.network_reward_dispersion_remaining_energy()) for r in rewards]
         
         # Only proceed if network consumption energy is not zero to avoid unnecessary list comprehension
-        self.rewards_individual = [r for r in self.rewards_individual if ((r != 0) and (r[len(r) -1] < 1))]
+        # self.rewards_individual = [r for r in self.rewards_individual if ((r != 0) and (r[len(r) -1] < 1))]
 
         # self.rewards_individual = [{"ind": r, "net_consumption_energy": self.network_reward_consumption_energy(), "net_dispersion_energy": self.network_reward_dispersion_remaining_energy()} for r in self.rewards_individual if ((r != 0) and (self.network_reward_consumption_energy() != 0))]
         for i in range(self.n_sensors):

{gym_examples-2.0.80.dist-info → gym_examples-2.0.81.dist-info}/METADATA

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

@@ -0,0 +1,7 @@
+gym_examples/__init__.py,sha256=bowSmkeNAOZSe_xKiNCfFdMmeF7fyV4gyu5a13H9RZE,193
+gym_examples/envs/__init__.py,sha256=lgMe4pyOuUTgTBUddM0iwMlETsYTwFShny6ifm8PGM8,53
+gym_examples/envs/wsn_env.py,sha256=ePw-tBdSKYUR2G1l5VD0yTMqFSIRerTxBf49kLw5DGg,17066
+gym_examples-2.0.81.dist-info/METADATA,sha256=mp1kGR4uMvgCxdrjfBjt0QPTyJqIKd8T-Fwi7YvgoZ0,411
+gym_examples-2.0.81.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+gym_examples-2.0.81.dist-info/top_level.txt,sha256=rJRksoAF32M6lTLBEwYzRdo4PgtejceaNnnZ3HeY_Rk,13
+gym_examples-2.0.81.dist-info/RECORD,,

gym_examples-2.0.80.dist-info/RECORD

@@ -1,7 +0,0 @@
-gym_examples/__init__.py,sha256=1BNt94Y-ZBFKM09grE3oS4yWNI7qkuapGX3c7aVQxyk,193
-gym_examples/envs/__init__.py,sha256=lgMe4pyOuUTgTBUddM0iwMlETsYTwFShny6ifm8PGM8,53
-gym_examples/envs/wsn_env.py,sha256=SyD3DwXcsuSpLHxZhaVFnL3oe4KbdvQvP-bm8qIquhs,16706
-gym_examples-2.0.80.dist-info/METADATA,sha256=rRA4HZBKdJwffh-LYmwbiRulGQ-Q_8K2Lophc-KjWrE,411
-gym_examples-2.0.80.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-gym_examples-2.0.80.dist-info/top_level.txt,sha256=rJRksoAF32M6lTLBEwYzRdo4PgtejceaNnnZ3HeY_Rk,13
-gym_examples-2.0.80.dist-info/RECORD,,