.gitignore

@@ -4,4 +4,3 @@
 /lab1.layout
 /unittest.layout
 /unittest.depend
-/curl

histogram.cpp

@@ -2,23 +2,23 @@
 #include <iostream>
 #include <limits>
 
-Input input_data(std::istream& in, bool prompt) {
+Input input_data() {
-    Input data;
+    Input in;
     size_t number_count;
 
-    if (prompt) std::cerr << "Enter number count: ";
+    std::cerr << "Enter number count: ";
-    in >> number_count;
+    std::cin >> number_count;
 
-    data.numbers.resize(number_count);
+    in.numbers.resize(number_count);
-    if (prompt) std::cerr << "Enter " << number_count << " numbers: ";
+    std::cerr << "Enter " << number_count << " numbers: ";
     for (size_t i = 0; i < number_count; i++) {
-        in >> data.numbers[i];
+        std::cin >> in.numbers[i];
     }
 
-    if (prompt) std::cerr << "Enter bin count: ";
+    std::cerr << "Enter bin count: ";
-    in >> data.bin_count;
+    std::cin >> in.bin_count;
 
-    return data;
+    return in;
 }
 
 void find_minmax(const std::vector<double>& numbers, double& min, double& max) {

histogram.h

@@ -1,11 +1,12 @@
 #pragma once
+
 #include <vector>
-#include <iostream>
 
 struct Input {
     std::vector<double> numbers;
     size_t bin_count{};
 };
 
-Input input_data(std::istream& in, bool prompt);
+Input input_data();
 std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t bin_count);
+void show_histogram_text(const std::vector<size_t>& bins);

lab1.cbp

@@ -32,9 +32,6 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Linker>
-			<Add option="-static-libstdc++" />
-		</Linker>
 		<Unit filename="histogram.cpp" />
 		<Unit filename="histogram.h">
 			<Option target="Debug" />
@@ -43,8 +40,6 @@
 			<Option target="Debug" />
 		</Unit>
 		<Unit filename="main.cpp" />
-		<Unit filename="svg.cpp" />
-		<Unit filename="svg.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

main.cpp

@@ -1,55 +1,9 @@
 #include "histogram.h"
 #include "svg.h"
-#include <curl/curl.h>
-#include <sstream>
-#include <string>
 
-
+int main() {
-size_t write_data(void* ptr, size_t size, size_t nmemb, std::stringstream* stream) {
+    auto in = input_data();
-    size_t data_size = size * nmemb;
+    auto bins = make_histogram(in.numbers, in.bin_count);
-    stream->write(static_cast<const char*>(ptr), data_size);
-    return data_size;
-}
-
-
-Input download(const std::string& url) {
-    std::stringstream buffer;
-
-    CURL* curl = curl_easy_init();
-    if (!curl) {
-        std::cerr << "Failed to initialize cURL\n";
-        exit(1);
-    }
-
-    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
-
-    CURLcode res = curl_easy_perform(curl);
-    if (res != CURLE_OK) {
-        std::cerr << "cURL error: " << curl_easy_strerror(res) << "\n";
-        exit(1);
-    }
-
-    curl_easy_cleanup(curl);
-    return input_data(buffer, false);
-}
-
-int main(int argc, char* argv[]) {
-    curl_global_init(CURL_GLOBAL_ALL);
-
-    Input input;
-    if (argc > 1) {
-        std::cout << "Êîëè÷åñòâî àðãóìåíòîâ: " << argc << std::endl;
-        for (int i = 0; i < argc; ++i) {
-            std::cout << "argv[" << i << "] = " << argv[i] << std::endl;
-        }
-        return 0;
-    }
-
-    auto bins = make_histogram(input.numbers, input.bin_count);
     show_histogram_svg(bins);
-
-    curl_global_cleanup();
     return 0;
 }

svg.cpp

@@ -23,7 +23,7 @@ void svg_rect(double x, double y, double width, double height,
               << "stroke='" << stroke << "' fill='" << fill << "' />\n";
 }
 
-/*void show_histogram_svg(const std::vector<size_t>& bins) {
+void show_histogram_svg(const std::vector<size_t>& bins) {
     const size_t IMAGE_WIDTH = 400;
     const size_t IMAGE_HEIGHT = 300;
     const size_t TEXT_LEFT = 20;
@@ -47,28 +47,5 @@ void svg_rect(double x, double y, double width, double height,
         top += BIN_HEIGHT;
     }
 
-    svg_end();
-}*/
-void show_histogram_svg(const std::vector<size_t>& bins) {
-    size_t max_count = 0;
-    for (size_t count : bins) {
-        if (count > max_count) max_count = count;
-    }
-
-    const size_t IMAGE_HEIGHT = IMAGE_PADDING * 2 + max_count * 10 + TEXT_HEIGHT;
-
-    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
-
-    double x = IMAGE_PADDING;
-    const double y_base = IMAGE_HEIGHT - IMAGE_PADDING - TEXT_HEIGHT;
-
-    for (size_t bin : bins) {
-        const double height = bin * 10;
-        svg_rect(x, y_base - height, BAR_WIDTH, height, "black", "#aaffaa");
-        svg_text(x + BAR_WIDTH/2 - 5, y_base + TEXT_HEIGHT - 5, std::to_string(bin));
-
-        x += BAR_WIDTH + 10;
-    }
-
     svg_end();
 }

svg.h

@@ -2,10 +2,6 @@
 #include <vector>
 #include <string>
 
-const size_t IMAGE_WIDTH = 400;
-const size_t IMAGE_PADDING = 20;
-const size_t BAR_WIDTH = 30;
-const size_t TEXT_HEIGHT = 20;
 void svg_begin(double width, double height);
 void svg_end();
 void svg_text(double left, double baseline, const std::string& text);

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>
 			<lib_finder disable_auto="1" />
 		</Extensions>

unittest.cpp

@@ -10,36 +10,3 @@ TEST_CASE("distinct positive numbers") {
     CHECK(min == 1);
     CHECK(max == 2);
 }
-
-TEST_CASE("empty vector") {
-    double min = 0;
-    double max = 0;
-    find_minmax({}, min, max);
-    CHECK(min == std::numeric_limits<double>::max());
-    CHECK(max == std::numeric_limits<double>::lowest());
-}
-
-TEST_CASE("single element vector") {
-    double min = 0;
-    double max = 0;
-    find_minmax({42}, min, max);
-    CHECK(min == 42);
-    CHECK(max == 42);
-}
-
-TEST_CASE("negative numbers") {
-    double min = 0;
-    double max = 0;
-    find_minmax({-5, -1, -3}, min, max);
-    CHECK(min == -5);
-    CHECK(max == -1);
-}
-
-TEST_CASE("identical elements") {
-    double min = 0;
-    double max = 0;
-    find_minmax({7, 7, 7}, min, max);
-    CHECK(min == 7);
-    CHECK(max == 7);
-}
-//wewger