diff --git a/energyplus_calibrator/calibration_class.py b/energyplus_calibrator/calibration_class.py index e41b6488c705232788c1500133428f7f85132158..9d33e7318faa0ff784a6aa650a66cc42a096a224 100644 --- a/energyplus_calibrator/calibration_class.py +++ b/energyplus_calibrator/calibration_class.py @@ -186,11 +186,15 @@ class EnergyPlusCalibrator: if self.force_same is not None: for force_to, force_from in self.force_same.items(): check_param(force_to) - if isinstance(force_from[0], (list, tuple)): - for f in force_from[0]: - check_param(f) + + if isinstance(force_from, (list, tuple)): + if isinstance(force_from[0], (list, tuple)): + for f in force_from[0]: + check_param(f) + else: + check_param(force_from[0]) else: - check_param(force_from[0]) + check_param(force_from) def _get_tuner_paras_dict(self) -> Dict[str, Tuple[float, Tuple[float, float]]]: """ @@ -540,7 +544,8 @@ class EnergyPlusCalibrator: __file__).parents[1] / 'calibration_results' / folder_name else: results_folder = calibration_results_folder / folder_name - + + print(f"Results will be saved in {results_folder}") results_folder.mkdir(parents=True) to_copy = ['calibrated_model.json', 'calibrated_model.idf', diff --git a/energyplus_calibrator/energy_plus_api.py b/energyplus_calibrator/energy_plus_api.py index 7933ca892f0f71927a513cdb1c254a2903ce0bf2..55ef1f6db145b846d6a983db590e4cc317005e73 100644 --- a/energyplus_calibrator/energy_plus_api.py +++ b/energyplus_calibrator/energy_plus_api.py @@ -407,10 +407,14 @@ class EnergyPlusAPI(SimulationAPI): return parameters for force_to, force_from in self.force_same.items(): - if isinstance(force_from[0], str): + if isinstance(force_from, str): + parameters[force_to] = parameters[force_from] + continue + if isinstance(force_from, tuple) and not isinstance(force_from[1], str): parameters[force_to] = parameters[force_from[0]] + \ force_from[1] continue + elif not isinstance(force_from[0], tuple): raise ValueError('force_from must be a tuple or a string')