(v3.8.2) - Initial context for environment fix (#481)

* Fix initial context applied only in first episode

* Update Sinergym version from 3.8.1 to 3.8.2

* Fix test error

Author: AlejandroCN7

pyproject.toml

@@ -6,7 +6,7 @@
 package-mode = true
 name = "sinergym"
 
-version = "3.8.1"
+version = "3.8.2"
 description = "Sinergym provides a Gymnasium-based interface to interact with building simulations. This allows control in simulation time through custom controllers, including reinforcement learning agents"
 license = "MIT"
 

sinergym/envs/eplus_env.py

@@ -110,7 +110,6 @@ def __init__(
         self.meters = meters
         self.actuators = actuators
         self.context = context
-        self.initial_context = initial_context
 
         # ---------------------------------------------------------------------------- #
         #                    Define observation and action variables                   #
@@ -156,10 +155,6 @@ def __init__(
         #                                   Simulator                                  #
         # ---------------------------------------------------------------------------- #
 
-        # Set initial context if exists
-        if self.initial_context is not None:
-            self.update_context(self.initial_context)
-
         # EnergyPlus simulator
         self.energyplus_simulator = EnergyPlus(
             name=env_name,
@@ -181,6 +176,8 @@ def __init__(
         # Weather Variability
         if weather_variability:
             self.default_options['weather_variability'] = weather_variability
+        if initial_context:
+            self.default_options['initial_context'] = initial_context
         # ... more reset option implementations here
 
         # ---------------------------------------------------------------------------- #
@@ -240,16 +237,16 @@ def reset(self,
         """
 
         # If global seed was configured, reset seed will not be applied.
-        if self.seed is None:
+        if not self.seed:
             np.random.seed(seed)
 
         # Apply options if exists, else default options
-        reset_options = options if options is not None else self.default_options
+        reset_options = options if options else self.default_options
 
         self.episode += 1
         self.timestep = 0
 
-        # Stop oold thread of old episode if exists
+        # Stop old thread of old episode if exists
         self.energyplus_simulator.stop()
 
         self.last_obs = dict(
@@ -280,6 +277,10 @@ def reset(self,
             f'Saving episode output path in {eplus_working_out_path}.')
         self.logger.debug(f'Path: {eplus_working_out_path}')
 
+        # Set initial context if exists
+        if reset_options.get('initial_context'):
+            self.update_context(reset_options['initial_context'])
+
         self.energyplus_simulator.start(
             building_path=eplus_working_building_path,
             weather_path=eplus_working_weather_path,
@@ -432,7 +433,7 @@ def update_context(self,
         if len(context_values) != len(self.context):
             self.logger.warning(
                 f'Context values must have the same length than context variables specified, and values must be in the same order. The context space is {
-                    self.context}, but values {context_values} were spevified.')
+                    self.context}, but values {context_values} were specified.')
 
         try:
             self.context_queue.put(context_values, block=False)

sinergym/utils/wrappers.py

@@ -2036,8 +2036,9 @@ def __init__(self,
         self.delta_context = (-delta_value, delta_value)
         self.step_frequency_range = step_frequency_range
 
-        initial_context = self.get_wrapper_attr('initial_context')
-        if initial_context is not None:
+        initial_context = self.get_wrapper_attr(
+            'default_options').get('initial_context')
+        if initial_context:
             self.current_context = np.array(
                 initial_context, np.float32)
         else:

sinergym/version.txt

@@ -1 +1 @@
-3.8.1
+3.8.2