diff --git a/lab_01.cbp b/lab_01.cbp index ad91226..2a79add 100644 --- a/lab_01.cbp +++ b/lab_01.cbp @@ -32,10 +32,18 @@ + + + + + + + diff --git a/main.cpp b/main.cpp index 65ab87e..574debd 100644 --- a/main.cpp +++ b/main.cpp @@ -1,16 +1,18 @@ #include #include +#include +#include "histogram.h" using namespace std; struct Input { - vector numbers; - size_t bin_count{}; + vector numbers; + size_t bin_count{}, number_count{}; }; -Input input_data() { +Input input_data(){ size_t number_count, bin_count; cin >> number_count; Input in; @@ -25,30 +27,14 @@ Input input_data() { int main() { - Input in = input_data(); - double min, max; - find_minmax(in.numbers, min, max); - -} + auto in = input_data(); + auto bins = make_histogram(in.numbers, in.bin_count); +} -void find_minmax(vector& numbers, double& min, double& max) { -auto counts=numbers.size(); -int i; -min = number[0]; -max = number[0]; -for (i=0; i maxx) { - max = number[i]; -} -} -}