address some comments

Signed-off-by: Santiago Figueroa Manrique <figueroa1395@gmail.com>

Author: figueroa1395

power_grid_model_c/power_grid_model/include/power_grid_model/component/current_sensor.hpp

@@ -154,29 +154,29 @@ template <symmetry_tag current_sensor_symmetry_> class CurrentSensor : public Ge
         CurrentSensorOutput<sym_calc> output{};
         output.id = id();
         output.energized = 1; // current sensor is always energized
-        auto i_output = i;
         auto const i_calc_param = calc_param<sym_calc>();
         auto const angle_measurement_type = i_calc_param.angle_measurement_type;
         auto const i_measured_complex = i_calc_param.measurement.value();
-        if (angle_measurement_type == AngleMeasurementType::local_angle) {
-            // I_l = conj(I_g) * exp(i * u_angle)
-            // Tranform back the output angle to the local angle frame of reference
-            auto const u_angle = arg(u);
-            i_output = conj(i_output) * (cos(u_angle) + 1i * sin(u_angle));
-        }
+        ComplexValue<sym_calc> i_output = [&i, &u, &angle_measurement_type] {
+            switch (angle_measurement_type) {
+            case AngleMeasurementType::global_angle: {
+                return i;
+            }
+            case AngleMeasurementType::local_angle: {
+                // I_l = conj(I_g) * exp(i * u_angle)
+                // Tranform back the output angle to the local angle frame of reference
+                auto const u_angle = arg(u);
+                return ComplexValue<sym_calc>{conj(i) * (cos(u_angle) + 1i * sin(u_angle))};
+            }
+            default: {
+                throw MissingCaseForEnumError{"generic output angle measurement type", angle_measurement_type};
+            }
+            }
+        }();
         output.i_residual = (cabs(i_measured_complex) - cabs(i_output)) * base_current_;
         // arg(e^i * u_angle) = u_angle in (-pi, pi]
         auto const unbounded_i_angle_residual = arg(i_measured_complex) - arg(i_output);
-        if constexpr (is_symmetric_v<sym_calc>) {
-            output.i_angle_residual =
-                arg(ComplexValue<sym_calc>{cos(unbounded_i_angle_residual), sin(unbounded_i_angle_residual)});
-        } else {
-            output.i_angle_residual = arg(ComplexValue<sym_calc>{
-                cos(unbounded_i_angle_residual(0)) + 1i * sin(unbounded_i_angle_residual(0)),
-                cos(unbounded_i_angle_residual(1)) + 1i * sin(unbounded_i_angle_residual(1)),
-                cos(unbounded_i_angle_residual(2)) + 1i * sin(unbounded_i_angle_residual(2)),
-            });
-        }
+        output.i_angle_residual = arg(ComplexValue<sym_calc>{exp(1.0i * unbounded_i_angle_residual)});
         return output;
     }
 };

tests/cpp_unit_tests/test_current_sensor.cpp

@@ -56,16 +56,13 @@ TEST_CASE("Test current sensor") {
                 double const i_angle_sigma_pi = 0.2;
                 double const i_angle_variance_pu = i_angle_sigma_pi * i_angle_sigma_pi;
 
-                auto const i_sym =
-                    ComplexValue<symmetric_t>{(1e3 * cos(i_angle) + 1i * 1e3 * sin(i_angle)) / base_current};
-                auto const i_asym = ComplexValue<asymmetric_t>{
-                    (1e3 * cos(i_angle) + 1i * 1e3 * sin(i_angle)) / base_current,
-                    (1e3 * cos(i_angle + deg_240) + 1i * 1e3 * sin(i_angle + deg_240)) / base_current,
-                    (1e3 * cos(i_angle + deg_120) + 1i * 1e3 * sin(i_angle + deg_120)) / base_current};
-                auto const i_asym_local =
-                    ComplexValue<asymmetric_t>{(1e3 * cos(i_angle) + 1i * 1e3 * sin(i_angle)) / base_current,
-                                               (1e3 * cos(i_angle) + 1i * 1e3 * sin(i_angle)) / base_current,
-                                               (1e3 * cos(i_angle) + 1i * 1e3 * sin(i_angle)) / base_current};
+                auto const i_sym = ComplexValue<symmetric_t>{(1e3 * exp(1.0i * i_angle)) / base_current};
+                auto const i_asym = ComplexValue<asymmetric_t>{(1e3 * exp(1.0i * i_angle)) / base_current,
+                                                               (1e3 * exp(1.0i * (i_angle + deg_240))) / base_current,
+                                                               (1e3 * exp(1.0i * (i_angle + deg_120))) / base_current};
+                auto const i_asym_local = ComplexValue<asymmetric_t>{(1e3 * exp(1.0i * i_angle)) / base_current,
+                                                                     (1e3 * exp(1.0i * i_angle)) / base_current,
+                                                                     (1e3 * exp(1.0i * i_angle)) / base_current};
 
                 CurrentSensor<symmetric_t> const sym_current_sensor{sym_current_sensor_input, u_rated};
 
@@ -111,7 +108,7 @@ TEST_CASE("Test current sensor") {
 
                 CHECK(sym_sensor_output_asym_param.id == 0);
                 CHECK(sym_sensor_output_asym_param.energized == 1);
-                for (auto phase = 0; phase < 3; ++phase) {
+                for (auto phase : IdxRange{3}) {
                     CAPTURE(phase);
                     CHECK(sym_sensor_output_asym_param.i_residual[phase] == doctest::Approx(0.0));
                     CHECK(sym_sensor_output_asym_param.i_angle_residual[phase] == doctest::Approx(0.0));