изменение input_data()

main.cpp

@@ -1,29 +1,44 @@
-#include <curl/curl.h>
-#define CURL_STATICLIB
 #include <iostream>
 #include <vector>
-#include "histogram.h"
+#include <string>
-#include "text.h"
+#include <algorithm>
+#include <sstream>
+#include <curl/curl.h>
+#include <sstream>
+#include "hictogram.h"
 #include "svg.h"
 
-int main(int argc, char* argv[]) {
+using namespace std;
-    if (argc > 1) {
+
-        cout << "argc = " << argc << endl;
+struct Input {
-        for (int i = 0; i < argc; ++i) {
+    vector<double> numbers;
-            cout << "argv[" << i << "] = \"" << argv[i] << "\"" << endl;
+    size_t bin_count{};
-        }
+};
-        return 0;
+
-    }
+Input input_data(istream& in) {
+
+    size_t number_count;
+    in >> number_count;
+
+    Input input;
+    input.numbers.resize(number_count);
 
-    CURLcode res = curl_global_init(CURL_GLOBAL_ALL);
+    for (size_t i = 0; i < number_count; i++) {
-    if (res != CURLE_OK) {
+        in >> input.numbers[i];
-        cerr << "cURL initialization failed: " << curl_easy_strerror(res) << endl;
-        return 1;
     }
 
-    auto in = input_data();
+    in >> input.bin_count;
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins, in.block_width);
 
-    curl_global_cleanup();
+    return input;
 }
+
+int main() {
+    Input input;
+
+    const auto bins = make_histogram(input.numbers, input.bin_count);
+    show_histogram_svg(bins);
+
+    return 0;
+}
+
+