.gitignore

@@ -3,4 +3,3 @@
 /123
 /laba.depend
 /laba.layout
-/curl

histogram.cpp

@@ -1,31 +1,20 @@
 #include <vector>
 #include "histogram.h"
 using namespace std;
-
+void find_minmax(const vector<double>& numbers, double& min, double& max)
-bool
+{
-find_minmax(const std::vector<double>& numbers, double& min, double& max){
+    min = numbers[0];
-    if (numbers.size() != 0) {
+    max = numbers[0];
-        min = numbers[0];
+    for (double x : numbers) {
-        max = numbers[0];
+        if (x < min) {
-
+            min = x;
-        for (double x : numbers) {
+        }
-            if (x < min) {
+        else if (x > max) {
-                min = x;
+            max = x;
-            }
-            else if (x > max) {
-                max = x;
-            }
         }
-        return true;
-    }
-
-    else {
-        return false;
     }
-
 }
 
-
 vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count)
 {
     double min,max;

histogram_internal.h

@@ -1,6 +1,6 @@
 #ifndef HISTOGRAM_INTERNAL_H_INCLUDED
 #define HISTOGRAM_INTERNAL_H_INCLUDED
 #include <vector>
-bool find_minmax(const std::vector<double>& numbers, double& min, double& max);
+void find_minmax(const std::vector<double>& numbers, double& min, double& max);
 
 #endif // HISTOGRAM_INTERNAL_H_INCLUDED

main.cpp

@@ -1,6 +1,3 @@
-#include <curl/curl.h>
-#include <sstream>
-#include <string>
 #include <iostream>
 #include <vector>
 #include "histogram.h"
@@ -13,79 +10,29 @@ struct Input{
     size_t bin_count{};
 };
 
-Input input_data(istream& in, bool promt)
+Input input_data()
 {
-    if (promt){
+    size_t number_count;
-        size_t number_count;
+    cerr << "Enter number count: ";
-        cerr << "Enter number count: ";
+    cin >> number_count;
-        in >> number_count;
 
-        Input In;
+    Input in;
 
-        In.numbers.resize(number_count);
+    in.numbers.resize(number_count);
-        cerr << "Enter numbers: ";
+    cerr << "Enter numbers: ";
-        for(size_t i = 0; i < number_count; i++){
+    for(size_t i = 0; i < number_count; i++){
-            in >> In.numbers[i];
+        cin >> in.numbers[i];
-        }
-
-        cerr << "Enter bin count: ";
-        in >> In.bin_count;
-        return In;
     }
-    else{
-        size_t number_count;
-        in >> number_count;
-
-        Input In;
-
-        In.numbers.resize(number_count);
-        for(size_t i = 0; i < number_count; i++){
-            in >> In.numbers[i];
-        }
-
-        in >> 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)
+    cerr << "Enter bin count: ";
-{
+    cin >> in.bin_count;
-    stringstream buffer;
+    return in;
-    CURL* curl = curl_easy_init();
-    if(curl) {
-        CURLcode res;
-        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 != 0){
-            cout << curl_easy_strerror(res);
-            exit(1);
-        }
-        curl_easy_cleanup(curl);
-    }
-    return input_data(buffer,false);
 }
 
-
+int main()
-int main(int argc, char* argv[])
 {
-    Input input;
+    auto in = input_data();
-    if (argc > 1){
+    auto bins = make_histogram(in.numbers, in.bin_count);
-        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;
 }

svg.cpp

@@ -2,6 +2,7 @@
 #include <iostream>
 #include <vector>
 #include <string>
+const size_t x=20;
 using namespace std;
 
 void
@@ -34,7 +35,7 @@ void
 show_histogram_svg(const vector<size_t>& bins) {
     const auto IMAGE_WIDTH = 400;
     const auto IMAGE_HEIGHT = 300;
-    const auto TEXT_LEFT = 20;
+    const auto TEXT_LEFT = IMAGE_WIDTH-30;
     const auto TEXT_BASELINE = 20;
     const auto TEXT_WIDTH = 50;
     const auto BIN_HEIGHT = 30;
@@ -53,7 +54,7 @@ show_histogram_svg(const vector<size_t>& bins) {
         for (size_t bin : bins) {
             const double bin_width = space * bin / max_count;
             svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-            svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "blue");
+            svg_rect(TEXT_LEFT - bin_width - 20, top, bin_width, BIN_HEIGHT, "black", "blue");
             top += BIN_HEIGHT;
         }
         svg_end();
@@ -62,7 +63,7 @@ show_histogram_svg(const vector<size_t>& bins) {
         for (size_t bin : bins) {
             const double bin_width = BLOCK_WIDTH * bin;
             svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-            svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "blue");
+            svg_rect(TEXT_LEFT - bin_width - 20, top, bin_width, BIN_HEIGHT, "black", "blue");
             top += BIN_HEIGHT;
         }
         svg_end();

unittest.cpp

@@ -4,40 +4,9 @@
 #include "histogram_internal.h"
 
 TEST_CASE("distinct positive numbers") {
-    double min = 0;
-    double max = 0;
-    find_minmax({1, 2}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 2);
-}
-
-TEST_CASE("negative numbers") {
     double min = 0;
     double max = 0;
     find_minmax({-1, -2 , -5}, min, max);
-    CHECK(min == -5);
+    CHECK(min == -3);
     CHECK(max == -1);
 }
-
-TEST_CASE("one number") {
-    double min = 0;
-    double max = 0;
-    find_minmax({1}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 1);
-}
-
-TEST_CASE("equal elements") {
-    double min = 0;
-    double max = 0;
-    find_minmax({1,1,1,1}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 1);
-}
-
-TEST_CASE("zero vector") {
-    double min = 0;
-    double max = 0;
-    CHECK(!find_minmax({}, min, max));
-}
-