diff --git a/lab1.depend b/lab1.depend index e1f3d91..c274f96 100644 --- a/lab1.depend +++ b/lab1.depend @@ -1,19 +1,15 @@ # depslib dependency file v1.0 -1747403061 source:c:\users\professional\desktop\cs-lab34\lab1\histogram.cpp +1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\histogram.cpp "histogram.h" -1747403061 c:\users\professional\desktop\cs-lab34\lab1\histogram.h +1747403716 c:\users\professional\desktop\cs-lab34\lab1\histogram.h -1746444035 source:c:\users\professional\desktop\cs-lab34\lab1\text.cpp +1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\text.cpp "text.h" - "histogram.h" - - - -1747403061 c:\users\professional\desktop\cs-lab34\lab1\text.h +1747403716 c:\users\professional\desktop\cs-lab34\lab1\text.h @@ -22,12 +18,12 @@ "text.h" "svg.h" -1747403061 c:\users\professional\desktop\cs-lab34\lab1\svg.h +1747403716 c:\users\professional\desktop\cs-lab34\lab1\svg.h -1747403061 source:c:\users\professional\desktop\cs-lab34\lab1\svg.cpp +1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\svg.cpp "svg.h" diff --git a/main.cpp b/main.cpp index 558fb56..e394bd1 100644 --- a/main.cpp +++ b/main.cpp @@ -1,28 +1,32 @@ #include "histogram.h" #include "text.h" #include "svg.h" +#include +#include struct Input { - vector vec; + std::vector vec; size_t korz{}; }; -Input input_data() { - Input in; + +Input input_data(std::istream &in) { + Input data; size_t n, korz; cerr << "Number of elements: "; - cin >> n; - in.vec.resize(n); + in >> n; + data.vec.resize(n); cerr << "Elements: "; for (size_t i = 0; i < n; i++) - cin >> in.vec[i]; + in >> data.vec[i]; cerr << "Enter bin count: "; - cin >> in.korz; - return in; + in >> korz; + data.korz = korz; + return data; } - int main() { - auto in = input_data(); + using namespace std; + auto in = input_data(cin); auto bins = make_histogram(in.korz, in.vec); show_histogram_svg(bins); }