code: добавлена переменная-поток

histogram.cpp

@@ -1,15 +1,13 @@
 #include "histogram.h"
 #include <vector>
-#include <numeric>
 using namespace std;
 
 void find_minmax(const vector<double>& numbers, double& min, double& max) {
-    if (numbers.empty()) return;
     max = numbers[0];
-    min = numbers[0];
+    min = numbers[1];
     for (double x : numbers) {
         if (x < min) min = x;
-        if (x > max) max = x;
+        else if (x > max) max = x;
     }
 }
 
@@ -36,8 +34,3 @@ vector<size_t> make_histogram(vector<double> numbers, size_t bin_count) {
     return bins;
 }
 
-double calculate_average_height(const vector<size_t>& bins) {
-    if (bins.empty()) return 0.0;
-    double sum = accumulate(bins.begin(), bins.end(), 0.0);
-    return sum / bins.size();
-}

histogram.h

@@ -1,7 +1,9 @@
 #ifndef HISTOGRAM_H_INCLUDED
 #define HISTOGRAM_H_INCLUDED
+
 #include <vector>
 using namespace std;
+
 vector<size_t> make_histogram(vector<double> numbers, size_t bin_count);
 double calculate_average_height(const vector<size_t>& bins);
 

histogram_internal.h

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

main.cpp

@@ -3,34 +3,33 @@
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
-#include "histogram_internal.h"
 using namespace std;
 
-
 struct Input {
     vector<double> numbers;
-    size_t bin_count{};
+    size_t bin_count;
 };
 
-Input input_data(){
+Input input_data(istream& in) {
-    size_t number_count, bin_count;
+   Input inp;
+    size_t number_count;
     cerr << "Enter number count: ";
     cin >> number_count;
-    Input in;
+    inp.numbers.resize(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 >> inp.numbers[i];
-        cerr << "Enter Num[" << i << "]: ";
-        cin >> in.numbers[i];
     }
+
     cerr << "Enter bin count: ";
-    cin >> in.bin_count;
+    cin >> inp.bin_count;
-    return in;
+    return inp;
 }
 
-int main()
+
-{
+
-    auto in = input_data();
+int main() {
+    auto in = input_data(cin);
     auto bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_svg(bins);
     return 0;

svg.cpp

@@ -2,7 +2,7 @@
 #include <vector>
 #include <string>
 #include "svg.h"
-#include "histogram.h"
+
 using namespace std;
 
 void svg_begin(double width, double height) {
@@ -22,7 +22,7 @@ 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, string stroke, string fill) {
+void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") {
     cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height
          << "' stroke='" << stroke << "' fill='" << fill << "' />\n";
 }
@@ -51,13 +51,10 @@ void show_histogram_svg(const vector<size_t>& bins) {
         }
     }
 
-    double avg_height = calculate_average_height(bins);
-
     for (size_t bin : bins) {
         const double bin_width = MAX_WIDTH * (static_cast<double>(bin) / max_count);
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        string fill_color = (bin > avg_height) ? "red" : "green";
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "red");
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", fill_color);
         top += BIN_HEIGHT;
     }
 

text.cpp

@@ -1,37 +1,9 @@
-#include "text.h"
+#ifndef TEXT_H_INCLUDED
-#include <iostream>
+#define TEXT_H_INCLUDED
+
+#include <vector>
 using namespace std;
 
-void show_histogram_text(vector<size_t> bins, size_t bin_count) {
+void show_histogram_text(vector<size_t> bins, size_t bin_count);
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-    double max_bin;
-    size_t height;
-    max_bin = bins[0];
-    height = bins[0];
-    for (size_t i = 0; i < bin_count; i++) {
-        if (bins[i] > max_bin) {
-            max_bin = bins[i];
-        }
-    }
 
-    bool flag = false;
+#endif
-    if (max_bin > 80) {
-        flag = true;
-    }
-    for (size_t i = 0; i < bin_count; i++) {
-        if (bins[i] < 100) cout << " ";
-        if (bins[i] < 10) cout << " ";
-        cout << bins[i] << "|";
-        if (flag == true) {
-            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin);
-        }
-        else {
-            height = bins[i];
-        }
-        for (size_t j = 0; j < height; j++) {
-            cout << "*";
-        }
-        cout << endl;
-    }
-}