5. добавлен вывод svg гистограммы

lab01.cbp

@@ -32,7 +32,13 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h">
+			<Option target="Release" />
+		</Unit>
 		<Unit filename="main.cpp" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

main.cpp

@@ -1,111 +1,39 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
+#include "text.h"
+#include "histogram_internal.h"
+#include "svg.h"
 
 using namespace std;
-
+struct Input {
-int main()
+    vector<double> numbers;
-{
+    size_t bin_count{};
-    const size_t SCREEN_WIDTH = 80;
+    };
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
-    size_t number_count;//êîëâî ÷èñåë
+Input
-    cerr << "Enter number count: ";
+input_data(){
+    Input in;
+    size_t number_count;
+    cerr << "Enter numbers count: ";
     cin >> number_count;
-    vector<double> numbers(number_count); //ìàññèâ ÷èñåë
+    in.numbers.resize(number_count);
 
-    //ââîä çíà÷åíèé
+    cerr << "Enter numbers: ";
-    for (size_t i=0; i<number_count; i++)
+    for (size_t i = 0; i < number_count; i++) {
-    {
+        cin >> in.numbers[i];
-        cin >> numbers[i];
     }
-    size_t bin_count;
     cerr << "Enter bin count: ";
-    cin >> bin_count;
+    cin >> in.bin_count;
-
-    vector<size_t> bins(bin_count); //ìàññèâ êîëâà ÷èñåë â êîðçèíàõ
-
-    double min = numbers[0];
-    double max = numbers[0];
-    for (double x : numbers)
-    {
-        if (x < min)
-        {
-            min = x;
-        }
-        else if (x > max)
-        {
-            max = x;
-        }
-    }
-
-    double bin_size = (max - min) / bin_count; //ðàçìåð êîðçèíû
-
-    for (size_t i = 0; i < number_count; i++)
-    {
-        bool found = false;
-        for (size_t 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]++;
-        }
-    }
-    double max_count;
 
-    //ìàêñèìàäáíîå êîëâî ÷èñåë â êîðçèíå ñðåäè âñåõ êîðçèí
+    return in;
-    max_count = bins[0];
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i] > max_count)
-        {
-            max_count = bins[i];
-        }
     }
 
-    //âûâîä ñ âûðàâíèâàíèåì è ìàñøòàáèðîâàíèåì
+int main()
-    for (size_t i = 0; i < bin_count; i++)
+{
-    {
+    auto in = input_data();
-        size_t height;
+    auto bins = make_histogram(in.numbers, in.bin_count);
-        if (max_count <= MAX_ASTERISK)
+    show_histogram_svg(bins, in.bin_count);
-        {
-            height = bins[i];
-        }
-        else
-        {
-            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
-        }
-
-
-        if (bins [i] < max_count){
-            size_t pr_count = max_count - bins[i];
-        for (size_t k = 0; k < pr_count; k++){
-            cout << " ";
-        }
-        }
-
-        for (size_t j = 0; j < height; j++)
-        {
-            cout << "*";
-        }
-        cout << "|";
-
-        if (bins[i] < 100)
-        {
-            cout << " ";
-        }
-        if (bins[i] < 10)
-        {
-            cout << " ";
-        }
-        cout << bins[i] << endl;
-    }
 
     return 0;
 }