From 1d1057aa44fdcce6faf081d79c31dbf177fa8d06 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Wed, 29 May 2024 20:57:00 +0200 Subject: [PATCH] fix: symbol shadowing error on clang-16 fixed --- example/kalman_filter/kalman_filter-example_1.cpp | 6 +++--- example/kalman_filter/kalman_filter-example_2.cpp | 6 +++--- example/kalman_filter/kalman_filter-example_3.cpp | 6 +++--- example/kalman_filter/kalman_filter-example_4.cpp | 6 +++--- example/kalman_filter/kalman_filter-example_5.cpp | 6 +++--- example/kalman_filter/kalman_filter-example_6.cpp | 6 +++--- example/kalman_filter/kalman_filter-example_7.cpp | 6 +++--- example/kalman_filter/kalman_filter-example_8.cpp | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/example/kalman_filter/kalman_filter-example_1.cpp b/example/kalman_filter/kalman_filter-example_1.cpp index 26746ace..a5f8778a 100644 --- a/example/kalman_filter/kalman_filter-example_1.cpp +++ b/example/kalman_filter/kalman_filter-example_1.cpp @@ -61,11 +61,11 @@ int main() print_header(initial_guess); state next = initial_guess; - for (int index = 1; const auto& m : measurements) { + for (int index = 1; const auto& measurement : measurements) { const state& previous = next; const quantity gain = 1. / index * one; - const state current = state_update(previous, m, gain); + const state current = state_update(previous, measurement, gain); next = current; - print(index++, gain, m, current, next); + print(index++, gain, measurement, current, next); } } diff --git a/example/kalman_filter/kalman_filter-example_2.cpp b/example/kalman_filter/kalman_filter-example_2.cpp index 83489d76..d9fab7f9 100644 --- a/example/kalman_filter/kalman_filter-example_2.cpp +++ b/example/kalman_filter/kalman_filter-example_2.cpp @@ -67,10 +67,10 @@ int main() print_header(initial); state next = state_extrapolation(initial, interval); - for (int index = 1; const auto& m : measurements) { + for (int index = 1; const auto& measurement : measurements) { const state& previous = next; - const state current = state_update(previous, m, gain, interval); + const state current = state_update(previous, measurement, gain, interval); next = state_extrapolation(current, interval); - print(index++, m, current, next); + print(index++, measurement, current, next); } } diff --git a/example/kalman_filter/kalman_filter-example_3.cpp b/example/kalman_filter/kalman_filter-example_3.cpp index 352d603e..931cba60 100644 --- a/example/kalman_filter/kalman_filter-example_3.cpp +++ b/example/kalman_filter/kalman_filter-example_3.cpp @@ -67,10 +67,10 @@ int main() print_header(initial); state next = state_extrapolation(initial, interval); - for (int index = 1; const auto& m : measurements) { + for (int index = 1; const auto& measurement : measurements) { const state& previous = next; - const state current = state_update(previous, m, gain, interval); + const state current = state_update(previous, measurement, gain, interval); next = state_extrapolation(current, interval); - print(index++, m, current, next); + print(index++, measurement, current, next); } } diff --git a/example/kalman_filter/kalman_filter-example_4.cpp b/example/kalman_filter/kalman_filter-example_4.cpp index 99492954..073bc4a1 100644 --- a/example/kalman_filter/kalman_filter-example_4.cpp +++ b/example/kalman_filter/kalman_filter-example_4.cpp @@ -69,10 +69,10 @@ int main() print_header(initial); state next = state_extrapolation(initial, interval); - for (int index = 1; const auto& m : measurements) { + for (int index = 1; const auto& measurement : measurements) { const state& previous = next; - const state current = state_update(previous, m, gain, interval); + const state current = state_update(previous, measurement, gain, interval); next = state_extrapolation(current, interval); - print(index++, m, current, next); + print(index++, measurement, current, next); } } diff --git a/example/kalman_filter/kalman_filter-example_5.cpp b/example/kalman_filter/kalman_filter-example_5.cpp index 861e6596..8a594ded 100644 --- a/example/kalman_filter/kalman_filter-example_5.cpp +++ b/example/kalman_filter/kalman_filter-example_5.cpp @@ -70,11 +70,11 @@ int main() print_header(initial); estimate next = predict(initial); - for (int index = 1; const auto& m : measurements) { + for (int index = 1; const auto& measurement : measurements) { const estimate& previous = next; const quantity gain = kalman::kalman_gain(previous.variance(), measurement_variance); - const estimate current = state_estimate_update(previous, m, gain); + const estimate current = state_estimate_update(previous, measurement, gain); next = predict(current); - print(index++, m, gain, current, next); + print(index++, measurement, gain, current, next); } } diff --git a/example/kalman_filter/kalman_filter-example_6.cpp b/example/kalman_filter/kalman_filter-example_6.cpp index 1881d55e..59ce7a0f 100644 --- a/example/kalman_filter/kalman_filter-example_6.cpp +++ b/example/kalman_filter/kalman_filter-example_6.cpp @@ -75,11 +75,11 @@ int main() print_header(initial); estimate next = predict(initial); - for (int index = 1; const auto& m : measurements) { + for (int index = 1; const auto& measurement : measurements) { const estimate& previous = next; const quantity gain = kalman::kalman_gain(previous.variance(), measurement_variance); - const estimate current = state_estimate_update(previous, m, gain); + const estimate current = state_estimate_update(previous, measurement, gain); next = predict(current); - print(index++, m, gain, current, next); + print(index++, measurement, gain, current, next); } } diff --git a/example/kalman_filter/kalman_filter-example_7.cpp b/example/kalman_filter/kalman_filter-example_7.cpp index f7ab2450..ecf52f96 100644 --- a/example/kalman_filter/kalman_filter-example_7.cpp +++ b/example/kalman_filter/kalman_filter-example_7.cpp @@ -75,11 +75,11 @@ int main() print_header(initial); estimate next = predict(initial); - for (int index = 1; const auto& m : measurements) { + for (int index = 1; const auto& measurement : measurements) { const estimate& previous = next; const quantity gain = kalman::kalman_gain(previous.variance(), measurement_variance); - const estimate current = state_estimate_update(previous, m, gain); + const estimate current = state_estimate_update(previous, measurement, gain); next = predict(current); - print(index++, m, gain, current, next); + print(index++, measurement, gain, current, next); } } diff --git a/example/kalman_filter/kalman_filter-example_8.cpp b/example/kalman_filter/kalman_filter-example_8.cpp index e7cedfdb..e9e06da0 100644 --- a/example/kalman_filter/kalman_filter-example_8.cpp +++ b/example/kalman_filter/kalman_filter-example_8.cpp @@ -75,11 +75,11 @@ int main() print_header(initial); estimate next = predict(initial); - for (int index = 1; const auto& m : measurements) { + for (int index = 1; const auto& measurement : measurements) { const estimate& previous = next; const quantity gain = kalman::kalman_gain(previous.variance(), measurement_variance); - const estimate current = state_estimate_update(previous, m, gain); + const estimate current = state_estimate_update(previous, measurement, gain); next = predict(current); - print(index++, m, gain, current, next); + print(index++, measurement, gain, current, next); } }