diff --git a/.gitignore b/.gitignore
index 11041c78340067274f8ecb1e9c7ac1953f72b746..80ea739d96cccad5bcdf0fb5a9f109274d1d4f39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
*.egg-info
+__pycache__
+results
+calibration_results
diff --git a/results/e1_result/EnergyPlusAPI.log b/results/e1_result/EnergyPlusAPI.log
index 6626a4a35b4955c95ff641073d3c1807572c47d9..3836d18af2fd483604ee2aad0c99ad3453965900 100644
--- a/results/e1_result/EnergyPlusAPI.log
+++ b/results/e1_result/EnergyPlusAPI.log
@@ -1,3 +1,43 @@
04.11.2024-19:18:40 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
04.11.2024-19:18:41 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
04.11.2024-19:18:44 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:03
+05.11.2024-08:13:40 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:13:41 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:13:44 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:14:02 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:14:02 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:14:55 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:14:56 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:15:09 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:15:10 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:15:28 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:15:29 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:15:44 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:15:45 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:16:25 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:16:25 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:16:45 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:16:46 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:17:21 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:17:22 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:18:09 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:18:10 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:18:46 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:18:46 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:19:01 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:19:02 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:19:26 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:19:27 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:19:39 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:19:40 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:19:51 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:19:52 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:21:25 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:21:26 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:21:35 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:21:35 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:22:34 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:22:34 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:23:00 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:23:01 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:23:04 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
diff --git a/results/e2_calibration/Calibrator.log b/results/e2_calibration/Calibrator.log
index 0a916a6374e810a59054a910033469dda2528571..ffb0879b97fac57050fb89de3fe2e4064a28e9d7 100644
--- a/results/e2_calibration/Calibrator.log
+++ b/results/e2_calibration/Calibrator.log
@@ -31,3 +31,38 @@ Final parameter values:
Iteration ..._hour ..._hour ..._hour NMBE penaltyfactor Unweighted NMBE
17 0.157555 0.126006 0.103873 0.269001 - = 1.0*0.269
+05.11.2024-08:29:45 INFO Calibrator: Setting output_interval of simulation according to measurement target data frequency: 1.0
+05.11.2024-08:29:45 INFO Calibrator: Start calibration of model: d:\Repos\energyplus_calibrator\examples\data\ExampleHOM_BESMod_Density_V2310.idf with framework-class Calibrator
+05.11.2024-08:29:45 INFO Calibrator: Class: default, Start and Stop-Time of simulation: 0-767 s
+ Time-Intervals used for objective: [(0, 767)]
+05.11.2024-08:29:45 INFO Calibrator: Iteration ..._hour ..._hour ..._hour NMBE penaltyfactor Unweighted NMBE
+05.11.2024-08:29:48 INFO Calibrator: 1 0.183404 0.244065 0.100023 0.291955 - = 1.0*0.292
+05.11.2024-08:29:51 INFO Calibrator: 2 0.160467 0.129351 0.118468 0.286689 - = 1.0*0.2867
+05.11.2024-08:29:53 INFO Calibrator: 3 0.137252 0.169112 0.179353 0.358655 - = 1.0*0.3587
+05.11.2024-08:29:56 INFO Calibrator: 4 0.207763 0.183839 0.237044 0.440078 - = 1.0*0.4401
+05.11.2024-08:29:58 INFO Calibrator: 5 0.140890 0.275623 0.105478 0.296041 - = 1.0*0.296
+05.11.2024-08:30:01 INFO Calibrator: 6 0.234094 0.183461 0.211738 0.416394 - = 1.0*0.4164
+05.11.2024-08:30:04 INFO Calibrator: 7 0.128077 0.139620 0.260149 0.442683 - = 1.0*0.4427
+05.11.2024-08:30:07 INFO Calibrator: 8 0.293652 0.162685 0.238465 0.453991 - = 1.0*0.454
+05.11.2024-08:30:10 INFO Calibrator: 9 0.275278 0.278921 0.117009 0.335239 - = 1.0*0.3352
+05.11.2024-08:30:13 INFO Calibrator: 10 0.107811 0.133966 0.275629 0.455264 - = 1.0*0.4553
+05.11.2024-08:30:16 INFO Calibrator: 11 0.119669 0.184222 0.291578 0.485076 - = 1.0*0.4851
+05.11.2024-08:30:19 INFO Calibrator: 12 0.206633 0.238375 0.163103 0.366615 - = 1.0*0.3666
+05.11.2024-08:30:22 INFO Calibrator: 13 0.237300 0.266925 0.103658 0.310648 - = 1.0*0.3106
+05.11.2024-08:30:25 INFO Calibrator: 14 0.250029 0.297772 0.249633 0.483987 - = 1.0*0.484
+05.11.2024-08:30:27 INFO Calibrator: 15 0.156089 0.257856 0.120645 0.312704 - = 1.0*0.3127
+05.11.2024-08:30:30 INFO Calibrator: 16 0.189579 0.281719 0.158723 0.366656 - = 1.0*0.3667
+05.11.2024-08:30:33 INFO Calibrator: 17 0.157555 0.126006 0.103873 0.269001 - = 1.0*0.269
+05.11.2024-08:30:36 INFO Calibrator: 18 0.235767 0.142326 0.153109 0.342621 - = 1.0*0.3426
+05.11.2024-08:30:38 INFO Calibrator: 19 0.198315 0.110673 0.214824 0.399303 - = 1.0*0.3993
+05.11.2024-08:30:41 INFO Calibrator: 20 0.129346 0.217861 0.239952 0.434928 - = 1.0*0.4349
+05.11.2024-08:30:44 INFO Calibrator: 21 0.120467 0.182811 0.238880 0.425373 - = 1.0*0.4254
+05.11.2024-08:30:47 INFO Calibrator: 22 0.182836 0.109991 0.207179 0.387590 - = 1.0*0.3876
+05.11.2024-08:30:47 WARNING Calibrator: Terminating calibration as the maximum time of 60 s has been reached
+05.11.2024-08:30:47 INFO Calibrator:
+Results for calibration of model: d:\Repos\energyplus_calibrator\examples\data\ExampleHOM_BESMod_Density_V2310.idf
+Number of iterations: 22
+Final parameter values:
+Iteration ..._hour ..._hour ..._hour NMBE penaltyfactor Unweighted NMBE
+ 17 0.157555 0.126006 0.103873 0.269001 - = 1.0*0.269
+
diff --git a/results/e2_calibration/EnergyPlusAPI.log b/results/e2_calibration/EnergyPlusAPI.log
index daebfd1b78d3eac2380186a3fd4e4822e7e61b95..7b9697945bf19ab15674fd4c402398ae6c0f58ba 100644
--- a/results/e2_calibration/EnergyPlusAPI.log
+++ b/results/e2_calibration/EnergyPlusAPI.log
@@ -22,3 +22,38 @@
04.11.2024-19:20:01 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:03
04.11.2024-19:20:04 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:03
04.11.2024-19:20:09 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:03
+05.11.2024-08:23:14 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:23:15 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:23:18 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:24:09 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:24:10 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:24:14 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:04
+05.11.2024-08:28:33 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:28:34 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:28:36 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:29:41 INFO EnergyPlusAPI: -------------------------Initializing class EnergyPlusAPI-------------------------
+05.11.2024-08:29:42 WARNING EnergyPlusAPI: Extracting model variables (outputs, parameters, etc.) does not yet work. To be implemented...
+05.11.2024-08:29:45 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:29:48 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:29:51 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:29:53 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:29:56 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:29:58 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:01 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:03
+05.11.2024-08:30:04 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:07 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:10 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:03
+05.11.2024-08:30:13 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:16 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:03
+05.11.2024-08:30:19 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:22 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:25 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:27 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:30 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:33 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:36 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:38 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:41 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:44 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
+05.11.2024-08:30:47 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:03
+05.11.2024-08:30:51 INFO EnergyPlusAPI: Finished 1 simulations on 1 processes in 0:00:02
diff --git a/results/e2_calibration/convergence.png b/results/e2_calibration/convergence.png
index 894107e97cecfe6ffc4828ad883d228c78ec8dc2..e6b920d7c186aa036fbd4961ea8beb2a92eef2c0 100644
Binary files a/results/e2_calibration/convergence.png and b/results/e2_calibration/convergence.png differ