add a print and rework if elif else condition

Author: cservant

device.py

@@ -114,13 +114,14 @@ def set_command_up(self):
             self.image = pygame.image.load(self.img_co_up).convert_alpha()
         else :
             self.image = pygame.image.load(self.img_disco).convert_alpha()
-        if not self.emitted_power + POWER_CONTROL_STEP > UE_MAX_EMITTED_POWER:
-            self.emitted_power += POWER_CONTROL_STEP
-        elif (self.emitted_power < UE_MAX_EMITTED_POWER and
-                self.emitted_power + POWER_CONTROL_STEP > UE_MAX_EMITTED_POWER):
-            self.emitted_power = UE_MAX_EMITTED_POWER
+        if self.emitted_power < UE_MAX_EMITTED_POWER:
+            if not self.emitted_power + POWER_CONTROL_STEP > UE_MAX_EMITTED_POWER:
+                self.emitted_power += POWER_CONTROL_STEP
+            else:
+                self.emitted_power = UE_MAX_EMITTED_POWER
         else:
             self.set_device_disconnected()
+            print "Device disconnected : can't command up"
 
     def set_command_down(self):
         """Set the command of the device to COMMAND_DOWN.

simulator.py

@@ -317,16 +317,13 @@ def open_loop(self):
                         print "UE target (dBm) : ", device.target
                         print ""
                     else:
-                        if device.emitted_power < UE_MAX_EMITTED_POWER:
-                            device.emitted_power += POWER_CONTROL_STEP
-                            device.set_command_up()
-                        else:
-                            device.set_device_disconnected()
+                        device.set_command_up()
                     j += 1
                 i += 1
             device.open_looped = True
             if device.status != CONNECTED:
                 device.set_device_disconnected()
+                print "Device disconnected : end of open loop"
 
     def outer_loop(self):
         """Implementation of the outer loop.