diff --git a/histogram.cpp b/histogram.cpp index e90f997..80860d1 100644 --- a/histogram.cpp +++ b/histogram.cpp @@ -1,8 +1,45 @@ -// -// histogram.cpp -// lab01 -// -// Created by Светлана Рыбакова on 01.05.2025. -// +#include "histogram.h" +#include -#include +using namespace std; + +static void find_minmax(const 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; + } + } +} + +vector make_histogram(const vector& numbers, size_t bin_count) { + vector bins(bin_count, 0); + + + double min, max; + 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++) { + 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; +} diff --git a/histogram.h b/histogram.h new file mode 100644 index 0000000..a4a47c0 --- /dev/null +++ b/histogram.h @@ -0,0 +1,16 @@ +// +// histogram.h +// lab01 +// +// Created by Светлана Рыбакова on 01.05.2025. +// + +#ifndef histogram_h +#define histogram_h + +#include + +std::vector +make_histogram(const std::vector& numbers, size_t bin_count); + +#endif /* histogram_h */