OpenSimula 0.3.0__tar.gz → 0.3.2__tar.gz

{opensimula-0.3.0 → opensimula-0.3.2/OpenSimula.egg-info}/PKG-INFO

@@ -1,42 +1,41 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: OpenSimula
-Version: 0.3.0
+Version: 0.3.2
 Summary: Component-based time simulation environment in Python
+Author-email: "Juan F. Coronel" <jfc@us.es>
 Project-URL: Homepage, http://opensimula.org
 Project-URL: Repository, https://github.com/jfCoronel/OpenSimula
 Project-URL: Bug Tracker, https://github.com/jfCoronel/OpenSimula/issues
-Author-email: "Juan F. Coronel" <jfc@us.es>
-License-File: LICENSE
+Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.8
-Requires-Dist: dash-ag-grid>=31.0.0
-Requires-Dist: dash-bootstrap-components>=1.0.0
-Requires-Dist: dash>=2.0.0
-Requires-Dist: ipywidgets>=8.1.2
+Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: numpy>1.25
 Requires-Dist: pandas>1.5
-Requires-Dist: plotly>=5.17.0
-Requires-Dist: psychrolib>=2.5.0
-Requires-Dist: py-expression-eval>=0.3.14
-Requires-Dist: pyvista>=0.43.5
 Requires-Dist: scipy>=1.1
 Requires-Dist: shapely>=2.0.3
+Requires-Dist: psychrolib>=2.5.0
+Requires-Dist: pyvista>=0.43.5
+Requires-Dist: ipywidgets>=8.1.2
+Requires-Dist: trame>=3.6.0
 Requires-Dist: trame-vtk>=2.8.5
 Requires-Dist: trame-vuetify>=2.4.3
-Requires-Dist: trame>=3.6.0
+Requires-Dist: plotly>=5.17.0
 Requires-Dist: triangle>=20230923
-Provides-Extra: docs
-Requires-Dist: mkdocs>=1.5; extra == 'docs'
+Requires-Dist: dash>=2.0.0
+Requires-Dist: dash-bootstrap-components>=1.0.0
+Requires-Dist: dash-ag-grid>=31.0.0
 Provides-Extra: testing
-Requires-Dist: pytest; extra == 'testing'
-Description-Content-Type: text/markdown
+Requires-Dist: pytest; extra == "testing"
+Provides-Extra: docs
+Requires-Dist: mkdocs>=1.5; extra == "docs"
 
-![Logo](docs/img/logo_opensimula.png)
+![Logo](https://app.opensimula.org/img/logo_opensimula.png)
 Component-based time simulation environment in Python
 
-[Documentation page](https://jfcoronel.github.io/OpenSimula/site/)
+[Documentation page](https://app.opensimula.org/)
 
 ## Main Developers
 
@@ -46,7 +45,6 @@ Component-based time simulation environment in Python
 - numpy
 - pandas
 - scipy
-- py-expression-eval
 - shapely
 - psychrolib
 - plotly

opensimula-0.3.2/OpenSimula.egg-info/SOURCES.txt

@@ -0,0 +1,56 @@
+LICENSE
+README.md
+pyproject.toml
+OpenSimula.egg-info/PKG-INFO
+OpenSimula.egg-info/SOURCES.txt
+OpenSimula.egg-info/dependency_links.txt
+OpenSimula.egg-info/requires.txt
+OpenSimula.egg-info/top_level.txt
+docs/cinder/__init__.py
+mkdocs/cinder/__init__.py
+src/OpenSimula/Child.py
+src/OpenSimula/Component.py
+src/OpenSimula/Parameter_container.py
+src/OpenSimula/Parameters.py
+src/OpenSimula/Project.py
+src/OpenSimula/Simulation.py
+src/OpenSimula/Variable.py
+src/OpenSimula/__init__.py
+src/OpenSimula/components/Building.py
+src/OpenSimula/components/Calculator.py
+src/OpenSimula/components/Construction.py
+src/OpenSimula/components/Day_schedule.py
+src/OpenSimula/components/Exterior_surface.py
+src/OpenSimula/components/File_data.py
+src/OpenSimula/components/File_met.py
+src/OpenSimula/components/Frame.py
+src/OpenSimula/components/Glazing.py
+src/OpenSimula/components/HVAC_DX_equipment.py
+src/OpenSimula/components/HVAC_DX_system.py
+src/OpenSimula/components/HVAC_perfect_system.py
+src/OpenSimula/components/Interior_surface.py
+src/OpenSimula/components/Material.py
+src/OpenSimula/components/Opening.py
+src/OpenSimula/components/Opening_type.py
+src/OpenSimula/components/Real_surface.py
+src/OpenSimula/components/Shadow_surface.py
+src/OpenSimula/components/Space.py
+src/OpenSimula/components/Space_type.py
+src/OpenSimula/components/Surface.py
+src/OpenSimula/components/Test_component.py
+src/OpenSimula/components/Underground_surface.py
+src/OpenSimula/components/Virtual_surface.py
+src/OpenSimula/components/Week_schedule.py
+src/OpenSimula/components/Year_schedule.py
+src/OpenSimula/components/__init__.py
+src/OpenSimula/components/utils/sun_shadows.py
+test/test_Calculator.py
+test/test_Case_600FF.py
+test/test_Case_610.py
+test/test_Construction.py
+test/test_File_data.py
+test/test_File_met.py
+test/test_HVAC_DX_Equipment.py
+test/test_HVAC_DX_system.py
+test/test_Project.py
+test/test_Schedules.py

opensimula-0.3.2/OpenSimula.egg-info/dependency_links.txt

@@ -0,0 +1 @@
+

opensimula-0.3.2/OpenSimula.egg-info/requires.txt

@@ -0,0 +1,21 @@
+numpy>1.25
+pandas>1.5
+scipy>=1.1
+shapely>=2.0.3
+psychrolib>=2.5.0
+pyvista>=0.43.5
+ipywidgets>=8.1.2
+trame>=3.6.0
+trame-vtk>=2.8.5
+trame-vuetify>=2.4.3
+plotly>=5.17.0
+triangle>=20230923
+dash>=2.0.0
+dash-bootstrap-components>=1.0.0
+dash-ag-grid>=31.0.0
+
+[docs]
+mkdocs>=1.5
+
+[testing]
+pytest

opensimula-0.3.2/OpenSimula.egg-info/top_level.txt

@@ -0,0 +1,3 @@
+docs
+mkdocs
+src

opensimula-0.3.2/PKG-INFO

@@ -0,0 +1,59 @@
+Metadata-Version: 2.2
+Name: OpenSimula
+Version: 0.3.2
+Summary: Component-based time simulation environment in Python
+Author-email: "Juan F. Coronel" <jfc@us.es>
+Project-URL: Homepage, http://opensimula.org
+Project-URL: Repository, https://github.com/jfCoronel/OpenSimula
+Project-URL: Bug Tracker, https://github.com/jfCoronel/OpenSimula/issues
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: numpy>1.25
+Requires-Dist: pandas>1.5
+Requires-Dist: scipy>=1.1
+Requires-Dist: shapely>=2.0.3
+Requires-Dist: psychrolib>=2.5.0
+Requires-Dist: pyvista>=0.43.5
+Requires-Dist: ipywidgets>=8.1.2
+Requires-Dist: trame>=3.6.0
+Requires-Dist: trame-vtk>=2.8.5
+Requires-Dist: trame-vuetify>=2.4.3
+Requires-Dist: plotly>=5.17.0
+Requires-Dist: triangle>=20230923
+Requires-Dist: dash>=2.0.0
+Requires-Dist: dash-bootstrap-components>=1.0.0
+Requires-Dist: dash-ag-grid>=31.0.0
+Provides-Extra: testing
+Requires-Dist: pytest; extra == "testing"
+Provides-Extra: docs
+Requires-Dist: mkdocs>=1.5; extra == "docs"
+
+![Logo](https://app.opensimula.org/img/logo_opensimula.png)
+Component-based time simulation environment in Python
+
+[Documentation page](https://app.opensimula.org/)
+
+## Main Developers
+
+* [Juan F. Coronel](http://jfc.us.es), Universidad de Sevilla
+
+## Package dependencies
+- numpy
+- pandas
+- scipy
+- shapely
+- psychrolib
+- plotly
+- dash
+- dash_bootstrap_components
+- dash_ag_grid
+- pyvista
+- trame
+- trame-vtk
+- trame-vuetify
+- ipywidgets
+

{opensimula-0.3.0 → opensimula-0.3.2}/README.md

@@ -1,7 +1,7 @@
-![Logo](docs/img/logo_opensimula.png)
+![Logo](https://app.opensimula.org/img/logo_opensimula.png)
 Component-based time simulation environment in Python
 
-[Documentation page](https://jfcoronel.github.io/OpenSimula/site/)
+[Documentation page](https://app.opensimula.org/)
 
 ## Main Developers
 
@@ -11,7 +11,6 @@ Component-based time simulation environment in Python
 - numpy
 - pandas
 - scipy
-- py-expression-eval
 - shapely
 - psychrolib
 - plotly

{opensimula-0.3.0 → opensimula-0.3.2}/pyproject.toml

@@ -1,11 +1,10 @@
 [build-system]
 # Minimum requirements for the build system to execute.
-requires = ["hatchling"]
-build-backend = "hatchling.build"
+requires = ["setuptools>=61.2", "wheel"]
 
 [project]
 name = "OpenSimula"
-version = "0.3.0"
+version = "0.3.2"
 authors = [
   { name="Juan F. Coronel", email="jfc@us.es" },
 ]
@@ -21,7 +20,6 @@ dependencies = [
   "numpy>1.25",
   "pandas>1.5",
   "scipy>=1.1",
-  "py-expression-eval>=0.3.14",
   "shapely>=2.0.3",
   "psychrolib>=2.5.0",
   "pyvista>=0.43.5",
@@ -49,3 +47,8 @@ docs = [
 "Repository" = "https://github.com/jfCoronel/OpenSimula"
 "Bug Tracker" = "https://github.com/jfCoronel/OpenSimula/issues"
 
+
+[tool.setuptools]
+packages.find.include = ['src*','mkdocs*','docs*']
+packages.find.exclude = ['test*','ipynb*','ASHRAE_140*','mets*','venv*']
+include-package-data = false

opensimula-0.3.2/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{opensimula-0.3.0 → opensimula-0.3.2}/src/OpenSimula/Component.py

@@ -28,7 +28,7 @@ class Component(Parameter_container):
         self._variables_[variable.key] = variable
 
     def del_variable(self, variable):
-        self._variables_.remove(variable)
+        self._variables_.pop(variable.key,None)
 
     def variable(self, key):
         return self._variables_[key]
@@ -164,7 +164,7 @@ class Component(Parameter_container):
                         self.variable(
                             value.symbol[i]).values[time_index] = value.variable[i].values[time_index]
 
-    def iteration(self, time_index, date, daylight_saving):
+    def iteration(self, time_index, date, daylight_saving, n_iter):
         return True
 
     def post_iteration(self, time_index, date, daylight_saving, converged):

{opensimula-0.3.0 → opensimula-0.3.2}/src/OpenSimula/Parameters.py

@@ -1,5 +1,6 @@
 import sys
-from py_expression_eval import Parser
+#from py_expression_eval import Parser
+import math
 from OpenSimula.Child import Child
 
 # ___________________ Parameter _________________________
@@ -271,7 +272,7 @@ class Parameter_int_list(Parameter):
 
 
 class Parameter_float(Parameter_int):
-    def __init__(self, key, value=0.0, unit="", min=0.0, max=float("inf")):
+    def __init__(self, key, value=0.0, unit="", min=float("-inf"), max=float("inf")):
         Parameter_int.__init__(self, key, float(
             value), unit, float(min), float(max))
 
@@ -297,7 +298,7 @@ class Parameter_float(Parameter_int):
 
 
 class Parameter_float_list(Parameter_int_list):
-    def __init__(self, key, value=[0.0], unit="", min=0.0, max=float("inf")):
+    def __init__(self, key, value=[0.0], unit="", min=float("-inf"), max=float("inf")):
         Parameter_int_list.__init__(
             self, key, value, unit, float(min), float(max))
 
@@ -689,7 +690,7 @@ class Parameter_math_exp(Parameter):
     def __init__(self, key, value="0.0", unit=""):
         Parameter.__init__(self, key, value)
         self._unit_ = unit
-        self._parser_ = Parser()
+        #self._parser_ = Parser()
 
     @property
     def unit(self):
@@ -703,22 +704,27 @@ class Parameter_math_exp(Parameter):
     def value(self, value):
         self._value_ = str(value)
 
-    def check(self):
-        try:
-            self._parser_.parse(self.value)
-        except Exception as error:
-            return [self._get_error_header_()+f"{str(error)}"]
-        return []
+#    def check(self):
+#        try:
+#            self._parser_.parse(self.value)
+#        except Exception as error:
+#            return [self._get_error_header_()+f"{str(error)}"]
+#        return []
 
     def evaluate(self, values_dic):
-        return self._parser_.parse(self.value).evaluate(values_dic)
+        try:
+            val = eval(self.value,globals(),values_dic)
+            return val
+        except Exception as error:
+            self._sim_.print(self._get_error_header_()+str(error))
+            return 0
 
 
 class Parameter_math_exp_list(Parameter):
     def __init__(self, key, value=["0.0"], unit=""):
         Parameter.__init__(self, key, value)
         self._unit_ = unit
-        self._parser_ = Parser()
+        #self._parser_ = Parser()
 
     @property
     def unit(self):
@@ -741,14 +747,19 @@ class Parameter_math_exp_list(Parameter):
             el = str(el)
         self._value_ = value
 
-    def check(self):
-        errors = []
-        for n in self.value:
-            try:
-                self._parser_.parse(n)
-            except Exception as error:
-                errors.append(self._get_error_header_()+f"{str(error)}")
-        return errors
+#    def check(self):
+#        errors = []
+#        for n in self.value:
+#            try:
+#                self._parser_.parse(n)
+#            except Exception as error:
+#                errors.append(self._get_error_header_()+f"{str(error)}")
+#        return errors
 
     def evaluate(self, i, values_dic):
-        return self._parser_.parse(self.value[i]).evaluate(values_dic)
+        try:
+            val = eval(self.value[i],globals(),values_dic)
+            return val
+        except Exception as error:
+            self._sim_.print(self._get_error_header_()+str(error))
+            return 0

{opensimula-0.3.0 → opensimula-0.3.2}/src/OpenSimula/Project.py

@@ -127,7 +127,7 @@ class Project(Parameter_container):
                     else:
                         msg = self._get_error_header_(
                         ) + f'Component does not contain "type" parameter {component}'
-                        self._sim_print(msg)
+                        self._sim_.print(msg)
             else:
                 if key in self._parameters_:
                     self.parameter(key).value = value
@@ -341,7 +341,7 @@ class Project(Parameter_container):
 
         return errors
 
-    def simulate(self):
+    def simulate(self, show_percentage = 10):
         """Project Time Simulation"""
         n = self.parameter("n_time_steps").value
         date = dt.datetime.strptime(
@@ -361,16 +361,15 @@ class Project(Parameter_container):
         self._sim_df["n_iterations"] = 0
         self._sim_df["last_component"] = "None"
 
-        self._sim_.print(
-            f"Simulating {self.parameter('name').value}: ", add_new_line=False
-        )
+        self._sim_.print(f"Simulating {self.parameter('name').value}: ...")
 
-        show_percent = 10.0
+        show_percent = show_percentage
+        n_iter_acum = 0
         for i in range(n):
             if ((100.0*(i+1) / n) >= show_percent):
-                self._sim_.print(str(int(show_percent)) +
-                                 "% ", add_new_line=False)
-                show_percent = show_percent + 10.0
+                self._sim_.print(f"{int(show_percent)}%: N_iter: {(n_iter_acum/(n*show_percentage/100)):.2f}")
+                show_percent = show_percent + show_percentage
+                n_iter_acum = 0
             daylight_saving = False
             if (self.parameter("daylight_saving").value):
                 if (date > date_dls_start and date < date_dls_end):
@@ -380,14 +379,15 @@ class Project(Parameter_container):
             converge = False
             n_iter = 0
             while (not converge and n_iter < self.parameter("n_max_iteration").value):
-                n_iter += 1
-                if self._iteration_(i, date, daylight_saving):
+                if self._iteration_(i, date, daylight_saving,n_iter):
                     converge = True
+                n_iter += 1
             self._sim_df.at[i, "n_iterations"] = n_iter
+            n_iter_acum += n_iter
             self._post_iteration_(i, date, daylight_saving, converge)
             date = date + dt.timedelta(0, delta_t)
 
-        self._sim_.print(" End")
+        self._sim_.print("Simulation completed.")
         self._post_simulation_()
 
     def _pre_simulation_(self, n_time_steps, delta_t):
@@ -402,10 +402,10 @@ class Project(Parameter_container):
         for comp in self._ordered_component_list_:
             comp.pre_iteration(time_index, date, dayligth_saving)
 
-    def _iteration_(self, time_index, date, dayligth_saving):
+    def _iteration_(self, time_index, date, dayligth_saving, n_iter):
         converge = True
         for comp in self._ordered_component_list_:
-            if not comp.iteration(time_index, date, dayligth_saving):
+            if not comp.iteration(time_index, date, dayligth_saving, n_iter):
                 self._sim_df.at[time_index, "last_component"] = comp.parameter("name").value
                 converge = False
         return converge

{opensimula-0.3.0 → opensimula-0.3.2}/src/OpenSimula/__init__.py

@@ -4,4 +4,4 @@ OpenSimula is a Python Package for perform time simulations
 
 """
 from OpenSimula.Simulation import Simulation
-VERSION = "0.3.0"
+VERSION = "0.3.2"

{opensimula-0.3.0 → opensimula-0.3.2}/src/OpenSimula/components/Building.py

@@ -594,16 +594,9 @@ class Building(Component):
             self.KZS_matrix, np.matmul(self.KS_inv_matrix, self.FS_vector)
         )
 
-    def iteration(self, time_index, date, daylight_saving):
-        super().iteration(time_index, date, daylight_saving)
-        # if self._first_iteration:  # Only in the 1st iteration
-        #     #self._calculate_Q_dir(time_index)
-        #     self._calculate_FS_vector(time_index)
-        #     self._calculate_FIN_WS_matrices(time_index)
-        #     self._update_space_K_F(time_index)
-        #     self._first_iteration = False
-        #     return False # Force iteration
-        # else:
+    def iteration(self, time_index, date, daylight_saving, n_iter):
+        super().iteration(time_index, date, daylight_saving, n_iter)
+      
         self._update_space_K_F(time_index)
         self._store_surfaces_values(time_index)
         return True

{opensimula-0.3.0 → opensimula-0.3.2}/src/OpenSimula/components/Exterior_surface.py

@@ -105,26 +105,6 @@ class Exterior_surface(Real_surface):
         T_rm = self.variable("T_rm").values[time_index]
         self.f_0 = self.area * (- p_0 - self.parameter("h_cv").value[0] * self._T_ext - h_rd * T_rm - q_sol)
 
-    def iteration(self, time_index, date, daylight_saving):
-        super().iteration(time_index, date, daylight_saving)
-        # Calculate shadows only once
-        # if not self._shadow_calculated:
-        #     direct_sunny_fracion = self.building().get_direct_sunny_fraction(self)
-        #     E_dir = self.variable(
-        #         "E_dir_sunny").values[time_index] * direct_sunny_fracion
-        #     self.variable("E_dir").values[time_index] = E_dir
-        #     self.variable(
-        #         "q_sol0").values[time_index] += self.radiant_property("alpha", "solar_diffuse", 0) * E_dir
-        #     q_sol = self.variable("q_sol0").values[time_index]
-        #     p_0 = self.variable("p_0").values[time_index]
-        #     h_rd = self.H_RD * self.radiant_property("alpha", "long_wave", 0)
-        #     T_rm = self.variable("T_rm").values[time_index]
-        #     self.f_0 = self.area * \
-        #         (- p_0 - self.parameter("h_cv").value[0]
-        #          * self._T_ext - h_rd * T_rm - q_sol)
-        #     self._shadow_calculated = True
-        return True
-
     def post_iteration(self, time_index, date, daylight_saving, converged):
         super().post_iteration(time_index, date, daylight_saving, converged)
         self._calculate_T_s0(time_index)

{opensimula-0.3.0 → opensimula-0.3.2}/src/OpenSimula/components/File_met.py

@@ -155,6 +155,7 @@ class File_met(Component):
             self.temperature = data["DryBulb"].to_numpy()/10
             self.sol_diffuse = data["DHI"].to_numpy()
             self.sol_direct = data["GHI"].to_numpy() - self.sol_diffuse
+            self.sol_direct[self.sol_direct < 0] = 0 # Eliminate negative values if exist
             self.rel_humidity = data["RHum"].to_numpy()
 
             self.wind_speed = data["Wspd"].to_numpy()/10

{opensimula-0.3.0 → opensimula-0.3.2}/src/OpenSimula/components/Glazing.py

@@ -20,8 +20,8 @@ class Glazing(Component):
         self.add_parameter(Parameter_float(
             "U", 5.686, "W/m²K", min=0))
         self.add_parameter(Parameter_math_exp(
-            "f_tau_nor", "1.3186 * cos_theta^3 - 3.5251 * cos_theta^2 + 3.2065 * cos_theta", "frac"))
-        f_rho = "1.8562 * cos_theta^3 - 4.4739 * cos_theta^2 + 3.6177 * cos_theta"
+            "f_tau_nor", "1.3186 * cos_theta**3 - 3.5251 * cos_theta**2 + 3.2065 * cos_theta", "frac"))
+        f_rho = "1.8562 * cos_theta**3 - 4.4739 * cos_theta**2 + 3.6177 * cos_theta"
         self.add_parameter(Parameter_math_exp_list(
             "f_1_minus_rho_nor", [f_rho, f_rho], "frac"))
 

{opensimula-0.3.0 → opensimula-0.3.2}/src/OpenSimula/components/HVAC_DX_equipment.py

@@ -12,6 +12,7 @@ class HVAC_DX_equipment(Component):
         self.add_parameter(Parameter_float("nominal_sensible_cooling_capacity", 0, "W", min=0))
         self.add_parameter(Parameter_float("nominal_cooling_power", 0, "W", min=0))
         self.add_parameter(Parameter_float("no_load_power", 0, "W", min=0))
+        self.add_parameter(Parameter_float("no_load_heat", 0, "W", min=0))
         self.add_parameter(Parameter_float_list("nominal_cooling_conditions", [27, 19, 35], "ºC"))
         self.add_parameter(Parameter_math_exp("total_cooling_capacity_expression", "1", "frac"))
         self.add_parameter(Parameter_math_exp("sensible_cooling_capacity_expression", "1", "frac"))
@@ -25,6 +26,8 @@ class HVAC_DX_equipment(Component):
         self.add_parameter(Parameter_math_exp("COP_expression", "1", "frac"))
         self.add_parameter(Parameter_options("dry_coil_model", "SENSIBLE", ["TOTAL", "SENSIBLE"]))
         self.add_parameter(Parameter_boolean("power_dry_coil_correction", True))
+        self.add_parameter(Parameter_float_list("expression_max_values", [60,30,60,30,1.5,1], "-"))
+        self.add_parameter(Parameter_float_list("expression_min_values", [0,0,-30,-30,0,0], "-"))
 
     def check(self):
         errors = super().check()
@@ -39,7 +42,7 @@ class HVAC_DX_equipment(Component):
         total_capacity = self.parameter("nominal_total_cooling_capacity").value
         if total_capacity > 0:
             # variables dictonary
-            var_dic = {"T_idb":T_idb,"T_iwb":T_iwb,"T_odb":T_odb,"T_owb":T_owb,"F_air":F_air}
+            var_dic = self._var_state_dic([T_idb, T_iwb,T_odb,T_owb,F_air,0])
             # Total
             f = self.parameter("total_cooling_capacity_expression").evaluate(var_dic)
             total_capacity = total_capacity * f
@@ -60,7 +63,7 @@ class HVAC_DX_equipment(Component):
         capacity = self.parameter("nominal_heating_capacity").value
         if capacity > 0:
             # variables dictonary
-            var_dic = {"T_idb":T_idb,"T_iwb":T_iwb,"T_odb":T_odb,"T_owb":T_owb,"F_air":F_air}
+            var_dic = self._var_state_dic([T_idb, T_iwb,T_odb,T_owb,F_air,0])
             # Capacity
             capacity = capacity * self.parameter("heating_capacity_expression").evaluate(var_dic)
             return capacity
@@ -72,18 +75,19 @@ class HVAC_DX_equipment(Component):
         if total_capacity > 0:
             if (F_load > 0):
                 # variables dictonary
-                var_dic = {"T_idb":T_idb,"T_iwb":T_iwb,"T_odb":T_odb,"T_owb":T_owb,"F_air":F_air,"F_load":F_load}
+                var_dic = self._var_state_dic([T_idb, T_iwb,T_odb,T_owb,F_air,F_load])
                 # con
                 power_full = self._get_correct_cooling_power(total_capacity,sensible_capacity,var_dic)
 
                 EER_full = total_capacity/power_full
-                EER = EER_full * self.parameter("EER_expression").evaluate(var_dic) 
-                power = total_capacity*F_load/EER
-                return (total_capacity*F_load, sensible_capacity*F_load, power)
+                F_EER = self.parameter("EER_expression").evaluate(var_dic) 
+                EER = EER_full * F_EER 
+                power = total_capacity*F_load/EER + self.parameter("no_load_power").value
+                return (total_capacity*F_load, sensible_capacity*F_load, power, F_EER)
             else:
-                return ( 0 , 0 , self.parameter("no_load_power").value )
+                return ( 0 , 0 , self.parameter("no_load_power").value, 0 )
         else:
-            return (0,0,0)
+            return (0,0,0,0)
         
     def _get_correct_cooling_power(self,total_capacity, sensible_capacity, var_dic):
         power = self.parameter("nominal_cooling_power").value
@@ -108,18 +112,35 @@ class HVAC_DX_equipment(Component):
         if capacity > 0:
             if (F_load > 0):
                 # variables dictonary
-                var_dic = {"T_idb":T_idb,"T_iwb":T_iwb,"T_odb":T_odb,"T_owb":T_owb,"F_air":F_air,"F_load":F_load}
+                var_dic = self._var_state_dic([T_idb, T_iwb,T_odb,T_owb,F_air,F_load])
                 # Compressor
                 power_full = self.parameter("nominal_heating_power").value
                 power_full = power_full * self.parameter("heating_power_expression").evaluate(var_dic)
                 COP_full = capacity/power_full
-                COP = COP_full * self.parameter("COP_expression").evaluate(var_dic) 
-                power = capacity*F_load/COP
-                return (capacity*F_load, power)
+                F_COP = self.parameter("COP_expression").evaluate(var_dic) 
+                COP = COP_full * F_COP
+                power = capacity*F_load/COP + + self.parameter("no_load_power").value
+                return (capacity*F_load, power, F_COP)
             else:
-                return (0,self.parameter("no_load_power").value)
+                return (0,self.parameter("no_load_power").value, 0)
         else:
-            return (0,0)
+            return (0,0,0)
+    
+    def _var_state_dic(self, values):
+        max = self.parameter("expression_max_values").value
+        min = self.parameter("expression_min_values").value
+        for i in range(len(values)):
+            if (values[i] > max[i]):
+                values[i] = max[i]
+            elif (values[i] < min[i]):
+                values[i] = min[i]
+        return {"T_idb":values[0],
+                "T_iwb":values[1],
+                "T_odb":values[2],
+                "T_owb":values[3],
+                "F_air":values[4],
+                "F_load":values[5]}
+