fix merge conflicts

Signed-off-by: Santiago Figueroa Manrique <[email protected]>

Author: figueroa1395

docs/user_manual/components.md

@@ -885,11 +885,12 @@ Valid combinations of `power_sigma`, `p_sigma` and `q_sigma` are:
 |               |           |           | ❌ |
 
 ```{note}
-1. If both `p_sigma` and `q_sigma` are provided, they represent the standard deviation of the active and reactive power,
-respectively, and the value of `power_sigma` is ignored. Any infinite component invalidates the entire measurement.
+1. If both `p_sigma` and `q_sigma` are provided (i.e., not NaN), they represent the standard deviation of the active and
+reactive power, respectively, and the value of `power_sigma` is ignored. Any infinite component disables the entire
+measurement.
 
 2. If neither `p_sigma` nor `q_sigma` are provided, `power_sigma` represents the standard deviation of the apparent
-power.
+power. In this case, infinite value of `power_sigma` disables the entire measurement.
 
 3. Providing only one of `p_sigma` and `q_sigma` results in undefined behaviour.
 ```

power_grid_model_c/power_grid_model/include/power_grid_model/auxiliary/dataset.hpp

@@ -490,7 +490,8 @@ template <dataset_type_tag dataset_type_> class Dataset {
                 result.add_buffer(component_info.component->name, size, size, nullptr, nullptr);
                 for (auto const& attribute_buffer : buffer.attributes) {
                     result.add_attribute_buffer(component_info.component->name, attribute_buffer.meta_attribute->name,
-                                                static_cast<Data*>(static_cast<AdvanceablePtr>(attribute_buffer.data)));
+                                                static_cast<Data*>(static_cast<AdvanceablePtr>(attribute_buffer.data) +
+                                                                   attribute_buffer.meta_attribute->size * offset));
                 }
             } else {
                 Data* data = component_info.component->advance_ptr(buffer.data, offset);

power_grid_model_c/power_grid_model/include/power_grid_model/job_adapter.hpp

@@ -67,8 +67,6 @@ class JobDispatchAdapter<MainModel, ComponentList<ComponentType...>>
     // to call derived-class implementation details as part of the CRTP pattern.
     friend class JobDispatchInterface<JobDispatchAdapter>;
 
-    static constexpr Idx ignore_output{-1};
-
     std::unique_ptr<MainModel> model_;
     std::reference_wrapper<MainModelOptions const> options_;
 
@@ -82,7 +80,7 @@ class JobDispatchAdapter<MainModel, ComponentList<ComponentType...>>
     std::mutex calculation_info_mutex_;
 
     void calculate_impl(MutableDataset const& result_data, Idx scenario_idx) const {
-        MainModel::calculator(options_.get(), *model_, result_data, scenario_idx);
+        MainModel::calculator(options_.get(), *model_, result_data.get_individual_scenario(scenario_idx), false);
     }
 
     void cache_calculate_impl() const {
@@ -95,7 +93,7 @@ class JobDispatchAdapter<MainModel, ComponentList<ComponentType...>>
                                       "sym_output",
                                       model_->meta_data(),
                                   },
-                                  ignore_output);
+                                  true);
         } catch (SparseMatrixError const&) { // NOLINT(bugprone-empty-catch) // NOSONAR
             // missing entries are provided in the update data
         } catch (NotObservableError const&) { // NOLINT(bugprone-empty-catch) // NOSONAR

power_grid_model_c/power_grid_model/include/power_grid_model/job_dispatch.hpp

@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include "batch_parameter.hpp"
 #include "job_interface.hpp"
 
 #include "main_core/calculation_info.hpp"
@@ -14,7 +15,6 @@ namespace power_grid_model {
 
 class JobDispatch {
   public:
-    static constexpr Idx ignore_output{-1};
     static constexpr Idx sequential{-1};
 
     // TODO(figueroa1395): add generic template parameters for update_data and result_data
@@ -80,12 +80,16 @@ class JobDispatch {
                 adapter.winddown();
             };
 
-            auto recover_from_bad = [&adapter, &copy_adapter_functor, &thread_info]() {
-                main_core::merge_into(thread_info, adapter.get_calculation_info());
+            auto recover_from_bad = [&adapter, &copy_adapter_functor]() {
+                // TODO(figueroa1395): Time this step
+                // how do we want to deal with exceptions and timing?
                 adapter = copy_adapter_functor();
             };
 
-            auto run = [&adapter, &result_data](Idx scenario_idx) { adapter.calculate(result_data, scenario_idx); };
+            auto run = [&adapter, &result_data, &thread_info](Idx scenario_idx) {
+                adapter.calculate(result_data, scenario_idx);
+                main_core::merge_into(thread_info, adapter.get_calculation_info());
+            };
 
             auto calculate_scenario = JobDispatch::call_with<Idx>(
                 std::move(run), std::move(setup), std::move(winddown),
@@ -97,7 +101,6 @@ class JobDispatch {
             }
 
             t_total.stop();
-            main_core::merge_into(thread_info, adapter.get_calculation_info());
             base_adapter.thread_safe_add_calculation_info(thread_info);
         };
     }