💄precommit

Author: Tesshub

energytool/building.py

@@ -197,11 +197,11 @@ def get_param_init_value(
         return values[0] if is_single else values
 
     def simulate(
-            self,
-            property_dict=None,
-            simulation_options=None,
-            idf_save_path=None,
-            **simulation_kwargs,
+        self,
+        property_dict=None,
+        simulation_options=None,
+        idf_save_path=None,
+        **simulation_kwargs,
     ) -> pd.DataFrame:
         """
         Simulate the building model with specified parameters and simulation options.
@@ -261,7 +261,6 @@ def simulate(
         if property_dict is None:
             property_dict = {}
 
-
         for key in property_dict:
             split_key = key.split(".")
 
@@ -278,7 +277,6 @@ def simulate(
                 else:
                     json_functions.updateidf(working_idf, {key: property_dict[key]})
 
-
             # In case it's a SYSTEM parameter, retrieve it in dict by category and name
             elif split_key[0] == ParamCategories.SYSTEM.value:
                 if split_key[1].upper() in [sys.value for sys in SystemCategories]:

energytool/variant.py

@@ -5,8 +5,12 @@
 from pathlib import Path
 from typing import Any
 
+from multiprocessing import cpu_count
+
+from joblib import Parallel, delayed
+from fastprogress.fastprogress import progress_bar
+
 from corrai.base.model import Model
-from corrai.base.simulate import run_simulations
 
 
 class VariantKeys(enum.Enum):
@@ -83,14 +87,6 @@ def get_combined_variants(
     return list(itertools.product(*list(modifier_dict.values())))
 
 
-from copy import deepcopy
-from pathlib import Path
-from multiprocessing import cpu_count
-
-from joblib import Parallel, delayed
-from fastprogress.fastprogress import progress_bar
-
-
 def simulate_variants(
     model: Model,
     variant_dict: dict[str, dict[VariantKeys, Any]],
@@ -136,8 +132,12 @@ def simulate_variants(
     bar = progress_bar(models)
 
     results = Parallel(n_jobs=n_cpu)(
-        delayed(lambda m: m.simulate(simulation_options=simulation_options, **simulate_kwargs))(m)
+        delayed(
+            lambda m: m.simulate(
+                simulation_options=simulation_options, **simulate_kwargs
+            )
+        )(m)
         for m in bar
     )
 
-    return results
+    return results

tests/test_building.py

@@ -136,8 +136,10 @@ def test_save(self):
 
     def test_get_initial_value(self):
         test_build = Building(idf_path=RESOURCES_PATH / "test.idf")
-        string_search = ("idf.DesignSpecification:OutdoorAir.Block1:ApptX1E."
-                         "Outdoor_Air_Flow_Air_Changes_per_Hour")
+        string_search = (
+            "idf.DesignSpecification:OutdoorAir.Block1:ApptX1E."
+            "Outdoor_Air_Flow_Air_Changes_per_Hour"
+        )
         init_value = test_build.get_param_init_value(string_search)
 
         assert init_value == 3
@@ -152,8 +154,10 @@ def test_get_initial_value(self):
 
         assert init_values == [1.25, 3]
 
-        string_search_start = ("idf.DesignSpecification:OutdoorAir.*."
-                               "Outdoor_Air_Flow_Air_Changes_per_Hour")
+        string_search_start = (
+            "idf.DesignSpecification:OutdoorAir.*."
+            "Outdoor_Air_Flow_Air_Changes_per_Hour"
+        )
 
         init_values = test_build.get_param_init_value(string_search_start)
-        assert init_values == [3, 3, 3, 3]
+        assert init_values == [3, 3, 3, 3]

tests/test_variant.py

@@ -6,7 +6,6 @@
 from corrai.base.model import Model
 
 import pandas as pd
-from pathlib import Path
 
 from energytool.variant import (
     simulate_variants,