svg: пустое изображение

lab01/doctest.h

@@ -1,4 +1,4 @@
-====================================================================== lgtm [cpp/missing-header-guard]
+//====================================================================== lgtm [cpp/missing-header-guard]
 // == DO NOT MODIFY THIS FILE BY HAND - IT IS AUTO GENERATED BY CMAKE! ==
 // ======================================================================
 //
@@ -5724,7 +5724,7 @@ namespace {
 
                 std::tm timeInfo;
 #ifdef DOCTEST_PLATFORM_WINDOWS
-                gmtime_s(&timeInfo, &rawtime);
+//                gmtime_s(&timeInfo, &rawtime);
 #else // DOCTEST_PLATFORM_WINDOWS
                 gmtime_r(&rawtime, &timeInfo);
 #endif // DOCTEST_PLATFORM_WINDOWS

lab01/main.cpp

@@ -1,6 +1,9 @@
 #include <vector>
 #include <iostream>
 #include <string>
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"
 using namespace std;
 struct Input {
     vector<double> numbers;
@@ -26,65 +29,7 @@ input_data() {
     return in;
 }
 
-void
-find_minmax(const vector<double>& numbers, double& min, double& max) {
-    min = numbers[0];
-    max = numbers[0];
-    for (double x : numbers) {
-        if (x < min) {
-            min = x;
-        }
-        else if (x > max) {
-                max = x;
-        }
-    }
-}
-
-vector <double>
-make_histogram(const vector<double>& numbers, size_t bin_count){
-    vector<double> bins (bin_count);
 
-    double min = 0, max = 0;
-    find_minmax(numbers, min, max);
-
-    double bin_size = (max - min) / bin_count;
-    for (int i = 0; i < numbers.size(); i++) {
-            bool found = false;
-            for (int j = 0; (j < bin_count - 1) && !found; j++) {
-                auto lo = min + j * bin_size;
-                auto hi = min + (j + 1) * bin_size;
-                if ((lo <= numbers[i]) && (numbers[i] < hi)) {
-                    bins[j]++;
-                    found = true;
-                }
-            }
-            if (!found) {
-                bins[bin_count - 1]++;
-            }
-    }
-    return bins;
-}
-
-void
-show_histogram_text (const vector<double>& bins,size_t MAX_ASTERISK, size_t bin_count){
-    double max_count = bins[0];
-    for (double x: bins){
-        if (x > max_count) {
-            max_count = x;
-        }
-    }
-
-    for (int i = 0; i < bin_count; i++){
-        double count = bins[i];
-        size_t height = MAX_ASTERISK * (static_cast<double>(count) / max_count);
-        string line (height , '*');
-        if (bins[i]<100)
-            {cout << ' ';}
-        if (bins[i]<10)
-        {cout << ' ';}
-        cout << bins[i] << "|" << line << endl;
-    }
-}
 int main()
 {
     const size_t SCREEN_WIDTH = 80;
@@ -92,6 +37,6 @@ int main()
 
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, MAX_ASTERISK, in.bin_count);
+    show_histogram_svg(bins);
     return 0;
 }

lab01/svg.cpp

@@ -0,0 +1,24 @@
+#include <iostream>
+#include <vector>
+using namespace std;
+
+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 << "' ";
+    cout << "xmlns='http://www.w3.org/2000/svg'>\n";
+}
+
+void
+svg_end() {
+    cout << "</svg>\n";
+}
+
+void
+show_histogram_svg(const vector <double>& bins) {
+    svg_begin(400, 300);
+    svg_end();
+}

lab01/svg.h

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

lab01/text.cpp

@@ -4,7 +4,7 @@
 using namespace std;
 
 void
-show_histogram_text (const vector<double>& bins,size_t MAX_ASTERISK, size_t bin_count){
+show_histogram_text (const vector<double>& bins, size_t MAX_ASTERISK, size_t bin_count){
     double max_count = bins[0];
     for (double x: bins){
         if (x > max_count) {