Merge branch 'issue83_fivezonemodel' of https://github.com/terrancelu…

…92/mpc-drl-tl into issue83_fivezonemodel

testcases/models/high_fidelity_models/single-zone/SingleZoneVAV.mo

@@ -18,6 +18,7 @@ package SingleZoneVAV
       "Cooling setpoint during on";
     parameter Modelica.SIunits.Temperature TCooOff=303.15
       "Cooling setpoint during off";
+    parameter Real mSenFac = 1 "Thermal mass scalor in the zone";
 
     BaseClasses.Control.ChillerDXHeatingEconomizerController con(
       minAirFlo=0.1,
@@ -41,7 +42,9 @@ package SingleZoneVAV
     BaseClasses.Room  zon(
       redeclare package MediumA = MediumA,
         mAir_flow_nominal=0.75,
-        lat=weaDat.lat) "Thermal envelope of single zone"
+        lat=weaDat.lat,
+      roo(mSenFac=mSenFac))
+                        "Thermal envelope of single zone"
       annotation (Placement(transformation(extent={{40,-20},{80,20}})));
     Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
         computeWetBulbTemperature=false, filNam=
@@ -298,6 +301,7 @@ First implementation.
       "Cooling setpoint during on";
     parameter Modelica.SIunits.Temperature TCooOff=303.15
       "Cooling setpoint during off";
+    parameter Real mSenFac = 1 "Thermal mass scalor in the zone";
 
     BaseClasses.Control.ChillerDXHeatingEconomizerController con(
       minAirFlo=0.1,
@@ -321,7 +325,8 @@ First implementation.
     BaseClasses.Room  zon(
       redeclare package MediumA = MediumA,
         mAir_flow_nominal=0.75,
-        lat=weaDat.lat) "Thermal envelope of single zone"
+        lat=weaDat.lat,
+        roo(mSenFac=mSenFac)) "Thermal envelope of single zone"
       annotation (Placement(transformation(extent={{40,-20},{80,20}})));
     Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
         computeWetBulbTemperature=false, filNam=
@@ -576,6 +581,7 @@ First implementation.
       "Cooling setpoint during on";
     parameter Modelica.SIunits.Temperature TCooOff=303.15
       "Cooling setpoint during off";
+    parameter Real mSenFac = 1 "Thermal mass scalor in the zone";
 
     BaseClasses.Control.ChillerDXHeatingEconomizerController                  con(
       minAirFlo=0.1,
@@ -598,7 +604,8 @@ First implementation.
     BaseClasses.Room  zon(
       redeclare package MediumA = MediumA,
         mAir_flow_nominal=0.75,
-        lat=weaDat.lat) "Thermal envelope of single zone"
+        lat=weaDat.lat,
+        roo(mSenFac=mSenFac)) "Thermal envelope of single zone"
       annotation (Placement(transformation(extent={{40,-20},{80,20}})));
     Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
         computeWetBulbTemperature=false, filNam=
@@ -866,6 +873,7 @@ First implementation.
       "Cooling setpoint during on";
     parameter Modelica.SIunits.Temperature TCooOff=303.15
       "Cooling setpoint during off";
+    parameter Real mSenFac = 4 "Thermal mass scalor in the zone";
 
     BaseClasses.Control.ChillerDXHeatingEconomizerController                  con(
       minAirFlo=0.1,
@@ -889,7 +897,7 @@ First implementation.
       redeclare package MediumA = MediumA,
         mAir_flow_nominal=0.75,
         lat=weaDat.lat,
-      roo(mSenFac=4))   "Thermal envelope of single zone"
+        roo(mSenFac=mSenFac))   "Thermal envelope of single zone"
       annotation (Placement(transformation(extent={{40,-20},{80,20}})));
     Buildings.BoundaryConditions.WeatherData.ReaderTMY3 weaDat(
         computeWetBulbTemperature=false, filNam=
@@ -1145,8 +1153,7 @@ First implementation.
     extends Modelica.Icons.BasesPackage;
     model Room "Room model for test case"
       extends Buildings.Air.Systems.SingleZone.VAV.Examples.BaseClasses.Room(
-        roo(use_C_flow=true,
-          mSenFac=4,         nPorts=6),
+        roo(use_C_flow=true, nPorts=6),
         sinInf(use_C_in=true),
         TRooAir(unit="K"));
       Modelica.Blocks.Math.Gain gaiCO2Gen(k=2)

testcases/models/high_fidelity_models/single-zone/compile_fmu.bat

@@ -7,4 +7,4 @@ docker run^
 	  -v %CD%:/mnt/shared^
 	  -i^
       -t^
-	  mpcdrl /bin/bash -c "cd /mnt/shared && python2 /mnt/shared/compile_fmu.py"
+	  yangyangfu/mpcdrl:cpu_py3 /bin/bash -c "cd /mnt/shared && python2 /mnt/shared/compile_fmu.py"

testcases/mpc/single-zone-fan-power/average-sample/generate_training_data.bat

@@ -7,6 +7,5 @@ docker run --name fmuc^
 	  -v %CD%:/mnt/shared^
 	  -i^
       -t^
-	  mpcdrl /bin/bash -c^
-	  "source activate base && export PYTHONPATH=$PYFMI_PY3_CONDA_PATH:$PYTHONPATH && cd /mnt/shared && python /mnt/shared/generate_training_data.py"
+	  yangyangfu/mpcdrl:cpu_py3 /bin/bash -c "source activate base && export PYTHONPATH=$PYFMI_PY3_CONDA_PATH:$PYTHONPATH && cd /mnt/shared && python /mnt/shared/generate_training_data.py"
 

testcases/mpc/single-zone-fan-power/average-sample/mass_1/zone_ann_accuracy.json

@@ -0,0 +1 @@
+{"test": {"error_mean": -0.18797262123778807, "mse": 0.4348028561307629, "nrmse": 0.032246986700762856, "r2": 0.961475206123683}, "train": {"error_mean": -0.003588103621155987, "mse": 0.23796288904618743, "nrmse": 0.023374465434156635, "r2": 0.9697037667041808}}

testcases/mpc/single-zone-fan-power/average-sample/model.py

@@ -67,7 +67,6 @@ def autocorrection(self,Tz_his_meas, Tz_his_pred):
         correction = np.mean(np.array(Tz_his_meas)-np.array(Tz_his_pred))
 
         return float(correction)     
-
 
     def predict(self,Tz_his_meas, Tz_his_pred, To_his_meas, mz, Tsa):
         """This is to provide a complete prediction with autocorrection term