code: ввод из произвольного потока

7112

@@ -1,8 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABAqjR8VKL
-iXqwsebTTkYzLtAAAAGAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIAMVcWMSwkHQ796Q
-v12uM1/L9QSqCC1guyCtw8nZgqYaAAAAoAX6y1g+sl014TmIQ7zX/gv2ngRTEKBcujJq8O
-UqkMywAQC10aGheZuBego39vP3S84Tf+kKNzxIUWu+kRpbgi4x2bIc5/kYbYh76DGK+o9z
-zCGU6ju3j1fNVHknGYkR0aw2SSu9/Q8GjU+xMd5Rdqj567rbHY/w7Qt8ZYImEKVvYoO/6G
-BenNIJk2c3S/lY26lh51GG9DF9PKMrnWNhZIY=
------END OPENSSH PRIVATE KEY-----

7112.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAMVcWMSwkHQ796Qv12uM1/L9QSqCC1guyCtw8nZgqYa aleks@DESKTOP-3A8L66V

laba1.depend

@@ -1,5 +1,5 @@
 # depslib dependency file v1.0
-1748812442 source:c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\main.cpp
+1748821392 source:c:\users\aleks\onedrive\Ðàáî÷èé ñòîë\laba1\main.cpp
 	<iostream>
 	<vector>
 	"histogram.h"

main.cpp

@@ -13,38 +13,33 @@ struct Input {
 };
 
 // Ââîä äàííûõ
-Input input_data() {
+
-    Input in;
+
+Input input_data(istream& in) {  // Óáðàí ïàðàìåòð prompt
+    Input data;
     size_t number_count;
-    cerr << "Enter number count: ";
-    cin >> number_count;
 
-    in.numbers.resize(number_count);
+    cerr << "Enter the number of elements: ";
+    in >> number_count;
 
-    cerr << "Enter numbers: ";
+    data.numbers.resize(number_count);
+
+    cerr << "\nEnter " << number_count << " elements:" << endl;
     for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
+        in >> data.numbers[i];
     }
 
-    cerr << "Enter bin count: ";
+    cerr << "Enter the number of bins: ";
-    cin >> in.bin_count;
+    in >> data.bin_count;
 
-    return in;
+    return data;
 }
 
-// Ïîèñê ìèíèìóìà è ìàêñèìóìà
-
-
-// Ðàñ÷¸ò ãèñòîãðàììû
-
-
-// Âûâîä ãèñòîãðàììû
-
-
-// Îñíîâíàÿ ôóíêöèÿ
 int main() {
-    auto in = input_data();
+    Input data = input_data(cin);  // Òåïåðü âûçûâàåòñÿ áåç ïàðàìåòðà prompt
-    auto bins = make_histogram(in.numbers, in.bin_count);
+
+    auto bins = make_histogram(data.numbers, data.bin_count);
     show_histogram_svg(bins);
+
     return 0;
 }