diff --git a/.gitignore b/.gitignore index 34134cf..452834f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ /lab03.sln /lab03.vcxproj.filters /lab03.vcxproj.user -/.vs/ \ No newline at end of file +/.vs/ +/x64/ \ No newline at end of file diff --git a/lab03.vcxproj b/lab03.vcxproj index c04030b..3678d76 100644 --- a/lab03.vcxproj +++ b/lab03.vcxproj @@ -18,6 +18,9 @@ x64 + + + 17.0 Win32Proj @@ -126,9 +129,6 @@ true - - - diff --git a/lab1.cpp b/lab1.cpp index dd2f329..19e8e56 100644 --- a/lab1.cpp +++ b/lab1.cpp @@ -19,31 +19,35 @@ Input input_data() { return in; } +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; + } + if (x > max) + { + max = x; + } + } +} + int main() { const size_t SCREEN_WIDTH = 80; const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; int i, j; - double num; + double min_number, max_number; Input in = input_data(); + find_minmax(in.numbers, min_number, max_number); vector bins(in.bin_count); for (i = 0; i < in.bin_count; i++) { bins[i] = 0; } - double min_number = in.numbers[0]; - double max_number = in.numbers[0]; - for (double x : in.numbers) - { - if (x < min_number) - { - min_number = x; - } - else if (x > max_number) - { - max_number = x; - } - } double bin_size = (max_number - min_number) / in.bin_count; for (size_t i = 0; i < in.numbers.size(); i++) {