lab1.depend

@@ -1,15 +1,19 @@
 # depslib dependency file v1.0
-1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\histogram.cpp
+1747403061 source:c:\users\professional\desktop\cs-lab34\lab1\histogram.cpp
 	"histogram.h"
 
-1747403716 c:\users\professional\desktop\cs-lab34\lab1\histogram.h
+1747403061 c:\users\professional\desktop\cs-lab34\lab1\histogram.h
 	<vector>
 	<iostream>
 
-1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\text.cpp
+1746444035 source:c:\users\professional\desktop\cs-lab34\lab1\text.cpp
 	"text.h"
+	"histogram.h"
+	<iostream>
+	<vector>
+	<string>
 
-1747403716 c:\users\professional\desktop\cs-lab34\lab1\text.h
+1747403061 c:\users\professional\desktop\cs-lab34\lab1\text.h
 	<iostream>
 	<vector>
 
@@ -18,12 +22,12 @@
 	"text.h"
 	"svg.h"
 
-1747403716 c:\users\professional\desktop\cs-lab34\lab1\svg.h
+1747403061 c:\users\professional\desktop\cs-lab34\lab1\svg.h
 	<iostream>
 	<vector>
 	<string>
 	<math.h>
 
-1747403716 source:c:\users\professional\desktop\cs-lab34\lab1\svg.cpp
+1747403061 source:c:\users\professional\desktop\cs-lab34\lab1\svg.cpp
 	"svg.h"
 

main.cpp

@@ -1,45 +1,28 @@
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
-#include <iostream>
-#include <vector>
-
-using namespace std;
 
 struct Input {
     vector<double> vec;
     size_t korz{};
 };
-
+Input input_data() {
-Input input_data(istream &in, bool prompt) {
+    Input in;
-    Input data;
     size_t n, korz;
 
-    if (prompt) {
+    cerr << "Number of elements: ";
-        cerr << "Number of elements: ";
+    cin >> n;
-    }
+    in.vec.resize(n);
-    in >> n;
+    cerr << "Elements: ";
-    data.vec.resize(n);
-
-    if (prompt) {
-        cerr << "Elements: ";
-    }
     for (size_t i = 0; i < n; i++)
-        in >> data.vec[i];
+        cin >> in.vec[i];
-
+    cerr << "Enter bin count: ";
-    if (prompt) {
+    cin >> in.korz;
-        cerr << "Enter bin count: ";
+    return in;
-    }
-    in >> korz;
-    data.korz = korz;
-
-    return data;
 }
 
 int main() {
-
+    auto in = input_data();
-    auto in_with_prompt = input_data(cin, true);
+    auto bins = make_histogram(in.korz, in.vec);
-    auto bins_with_prompt = make_histogram(in_with_prompt.korz, in_with_prompt.vec);
+    show_histogram_svg(bins);
-    show_histogram_svg(bins_with_prompt);
-
 }