diff --git a/.gitignore b/.gitignore index 29abd88..3857f6f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /bin /obj /lab03.layout +/curl diff --git a/lab03.depend b/lab03.depend index 83a469d..f578aa8 100644 --- a/lab03.depend +++ b/lab03.depend @@ -7,7 +7,7 @@ 1716797551 c:\users\lenov\desktop\lab03\histogram.h -1717268069 source:c:\users\lenov\desktop\lab03\main.cpp +1717517969 source:c:\users\lenov\desktop\lab03\main.cpp "histogram.h" @@ -22,10 +22,10 @@ "text.h" -1716819918 c:\users\lenov\desktop\lab03\svg.h +1717516760 c:\users\lenov\desktop\lab03\svg.h -1716819750 source:c:\users\lenov\desktop\lab03\svg.cpp +1717516760 source:c:\users\lenov\desktop\lab03\svg.cpp diff --git a/main.cpp b/main.cpp index aa4ed2c..e32179b 100644 --- a/main.cpp +++ b/main.cpp @@ -11,25 +11,23 @@ struct Input { }; Input -input_data() { +input_data(istream& stream) { + Input in; size_t number_count; cerr << "Enter number count: "; - cin >> number_count; - Input in; + stream >> number_count; in.numbers.resize(number_count); - cerr << "Enter numbers: "; for (size_t i = 0; i < number_count; i++) { - cin >> in.numbers[i]; + stream >> in.numbers[i]; } cerr << "Enter bin count: "; - cin>> in.bin_count; - + stream >> in.bin_count; return in; } int main() { - auto in = input_data(); + Input in = input_data(cin); auto bins = make_histogram(in.numbers, in.bin_count); show_histogram_svg(bins);