Implement the five-zone model with plant side; and example testcase

YangyangFu · Dec 10, 2021 · a5f9c76 · a5f9c76
1 parent ade4acf
commit a5f9c76
Show file tree

Hide file tree

Showing 67 changed files with 33,718 additions and 68 deletions.
diff --git a/testcases/gym-environments/five-zones/README.MD b/testcases/gym-environments/five-zones/README.MD
@@ -1,4 +1,6 @@
 # Five Zone Supervisory Control Environment
 This DRL environment is to control the setpoints of a five-zone VAV system from the supervisory level for minimizing energy consumption while maintaining comfortable indoor thermal environment.
 
-  - `v0`: this is a version with discrete supply air temperature action space for connecting with tianshou DRL library
+  - `v0`: this is a version with discrete supply air temperature action space (eleven states) for connecting with tianshou DRL library
+  - `v1`: this is a version with discrete supply air temperature action space (eight states) for connecting with tianshou DRL library
+  - `v2`: this is a version with continuous multi-dimensional action space (supply air temperature, supply CHW temperature, supply CHW dp) for connecting with tianshou DRL library
diff --git a/testcases/gym-environments/five-zones/gym_fivezone_jmodelica/__init__.py b/testcases/gym-environments/five-zones/gym_fivezone_jmodelica/__init__.py
@@ -19,4 +19,10 @@
     id='JModelicaCSFiveZoneEnv-v1',
     entry_point='gym_fivezone_jmodelica.envs.five_zone_env_v1:JModelicaCSFiveZoneEnv',
     kwargs = config
+)
+
+register(
+    id='JModelicaCSFiveZoneEnv-v2',
+    entry_point='gym_fivezone_jmodelica.envs.five_zone_env_v2:JModelicaCSFiveZoneEnv',
+    kwargs = config
 )
diff --git a/testcases/gym-environments/five-zones/gym_fivezone_jmodelica/envs/__init__.py b/testcases/gym-environments/five-zones/gym_fivezone_jmodelica/envs/__init__.py
@@ -3,4 +3,4 @@
 from gym_fivezone_jmodelica.envs import five_zone_env_v1
 
 # continuous action space
-#from gym_fivezone_jmodelica.envs import five_zone_env_v2
+from gym_fivezone_jmodelica.envs import five_zone_env_v2
diff --git a/testcases/gym-environments/five-zones/gym_fivezone_jmodelica/envs/five_zone_env_v0.py b/testcases/gym-environments/five-zones/gym_fivezone_jmodelica/envs/five_zone_env_v0.py
@@ -117,7 +117,7 @@ def step(self, action):
         """ 
 
         action = np.array(action)
-        action = [12+6*action/float(self.nActions-1)]
+        action = [273.15+12+6*action/float(self.nActions-1)]
         return super(FiveZoneEnv,self).step(action)
 
     def _reward_policy(self):

diff --git a/testcases/gym-environments/five-zones/gym_fivezone_jmodelica/envs/five_zone_env_v1.py b/testcases/gym-environments/five-zones/gym_fivezone_jmodelica/envs/five_zone_env_v1.py
@@ -115,7 +115,7 @@ def step(self, action):
         """ 
 
         action = np.array(action)
-        action = [12+6*action/float(self.nActions-1)]
+        action = [273.15+12+6*action/float(self.nActions-1)]
         return super(FiveZoneEnv,self).step(action)
 
     def _reward_policy(self):