.gitignore

@@ -1,3 +1,2 @@
 /bin
 /obj
-/curl

main.cpp

@@ -1,86 +1,45 @@
-#include <math.h>
 #include <iostream>
-#include <conio.h>
 #include <vector>
+#include <cmath>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
-#include "histogram_internal.h"
-#include <curl/curl.h>
-#include <sstream>
 #include <string>
-
+#include <conio.h>
 using namespace std;
 
+
+
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
-    size_t interval;
 };
 
 Input
-input_data(istream &tin, bool prompt){
+input_data() {
-    if (prompt)
-        cerr << "Input numbers count: ";
     size_t number_count;
-    tin >> number_count;
+    cin >> number_count;
     Input in;
     in.numbers.resize(number_count);
-    if (prompt)
+
-        cerr << "Input numbers: ";
     for (size_t i = 0; i < number_count; i++) {
-        tin >> in.numbers[i];
+        cin >> in.numbers[i];
     }
-    if (prompt)
+
-        cerr << "Input bin count: ";
+    cerr << "Enter number of bins";
-    tin >> in.bin_count;
+    cin >> in.bin_count;
     return in;
 }
 
-size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
-    size_t data_size = item_size * item_count;
-    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    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)
-    {
-        CURLcode res;
-        curl_off_t speed;
-        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
-        res = curl_easy_perform(curl);
 
-        if (res != CURLE_OK)
-        {
-            fprintf(stderr, "curl_easy_perform() failed: %s\n",curl_easy_strerror(res));
-            exit(1);
-        }
-        res = curl_easy_getinfo(curl, CURLINFO_SPEED_DOWNLOAD_T, &speed);
-        if(!res)
-        {
-            cerr<<"Download speed bytes/sec:  " <<speed;
-        }
 
-        curl_easy_cleanup(curl);
 
-    }
+
-    return input_data(buffer, false);
+int main()
-}
+{
-int
+    Input in = input_data();
-main(int argc, char* argv[]) {
+    auto bins = make_histogram(in.numbers, in.bin_count);
-    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;
+    }
+

project3.depend

@@ -1,14 +1,13 @@
 # depslib dependency file v1.0
-1686065402 source:c:\users\hp\desktop\lab-03\project3\main.cpp
+1685964158 source:c:\users\hp\desktop\lab-03\project3\main.cpp
-	<math.h>
 	<iostream>
-	<conio.h>
 	<vector>
+	<cmath>
 	"histogram.h"
 	"text.h"
 	"svg.h"
-	"histogram_internal.h"
+	<string>
-	<curl/curl.h>
+	<conio.h>
 
 1685965388 c:\users\hp\desktop\lab-03\project3\histogram.h
 	<vector>
@@ -34,12 +33,7 @@
 1685969642 c:\users\hp\desktop\lab-03\project3\histogram_internal.h
 	<vector>
 
-1686062922 source:c:\users\hp\desktop\lab-03\project3\svg.cpp
+1685943355 source:c:\users\hp\desktop\lab-03\project3\svg.cpp
-	<iostream>
-	<conio.h>
-	<vector>
-	<string>
-	"svg.h"
 	<math.h>
 	<iostream>
 	<conio.h>
@@ -50,51 +44,3 @@
 1685964255 c:\users\hp\desktop\lab-03\project3\svg.h
 	<vector>
 
-1685361112 c:\users\hp\desktop\lab-03\project3\curl\include\curl\curl.h
-	"curlver.h"
-	"system.h"
-	<stdio.h>
-	<limits.h>
-	<osreldate.h>
-	<sys/types.h>
-	<time.h>
-	<winsock2.h>
-	<ws2tcpip.h>
-	<sys/select.h>
-	<sys/socket.h>
-	<sys/time.h>
-	"easy.h"
-	"multi.h"
-	"urlapi.h"
-	"options.h"
-	"header.h"
-	"websockets.h"
-	"typecheck-gcc.h"
-
-1685416610 c:\users\hp\desktop\lab-03\project3\curl\include\curl\curlver.h
-
-1684137360 c:\users\hp\desktop\lab-03\project3\curl\include\curl\system.h
-	<ConditionalMacros.h>
-	<winsock2.h>
-	<windows.h>
-	<ws2tcpip.h>
-	<sys/types.h>
-	<sys/socket.h>
-	<sys/poll.h>
-
-1685004688 c:\users\hp\desktop\lab-03\project3\curl\include\curl\easy.h
-
-1684137360 c:\users\hp\desktop\lab-03\project3\curl\include\curl\multi.h
-	"curl.h"
-
-1684137360 c:\users\hp\desktop\lab-03\project3\curl\include\curl\urlapi.h
-	"curl.h"
-
-1684137360 c:\users\hp\desktop\lab-03\project3\curl\include\curl\options.h
-
-1684137360 c:\users\hp\desktop\lab-03\project3\curl\include\curl\header.h
-
-1684137360 c:\users\hp\desktop\lab-03\project3\curl\include\curl\websockets.h
-
-1684137360 c:\users\hp\desktop\lab-03\project3\curl\include\curl\typecheck-gcc.h
-

unitest.layout

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<FileVersion major="1" minor="0" />
-	<ActiveTarget name="Debug" />
-</CodeBlocks_layout_file>