.gitignore

@@ -4,5 +4,3 @@ lab03.cbp
 lab03.depend
 unittest.depend
 unittest.cbp
-/curl
-lab03.layout

main.cpp

@@ -3,7 +3,6 @@
 #include "histogram.h"
 #include "svg.h"
 #include "show_svg.h"
-#include <curl/curl.h>
 using namespace std;
 
 struct Input {
@@ -14,42 +13,31 @@ struct Input {
 };
 
 Input
-input_data(istream& stream, bool prompt) {
+input_data() {
-    size_t number_count;
-    if (prompt) {
-        cerr << "Enter number count: ";
-    }
-    stream >> number_count;
-
     Input in;
-    in.numbers.resize(number_count);
+    cerr << "Enter number count: ";
-
+    cin >> in.number_count;
-
-   if (prompt){
-            cerr << "Enter numbers: ";
-    }
-    for (size_t i = 0; i < number_count; i++)
-    {
-        stream >> in.numbers[i];
-    }
 
-    if (prompt){
+    vector<double> numbers(in.number_count);
-    cerr << "Enter number of bins: ";
+    in.numbers.resize(in.number_count);
+    for (size_t i = 0; i < in.number_count; i++) {
+        cin >> in.numbers[i];
     }
-        stream >> in.bin_count;
 
+    size_t bin_count;
+    cerr << "Enter bin count: ";
+    cin >> in.bin_count;
 
+    size_t max_count;
+    in.max_count = 0;
     return in;
 }
 
 int main()
 {
-     curl_global_init(CURL_GLOBAL_ALL);
+    Input in = input_data();
-    bool prompt = true;
-    auto in = input_data(cin, prompt);
     vector<size_t> bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
     show_histogram_svg(bins);
     return 0;
 
-
 }