diff --git a/histogram.cpp b/histogram.cpp index 07d0436..727ee67 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -1,38 +1,40 @@ #include "histogram.h" #include +#include +using namespace std; void -find_minmax(const std::vector numbers, double& min, double& max) { +find_minmax(const std::vector& numbers, double& min, double& max) { min = numbers[0]; max = numbers[0]; for (double x : numbers) - { - - if(x < min){min = x;} - else if (x > max){max = x;} - } - } + { + if (x < min) {min = x;} + else if (x > max) {max = x;} + } +} -std::vector -make_histogram(const std::vector& numbers, size_t bin_count){ - std::vector bins(bin_count); - double min = 0; - double max = 0; +std::vector +make_histogram(const std::vector& numbers, size_t bin_count) +{ + std::vector bins (bin_count); + double min = 0, max = 0; find_minmax(numbers, min, max); double bin_size = (max - min) / bin_count; - for (size_t i =0; i < numbers.size(); i++) - { - bool found = false; - for (size_t j = 0; (j < bin_count - 1) && !found; j++) + for (int i = 0; i < numbers.size(); i++) { - auto lo = min + j * bin_size; - auto hi = min + (j+1) * bin_size; - if ((lo <= numbers[i]) && (numbers[i] < hi)) + bool found = false; + for (int j = 0; (j < bin_count - 1) && !found; j++) { - bins[j]++; - found = true; - }} - if (!found){bins[bin_count - 1]++;} - } + auto lo = min + j * bin_size; + auto hi = min + (j + 1) * bin_size; + if ((lo <= numbers[i]) && (numbers[i] < hi)) + { + bins[j]++; + found = true; + } + } + if (!found) {bins[bin_count - 1]++;} + } return bins; - } +}