code: Ввод из произвольного потока

main.cpp

@@ -1,6 +1,9 @@
 #include <iostream>
 #include <cmath>
 #include <vector>
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"
 using namespace std;
 
 const size_t SCREEN_WIDTH = 80;
@@ -9,115 +12,48 @@ const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
+    vector<string> fill;
 };
 
 Input
-input_data()
+input_data(istream& inx)
 {
 
 size_t number_count;
 cerr << "number_count= ";
-cin >> number_count;
+inx >> number_count;
 
 Input in;
 
 in.numbers.resize(number_count);
 cerr << "numbers: ";
 for (size_t i = 0; i < number_count; i++) {
-    cin >> in.numbers[i];
+    inx >> in.numbers[i];
 }
 
 cerr << "bin_count= ";
-cin >> in.bin_count;
+inx >> in.bin_count;
 
-return in;
+in.fill.resize(in.bin_count);
-}
-
-void
-find_minmax(const vector<double>& numbers, double &min, double &max)
-{
 
-    min = numbers[0];
+for (size_t i = 0; i < in.bin_count; i++)
-    max = numbers[0];
-    for (size_t i = 0; i < numbers.size(); i++)
     {
-        if (numbers[i] > max)
+        cerr << "Cvet: ";
-            max = numbers[i];
+        inx >> in.fill[i];
-        if (numbers[i] < min)
-            min = numbers[i];
     }
-}
-
-vector <size_t> make_histogram (const vector<double>& numbers, size_t &bin_count)
-{
-   vector <size_t> bins(bin_count);
-
-   double min, max;
-   float low, hi;
 
-   find_minmax(numbers, min, max);
+return in;
-
-   double bin_size = (max - min) / bin_count;
-   low = min;
-    hi = low + bin_size;
-
-    for (size_t i = 0; i < numbers.size(); i++)
-    {
-        bool found = false;
-
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++)
-        {
-            low = min + j * bin_size;
-            hi = min + (j + 1) * bin_size;
-            if ((low <= numbers[i]) && (numbers[i] < hi))
-            {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (found==false)
-        {
-            bins[bin_count - 1]++;
-        }
-    }
-    return bins;
-}
-
-void show_histogram_text(const vector<size_t>& bins, size_t &bin_count)
-{
-
-size_t max_bin = bins[0];
-for (size_t bin : bins)
-if (bin > max_bin)
-max_bin = bin;
-for (size_t bin : bins)
-{
-int height = bin;
-if (max_bin > MAX_ASTERISK)
-{
-height = MAX_ASTERISK * (static_cast<double>(bin) / max_bin);
-}
-if (bin < 100)
-cout << " ";
-if (bin < 10)
-cout << " ";
-cout << bin << "|";
-for (int i = 0; i < height; i++)
-cout << "*";
-cout << endl;
-}
 }
 
 
 int
 main()
 {
-
+    auto in = input_data(cin);
-    auto in = input_data();
 
     auto bins = make_histogram(in.numbers, in.bin_count);
 
-    show_histogram_text(bins, in.bin_count);
+    show_histogram_svg(bins, in.fill);
 
     return 0;
 }