.gitignore

@@ -2,8 +2,5 @@
 /obj
 /lab01.depend
 /lab01.layout
-/main.o
 /main.exe
-/unittest.layout
+/main.o
-/curl
-libcurl-x64.dll

lab01.cbp

@@ -33,12 +33,9 @@
 			<Add option="-fexceptions" />
 		</Compiler>
 		<Unit filename=".gitignore" />
-		<Unit filename="histogram.cpp" />
+		<Unit filename="Header.cpp" />
-		<Unit filename="histogram.h" />
+		<Unit filename="Header.h" />
-		<Unit filename="histogram_internal.h" />
 		<Unit filename="main.cpp" />
-		<Unit filename="svg.cpp" />
-		<Unit filename="svg.h" />
 		<Unit filename="text.cpp" />
 		<Unit filename="text.h" />
 		<Extensions>

main.cpp

@@ -1,7 +1,3 @@
-#include <curl/curl.h>
-
-#include <sstream>
-#include <string>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
@@ -10,54 +6,23 @@ struct Input {
     vector<double> vec;
     size_t korz{};
 };
-Input input_data(istream& in, bool prompt = false) {
+Input input_data() {
-    Input lin;
+    Input in;
     size_t n, korz;
-    if(prompt)
+
     cerr << "Number of elements: ";
-    in >> n;
+    cin >> n;
-    lin.vec.resize(n);
+    in.vec.resize(n);
+    cerr << "Elements: ";
     for (size_t i = 0; i < n; i++)
-        in >> lin.vec[i];
+        cin >> in.vec[i];
-    if(prompt)
     cerr << "Enter bin count: ";
-    in >> lin.korz;
+    cin >> in.korz;
-    return lin;
+    return in;
-}
-
-size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx){
-    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    size_t data_size = item_size * item_count;
-    buffer->write(reinterpret_cast<const char*>(items), data_size);
-    return data_size;
-}
-
-Input download(const string& address){
-    stringstream buffer;
-    CURL* curl = curl_easy_init();
-    if (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);
-        CURLcode res = curl_easy_perform(curl);
-        curl_easy_cleanup(curl);
-        if (res != CURLE_OK) {
-            cerr << "cURL error: " << curl_easy_strerror(res) << endl;
-            exit(1);
-        }
-    return input_data(buffer, false);
-}
 }
 
-int main(int argc, char* argv[]) {
+int main() {
-    curl_global_init(CURL_GLOBAL_ALL);
+    auto in = input_data();
-    Input input;
+    auto bins = make_histogram(in.korz, in.vec);
-    if (argc > 1) {
-       input = download(argv[1]);
-    }else{
-        input = input_data(cin, true);
-    }
-    auto bins = make_histogram(input.korz, input.vec);
     show_histogram_svg(bins);
-    return 0;
 }

unittest.cbp

@@ -31,10 +31,6 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
-		<Unit filename="doctest.h" />
-		<Unit filename="histogram.cpp" />
-		<Unit filename="histogram_internal.h" />
-		<Unit filename="unittest.cpp" />
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>