code: добавление файла ввода

lab34.cpp

@@ -1,11 +1,12 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
+#include "text.h"
+#include "histogram_internal.h"
+#include "svg.h"
 
 using namespace std;
 
-const size_t SCREEN_WIDTH = 80;
-const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
@@ -25,79 +26,10 @@ input_data() {
     return in;
 }
 
-void
-find_minmax(const vector<double>& numbers, double& min, double& max) {
-    min = numbers[0];
-    for (size_t i = 1; i < numbers.size(); i++) {
-        if (numbers[i] < min) {
-            min = numbers[i];
-        }
-        else if (numbers[i] > max) {
-            max = numbers[i];
-        }
-    }
-}
-
-vector<size_t>
-make_histogram(const vector <double>& numbers, size_t bin_count) {
-    double minc, maxc;
-    find_minmax(numbers, minc, maxc);
-    vector<size_t> bins(bin_count);
-    double bin_size = (maxc - minc) / bin_count;
-    size_t bin_max_size = 0;
-    for (size_t i = 0; i < numbers.size(); i++) {
-        bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
-            auto lo = minc + j * bin_size;
-            auto hi = minc + (j + 1) * bin_size;
-            if ((lo <= numbers[i]) && (numbers[i] < hi)) {
-                bins[j]++;
-                found = true;
-                if (bins[j] > bin_max_size) {
-                    bin_max_size = bins[j];
-                }
-            }
-        }
-        if (!found) {
-            bins[bin_count - 1]++;
-            if (bins[bin_count - 1] > bin_max_size) {
-                bin_max_size = bins[bin_count - 1];
-            }
-        }
-    }
-    return bins;
-}
-
-void
-show_histogram_text(vector<size_t> bins) {
-    size_t bin_max_size = 0;
-    for (auto bin : bins) {
-        if (bin_max_size < bin) {
-            bin_max_size = bin;
-        }
-    }
-    double k = double(MAX_ASTERISK) / bin_max_size;
-    if (k > 1) {
-        k = 1;
-    }
-    for (size_t bin = 0; bin < bins.size(); bin++) {
-        if (bins[bin] < 100) {
-            cout << " ";
-        }
-        if (bins[bin] < 10) {
-            cout << " ";
-        }
-        cout << bins[bin] << "|";
-        for (size_t i = 0; i < bins[bin] * k; i++) {
-            cout << "*";
-        }
-        cout << endl;
-    }
-}
-
 int main() {
     Input in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_text(bins);
+    show_histogram_svg(bins);
     return 0;
 }

marks.txt

@@ -0,0 +1,3 @@
+10
+3 3 4 4 4 4 4 5 5 5
+3

svg.cpp

@@ -0,0 +1,69 @@
+#include <iostream>
+#include <vector>
+#include <string>
+
+using namespace std;
+
+const auto IMAGE_WIDTH = 400;
+const auto IMAGE_HEIGHT = 300;
+const auto TEXT_LEFT = 20;
+const auto TEXT_BASELINE = 20;
+const auto TEXT_WIDTH = 50;
+const auto BIN_HEIGHT = 30;
+const auto BLOCK_WIDTH = 10;
+
+void
+svg_begin(double width, double height) {
+    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    cout << "<svg ";
+    cout << "width='" << width << "' ";
+    cout << "height='" << height << "' ";
+    cout << "viewBox='0 0 " << width << " " << height + 100 << "' ";
+    cout << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void
+svg_end() {
+    cout << "</svg>\n";
+}
+
+void
+svg_text(double left, double baseline, string text) {
+    cout << "<text x='" << left << "' y='" << baseline << "' >" << text << "</text> \n";
+}
+
+void
+svg_rect(double x, double y, double width, double height) {
+    cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='#6600CC' fill='#aaffaa' /> \n";
+}
+
+
+void
+show_histogram_svg(const vector<size_t>& bins) {
+    double top = 0.0;
+    double move = 0.0;
+    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
+    double k = 1.0;
+    size_t max_bin = bins[0];
+    for (size_t bin : bins) {
+        if (bin > max_bin) {
+            max_bin = bin;
+        }
+    }
+    if (max_bin * 10 > IMAGE_HEIGHT) {
+        k = double(IMAGE_HEIGHT - 10) / (max_bin * 10);
+    }
+    for (size_t bin : bins) {
+        svg_text(TEXT_LEFT + move, TEXT_BASELINE, to_string(bin));
+        move += BIN_HEIGHT;
+    }
+    top += 3 * BLOCK_WIDTH;
+    move = 13.0;
+    for (size_t bin : bins) {
+
+        const double bin_width = BLOCK_WIDTH * bin * k;
+        svg_rect(move, top, BIN_HEIGHT, bin_width);
+        move += BIN_HEIGHT;
+    }
+    svg_end();
+}

svg.h

@@ -0,0 +1,5 @@
+#pragma once
+#include <vector>
+
+void
+show_histogram_svg(const std::vector<size_t>& bins);