lab04

lab01.layout

@@ -2,24 +2,14 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="text.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="13" zoom_2="0">
+	<File name=".gitignore" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="15" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="69" topLine="0" />
+			<Cursor1 position="19" topLine="0" />
-		</Cursor>
-	</File>
-	<File name="histogram.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="16" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="175" topLine="0" />
 		</Cursor>
 	</File>
 	<File name="main.cpp" open="1" top="1" tabpos="2" split="0" active="1" splitpos="0" zoom_1="15" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="909" topLine="23" />
+			<Cursor1 position="867" topLine="18" />
-		</Cursor>
-	</File>
-	<File name="svg.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="20" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="168" topLine="0" />
 		</Cursor>
 	</File>
 	<File name="svg.cpp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="17" zoom_2="0">
@@ -27,19 +17,29 @@
 			<Cursor1 position="18" topLine="0" />
 		</Cursor>
 	</File>
+	<File name="histogram.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="16" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="175" topLine="0" />
+		</Cursor>
+	</File>
 	<File name="histogram.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="17" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="566" topLine="0" />
 		</Cursor>
 	</File>
-	<File name=".gitignore" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="15" zoom_2="0">
-		<Cursor>
-			<Cursor1 position="19" topLine="0" />
-		</Cursor>
-	</File>
 	<File name="text.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="11" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="448" topLine="0" />
 		</Cursor>
 	</File>
+	<File name="svg.h" open="1" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="20" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="168" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="text.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="13" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="69" topLine="0" />
+		</Cursor>
+	</File>
 </CodeBlocks_layout_file>

main.cpp

@@ -1,9 +1,10 @@
 #include <math.h>
 #include <vector>
 #include <iostream>
+#include <sstream>
 #include <string.h>
 #include <curl/curl.h>
-
+#include <string>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
@@ -18,17 +19,23 @@ struct Input {
 };
 
 Input
-input_data(istream& in) {
+input_data(istream& in,bool prompt) {
+    string a, b, c;
+    if(prompt== true){
+    a = "Enter number count:";
+    b = "Enter numbers:";
+    c = "Enter bin count:";
+    }
     size_t number_count;
-    cerr << "Enter number count: ";
+    cerr << a;
     in >> number_count;
 
     Input on;
     on.numbers.resize(number_count);
     for (size_t i = 0; i < number_count; i++) {
-        cerr << "Enter number " << i+1 << ": ";
+        cerr << b << i+1 << ": ";
         in >> on.numbers[i];}
-    cerr << "Enter bin count: ";
+    cerr << c;
     in >> on.bin_count;
 
     on.n = 0;
@@ -42,14 +49,42 @@ input_data(istream& in) {
     return on;
 }
 
-
+size_t
-
+write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
-int main()
+    size_t data_size = item_size * item_count;
-{
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    curl_global_init(CURL_GLOBAL_ALL);
+    buffer->write(reinterpret_cast<const char*>(items), data_size);
-
+    return data_size;
-    auto in = input_data(cin);
+}
-    auto bins = make_histogram(in.numbers, in.bin_count);
+
-    show_histogram_svg(bins);
+Input
-    return 0;
+download(const string& address) {
+    stringstream buffer;
+    CURL* curl = curl_easy_init();
+    if(curl) {
+        CURLcode res;
+        res = curl_easy_perform(curl);
+
+        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
+        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
+        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
+
+        if(res != CURLE_OK){
+            cerr << curl_easy_strerror(res);
+            exit(1);}
+        curl_easy_cleanup(curl);}
+    return input_data(buffer, false);
+}
+
+
+int main(int argc, char* argv[]){
+    Input input;
+    if (argc > 1) {
+        input = download(argv[1]);}
+    else {
+        input = input_data(cin, true);}
+
+    const auto bins = make_histogram(input.numbers, input.bin_count);
+    show_histogram_svg(bins);
+return 0;
 }