fixing broken tests

fastrockstar · Mar 19, 2023 · 37fa83f · 37fa83f
1 parent a973bcb
commit 37fa83f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/examples/basic_household_with_new_hp_hds_hws_and_pv.py b/examples/basic_household_with_new_hp_hds_hws_and_pv.py
@@ -107,7 +107,7 @@ def basic_household_new(
         my_simulation_parameters = SimulationParameters.full_year_only_plots(
             year=year, seconds_per_timestep=seconds_per_timestep
         )
-    my_simulation_parameters.post_processing_options.append(postprocessingoptions.PostProcessingOptions.PROVIDE_DETAILED_ITERATION_LOGGING)
+    # my_simulation_parameters.post_processing_options.append(postprocessingoptions.PostProcessingOptions.PROVIDE_DETAILED_ITERATION_LOGGING)
 
     my_sim.set_simulation_parameters(my_simulation_parameters)
 

diff --git a/examples/modular_example.py b/examples/modular_example.py
@@ -92,6 +92,8 @@ def modular_household_explicit(
         my_simulation_parameters.post_processing_options.append(PostProcessingOptions.PLOT_CARPET)
         my_simulation_parameters.post_processing_options.append(PostProcessingOptions.GENERATE_PDF_REPORT)
         my_simulation_parameters.post_processing_options.append(PostProcessingOptions.GENERATE_CSV_FOR_HOUSING_DATA_BASE)
+        my_simulation_parameters.post_processing_options.append(PostProcessingOptions.WRITE_COMPONENTS_TO_REPORT)
+        my_simulation_parameters.post_processing_options.append(PostProcessingOptions.INCLUDE_CONFIGS_IN_PDF_REPORT)
         my_simulation_parameters.post_processing_options.append(
             PostProcessingOptions.COMPUTE_AND_WRITE_KPIS_TO_REPORT
         )

diff --git a/hisim/component.py b/hisim/component.py
@@ -149,8 +149,8 @@ def get_differences_for_error_msg(self, previous_values: Any, outputs: List[Comp
         error_msg = ""
         for i in range(count):
             if abs(previous_values.values[i] - self.values[i]) > 0.0001:
-                error_msg += outputs[i].get_pretty_name() + " previously: " + "{:4.2f}".format(previous_values.values[i]) \
-                             + " currently: " + "{:4.2f}".format(self.values[i]) + " | "
+                error_msg += outputs[i].get_pretty_name() + " previously: " + f"{previous_values.values[i]:4.2f}" \
+                             + " currently: " + f"{self.values[i]:4.2f}" + " | "
         return error_msg
 
 

diff --git a/hisim/components/controller_l1_heatpump.py b/hisim/components/controller_l1_heatpump.py
@@ -352,7 +352,4 @@ def calculate_state(self, timestep: int, stsv: cp.SingleTimeStepValues) -> None:
 
     def write_to_report(self) -> List[str]:
         """Writes the information of the current component to the report."""
-        lines: List[str] = []
-        lines.append(f"Name: {self.component_name + str(self.config.source_weight)}")
-        lines.append(self.config.get_string_dict())  # type: ignore
-        return lines
+        return self.config.get_string_dict()
diff --git a/hisim/postprocessing/reportgenerator.py b/hisim/postprocessing/reportgenerator.py
@@ -199,6 +199,8 @@ def write_with_normal_alignment(
         if len(text) != 0:
             for part in text:
                 if part is not None:
+                    if not isinstance(part, str):
+                        raise ValueError("Got a non-string somehow: " + str(part))
                     ptext = f'<font size="12">{part.strip()}</font>'
                     self.story.append(Paragraph(ptext, self.styles["Normal"]))
                 else:

diff --git a/hisim/postprocessing/system_chart.py b/hisim/postprocessing/system_chart.py
@@ -4,7 +4,7 @@
 import os
 import pydot
 
-import log
+from hisim import log
 from hisim.postprocessing.postprocessing_datatransfer import PostProcessingDataTransfer
 
 

diff --git a/hisim/simulator.py b/hisim/simulator.py
@@ -53,6 +53,7 @@ def __init__(
         self.module_directory = module_directory
         self.simulation_repository = sim_repository.SimRepository()
         self.results_data_frame: pd.DataFrame
+        self.iteration_logging_path: str = ""
 
 
     def set_simulation_parameters(