code optimization and bug fixes

Author: max-schenke

.gitignore

@@ -11,6 +11,7 @@ __pycache__
 
 # setuptools
 *egg-info*
+dist/
 
 # miscellaneous
 ddpg_DcSeries-Cont-v0_weights_actor\.h5f

README.md

@@ -15,8 +15,9 @@ learning algorithms to train agents controlling electric motors.
 
 [Read the detailed docs!](https://upb-lea.github.io/gym-electric-motor/)
 
-So far, several DC-motor models and the three-phase motors permanent magnet synchronous motor (PMSM)
-and synchronous reluctance motor (SynRM) are available.
+So far, several DC-motor models and the three-phase motors permanent magnet synchronous motor (PMSM), 
+synchronous reluctance motor (SynRM), squirrel cage induction motor (SCIM) and doubly-fed induction 
+motor (DFIM) are available.
 Beside electrical motors, also converters and load models are implemented. The converters can be driven by means of a duty cycle (continuous mode) or 
 switching commands (discrete mode). 
 The figure shows the basic scheme of the converter, motor and load. 

dist/gym_electric_motor-0.1.0-py3-none-any.whl

@@ -25,7 +25,7 @@ def __init__(self, motor='DFIM', reward_function=None, reference_generator=None,
 class DiscDoublyFedInductionMotorEnvironment(DoublyFedInductionMotorEnvironment):
     """
     Description:
-        Environment to simulate a discretely controlled Squirrel-Cage Induction Motor (SCIM).
+        Environment to simulate a discretely controlled Doubly-Fed Induction Motor (SCIM).
 
     Key:
         `DFIMDisc-v1`
@@ -93,7 +93,7 @@ def __init__(self, tau=1e-5, converter='Disc-Multi', subconverters=('Disc-B6C',
 class ContDoublyFedInductionMotorEnvironment(DoublyFedInductionMotorEnvironment):
     """
     Description:
-        Environment to simulate a continuously controlled Squirrel-Cage Induction Motor (SCIM).
+        Environment to simulate a continuously controlled Doubly-Fed Induction Motor (SCIM).
 
     Key:
         `DFIMCont-v1`

dist/gym_electric_motor-0.1.0.tar.gz

@@ -25,7 +25,7 @@ def __init__(self, motor='SCIM', reward_function=None, reference_generator=None,
 class DiscSquirrelCageInductionMotorEnvironment(SquirrelCageInductionMotorEnvironment):
     """
     Description:
-        Environment to simulate a discretely controlled Squirrel-Cage Induction Motor (SCIM).
+        Environment to simulate a discretely controlled Squirrel Cage Induction Motor (SCIM).
 
     Key:
         `SCIMDisc-v1`
@@ -92,7 +92,7 @@ def __init__(self, tau=1e-5, converter='Disc-B6C', **kwargs):
 class ContSquirrelCageInductionMotorEnvironment(SquirrelCageInductionMotorEnvironment):
     """
     Description:
-        Environment to simulate a continuously controlled Squirrel-Cage Induction Motor (SCIM).
+        Environment to simulate a continuously controlled Squirrel Cage Induction Motor (SCIM).
 
     Key:
         `SCIMCont-v1`

gym_electric_motor/envs/gym_im/doubly_fed_induc_motor_env.py

@@ -481,17 +481,40 @@ def __init__(self, subconverters, **kwargs):
         super().__init__(**kwargs)
         self._subconverters = [instantiate(PowerElectronicConverter, subconverter, **kwargs) for subconverter in subconverters]
 
-        self.subsignal_current_space_dims = np.array([(np.squeeze(subconverter.currents.shape) or 1) for subconverter in self._subconverters])
-        self.subsignal_voltage_space_dims = np.array([(np.squeeze(subconverter.voltages.shape) or 1) for subconverter in self._subconverters])
+        self.subsignal_current_space_dims = []
+        self.subsignal_voltage_space_dims = []
+        self.action_space = []
+        currents_low = []
+        currents_high = []
+        voltages_low = []
+        voltages_high = []
+
+        # get the limits and space dims from each subconverter
+        for subconverter in self._subconverters:
+            self.subsignal_current_space_dims.append(np.squeeze(subconverter.currents.shape) or 1)
+            self.subsignal_voltage_space_dims.append(np.squeeze(subconverter.voltages.shape) or 1)
 
-        self.action_space = MultiDiscrete([subconverter.action_space.n for subconverter in self._subconverters])
+            self.action_space.append(subconverter.action_space.n)
 
-        currents_low = np.concatenate([subconverter.currents.low for subconverter in self._subconverters])
-        currents_high = np.concatenate([subconverter.currents.high for subconverter in self._subconverters])
-        self.currents = Box(currents_low, currents_high)
+            currents_low.append(subconverter.currents.low)
+            currents_high.append(subconverter.currents.high)
+
+            voltages_low.append(subconverter.voltages.low)
+            voltages_high.append(subconverter.voltages.high)
+
+        # convert to 1D list
+        self.subsignal_current_space_dims = np.array(self.subsignal_current_space_dims)
+        self.subsignal_voltage_space_dims = np.array(self.subsignal_voltage_space_dims)
+
+        currents_low = np.concatenate(currents_low)
+        currents_high = np.concatenate(currents_high)
 
-        voltages_low = np.concatenate([subconverter.voltages.low for subconverter in self._subconverters])
-        voltages_high = np.concatenate([subconverter.voltages.high for subconverter in self._subconverters])
+        voltages_low = np.concatenate(voltages_low)
+        voltages_high = np.concatenate(voltages_high)
+
+        # put limits into gym_space format
+        self.action_space = MultiDiscrete(self.action_space)
+        self.currents = Box(currents_low, currents_high)
         self.voltages = Box(voltages_low, voltages_high)
 
     def convert(self, i_out, t):
@@ -558,19 +581,45 @@ def __init__(self, subconverters, **kwargs):
         super().__init__(**kwargs)
         self._subconverters = [instantiate(PowerElectronicConverter, subconverter, **kwargs) for subconverter in subconverters]
 
-        self.subsignal_current_space_dims = np.array([(np.squeeze(subconverter.currents.shape) or 1) for subconverter in self._subconverters])
-        self.subsignal_voltage_space_dims = np.array([(np.squeeze(subconverter.voltages.shape) or 1) for subconverter in self._subconverters])
+        self.subsignal_current_space_dims = []
+        self.subsignal_voltage_space_dims = []
+        action_space_low = []
+        action_space_high = []
+        currents_low = []
+        currents_high = []
+        voltages_low = []
+        voltages_high = []
 
-        action_space_low = np.concatenate([subconverter.action_space.low for subconverter in self._subconverters])
-        action_space_high = np.concatenate([subconverter.action_space.high for subconverter in self._subconverters])
-        self.action_space = Box(action_space_low, action_space_high)
+        # get the limits and space dims from each subconverter
+        for subconverter in self._subconverters:
+            self.subsignal_current_space_dims.append(np.squeeze(subconverter.currents.shape) or 1)
+            self.subsignal_voltage_space_dims.append(np.squeeze(subconverter.voltages.shape) or 1)
 
-        currents_low = np.concatenate([subconverter.currents.low for subconverter in self._subconverters])
-        currents_high = np.concatenate([subconverter.currents.high for subconverter in self._subconverters])
-        self.currents = Box(currents_low, currents_high)
+            action_space_low.append(subconverter.action_space.low)
+            action_space_high.append(subconverter.action_space.high)
+
+            currents_low.append(subconverter.currents.low)
+            currents_high.append(subconverter.currents.high)
+
+            voltages_low.append(subconverter.voltages.low)
+            voltages_high.append(subconverter.voltages.high)
+
+        # convert to 1D list
+        self.subsignal_current_space_dims = np.array(self.subsignal_current_space_dims)
+        self.subsignal_voltage_space_dims = np.array(self.subsignal_voltage_space_dims)
+
+        action_space_low = np.concatenate(action_space_low)
+        action_space_high = np.concatenate(action_space_high)
 
-        voltages_low = np.concatenate([subconverter.voltages.low for subconverter in self._subconverters])
-        voltages_high = np.concatenate([subconverter.voltages.high for subconverter in self._subconverters])
+        currents_low = np.concatenate(currents_low)
+        currents_high = np.concatenate(currents_high)
+
+        voltages_low = np.concatenate(voltages_low)
+        voltages_high = np.concatenate(voltages_high)
+
+        # put limits into gym_space format
+        self.action_space = Box(action_space_low, action_space_high)
+        self.currents = Box(currents_low, currents_high)
         self.voltages = Box(voltages_low, voltages_high)
 
     def set_action(self, action, t):