cleanup

Signed-off-by: Martijn Govers <[email protected]>

Author: mgovers

power_grid_model_c/power_grid_model/include/power_grid_model/common/calculation_info.hpp

@@ -10,7 +10,7 @@
 
 namespace power_grid_model {
 namespace common::logging {
-class CalculationInfo final : public Logger {
+class CalculationInfo : public Logger {
     using Data = std::map<LogEvent, double>;
 
   public:
@@ -87,6 +87,13 @@ class CalculationInfo final : public Logger {
     void clear() { data_.clear(); }
 };
 
+inline Logger& merge_into(Logger& destination, CalculationInfo const& source) {
+    for (const auto& [tag, value] : source.report()) {
+        destination.log(tag, value);
+    }
+    return destination;
+}
+
 class MultiThreadedCalculationInfo : public MultiThreadedLoggerImpl<CalculationInfo> {
   public:
     using MultiThreadedLoggerImpl<CalculationInfo>::MultiThreadedLoggerImpl;

power_grid_model_c/power_grid_model/include/power_grid_model/job_adapter.hpp

@@ -10,11 +10,8 @@
 #include "job_interface.hpp"
 #include "main_model_fwd.hpp"
 
-#include "main_core/calculation_info.hpp"
 #include "main_core/update.hpp"
 
-#include <mutex>
-
 namespace power_grid_model {
 
 template <class MainModel, typename... ComponentType> class JobAdapter;
@@ -100,8 +97,6 @@ class JobAdapter<MainModel, ComponentList<ComponentType...>>
 
     Logger* log_{nullptr};
 
-    std::mutex calculation_info_mutex_;
-
     void calculate_impl(MutableDataset const& result_data, Idx scenario_idx) const {
         MainModel::calculator(options_.get(), model_reference_.get(), result_data.get_individual_scenario(scenario_idx),
                               false);

power_grid_model_c/power_grid_model/include/power_grid_model/job_dispatch.hpp

@@ -8,8 +8,8 @@
 #include "job_interface.hpp"
 
 #include "common/exception.hpp"
+#include "common/timer.hpp"
 #include "common/typing.hpp"
-#include "main_core/calculation_info.hpp"
 
 #include <thread>
 

power_grid_model_c/power_grid_model/include/power_grid_model/main_core/calculation_info.hpp

@@ -30,7 +30,6 @@
 #include "optimizer/optimizer.hpp"
 
 // main model implementation
-#include "main_core/calculation_info.hpp"
 #include "main_core/calculation_input_preparation.hpp"
 #include "main_core/core_utils.hpp"
 #include "main_core/input.hpp"

power_grid_model_c/power_grid_model/include/power_grid_model/main_model_impl.hpp

@@ -152,7 +152,7 @@ struct PowerGridBenchmark {
         try {
             // calculate
             main_model->calculate(model_options, output.get_dataset(), batch_data.get_dataset());
-            main_core::merge_into(info, main_model->calculation_info());
+            common::logging::merge_into(info, main_model->calculation_info());
         } catch (std::exception const& e) {
             std::cout << std::format("\nAn exception was raised during execution: {}\n", e.what());
         }