diff --git a/histogram.cpp b/histogram.cpp new file mode 100644 index 0000000..d526eb7 --- /dev/null +++ b/histogram.cpp @@ -0,0 +1,61 @@ +#include "histogram.h" + +using namespace std; + +static void +find_minmax(const vector& numbers, double& min, double& max) +{ + min = numbers[0]; + max = numbers[0]; + // (здесь код поиска минимума и максимума) + for (double value : numbers) + { + if (value < min) {min = value;} + else if (value > max) {max = value;} + } +} + +vector +make_histogram(const vector& numbers, size_t& bin_count) +{ + double min, max; + find_minmax(numbers, min, max); + + double bin_size = (max - min) / bin_count; + vector bins(bin_count); + for (size_t i = 0; i < numbers.size(); i++) + { + for (size_t j = i + 1; j < numbers.size(); j++) + { + if (numbers[i] == numbers[j]) + { + //numbers.erase(numbers.begin() + j); + //number_count--; + //i--; + //cout << "Removed number " << numbers[j] << endl; + } + } + } + + for (size_t i = 0; i < numbers.size(); i++) + { + bool found = false; + for (size_t j = 0; (j < bin_count - 1) && !found; j++) + { + auto low_bound = min + j * bin_size; + auto high_bound = min + (j + 1) * bin_size; + if ((low_bound <= numbers[i]) && (numbers[i] < high_bound)) + { + 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..cb3c148 --- /dev/null +++ b/histogram.h @@ -0,0 +1,9 @@ +#ifndef HISTOGRAM_H_INCLUDED +#define HISTOGRAM_H_INCLUDED + +#include + +std::vector +make_histogram(const std::vector& numbers, size_t& bin_count); + +#endif // HISTOGRAM_H_INCLUDED diff --git a/main.cpp b/main.cpp index 6aca730..4c74947 100644 --- a/main.cpp +++ b/main.cpp @@ -1,5 +1,6 @@ #include #include +#include "histogram.h" using namespace std; @@ -28,63 +29,6 @@ input_data() { return in; } -void - find_minmax(const vector& numbers, double& min, double& max) { - min = numbers[0]; - max = numbers[0]; - // (здесь код поиска минимума и максимума) - for (double value : numbers) - { - if (value < min) {min = value;} - else if (value > max) {max = value;} - } -} - -vector -make_histogram(const vector& numbers, size_t& bin_count) -{ - double min, max; - find_minmax(numbers, min, max); - - double bin_size = (max - min) / bin_count; - vector bins(bin_count); - for (size_t i = 0; i < numbers.size(); i++) - { - for (size_t j = i + 1; j < numbers.size(); j++) - { - if (numbers[i] == numbers[j]) - { - //numbers.erase(numbers.begin() + j); - //number_count--; - //i--; - //cout << "Removed number " << numbers[j] << endl; - } - } - } - - for (size_t i = 0; i < numbers.size(); i++) - { - bool found = false; - for (size_t j = 0; (j < bin_count - 1) && !found; j++) - { - auto low_bound = min + j * bin_size; - auto high_bound = min + (j + 1) * bin_size; - if ((low_bound <= numbers[i]) && (numbers[i] < high_bound)) - { - bins[j]++; - found = true; - } - } - - if (!found) - { - bins[bin_count - 1]++; - } - } - - return bins; -} - void show_histogram_text(const vector& bins, size_t& bin_count) { const size_t SCREEN_WIDTH = 80;