Skip to content

use QMap::lastKey instead of std::end #4373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Swiftb0y merged 1 commit into from
Oct 10, 2021
Merged

use QMap::lastKey instead of std::end #4373

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/controllers/learningutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,14 @@ MidiInputMappings LearningUtils::guessMidiInputMappings(
// QMap keys are sorted so we can check this easily by checking the last key
// is <= 0x7F.
bool only_7bit_values = !stats.value_histogram.isEmpty() &&
(std::prev(stats.value_histogram.end(), 1)).key() <= 0x7F;
stats.value_histogram.lastKey() <= 0x7F;

// A 7-bit two's complement ticker swinging from +1 to -1 can generate
// unsigned differences of up to 126 (0x7E). If we see differences in
// individual messages above 96 (0x60) that's a good hint that we're looking
// at a two's complement ticker.
bool abs_differences_above_60 = !stats.abs_diff_histogram.isEmpty() &&
(std::prev(stats.abs_diff_histogram.end(), 1)).key() >= 0x60;
stats.abs_diff_histogram.lastKey() >= 0x60;

if (one_control && one_channel &&
two_values_7bit_max_and_min &&
Expand Down Expand Up @@ -268,9 +268,9 @@ MidiInputMappings LearningUtils::guessMidiInputMappings(
int control2 = *(++stats.controls.begin());

int control1_max_abs_diff =
(std::prev(stats_by_control[control1].abs_diff_histogram.end(), 1)).key();
stats_by_control[control1].abs_diff_histogram.lastKey();
int control2_max_abs_diff =
(std::prev(stats_by_control[control2].abs_diff_histogram.end(), 1)).key();
stats_by_control[control2].abs_diff_histogram.lastKey();

// The control with the larger abs difference in messages is the LSB. If
// they are equal we choose one arbitrarily (depends on QSet iteration
Expand Down