diff --git a/main.cpp b/main.cpp index 6c5d263..d2f2273 100644 --- a/main.cpp +++ b/main.cpp @@ -1,45 +1,43 @@ +#include #include +#include #include -#include #include "histogram.h" #include "text.h" #include "svg.h" -#include -#include +#include "histogram_internal.h" using namespace std; - - struct Input { vector numbers; size_t bin_count{}; + size_t interval; }; Input -input_data() { +input_data(istream &tin, bool prompt){ + if (prompt) + cerr << "Input numbers count: "; size_t number_count; - cin >> number_count; + tin >> number_count; Input in; in.numbers.resize(number_count); - + if (prompt) + cerr << "Input numbers: "; for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + tin >> in.numbers[i]; } - - cerr << "Enter number of bins"; - cin >> in.bin_count; + if (prompt) + cerr << "Input bin count: "; + tin >> in.bin_count; return in; } - - - -int main() -{ - Input in = input_data(); +int main() { + Input in = input_data(cin, false); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins); return 0; - } +} diff --git a/project3.depend b/project3.depend index 2e15fff..5cb1a1b 100644 --- a/project3.depend +++ b/project3.depend @@ -33,7 +33,12 @@ 1685969642 c:\users\hp\desktop\lab-03\project3\histogram_internal.h -1685943355 source:c:\users\hp\desktop\lab-03\project3\svg.cpp +1686062922 source:c:\users\hp\desktop\lab-03\project3\svg.cpp + + + + + "svg.h"