From ba2eac6cbc20b324dd79d0c10958c5612524b6ff Mon Sep 17 00:00:00 2001
From: KhatyukhinYS <KhatyukhinYS@mpei.ru>
Date: Sun, 19 May 2024 17:23:06 +0300
Subject: [PATCH] code: function input_data()

---
 main.cpp | 21 ++++++++++++---------
 svg.cpp  | 16 ----------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/main.cpp b/main.cpp
index e9ce501..e5fc791 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,26 +6,29 @@
 #include "procent.h"
 using namespace std;
 struct Input {
-    std::vector<double> numbers;
+    vector<double> numbers;
     size_t number_count{};
     size_t bin_count{};
+    size_t max_count{};
 };
 Input
-input_data() {
-    size_t number_count;
+input_data(istream& inn) {
     Input in;
-    cin >> number_count;
-    in.numbers.resize(number_count);
-    for (size_t i = 0; i < number_count; i++) {
-        cin >> in.numbers[i];
+    inn >> in.number_count;
+    vector<double> numbers(in.number_count);
+    in.numbers.resize(in.number_count);
+    for (size_t i = 0; i < in.number_count; i++) {
+        inn >> in.numbers[i];
     }
     size_t bin_count;
-    cin >> in.bin_count;
+    inn >> in.bin_count;
+    size_t max_count;
+    in.max_count = 0;
     return in;
 }
 int main()
 {
-    auto in = input_data();
+    auto in = input_data(cin);
 
     auto bins = make_histogram(in.numbers, in.bin_count);
     auto max_count=bins[0];
diff --git a/svg.cpp b/svg.cpp
index 1c415f3..df48293 100644
--- a/svg.cpp
+++ b/svg.cpp
@@ -19,11 +19,6 @@ svg_text(double left, double baseline, std::string text) {
     std::cout << "<text x='"<< left <<"' y='"<< baseline <<"'>"<< text <<"</text>";
 }
 
-void
-svg_proc(double left, double baseline) {
-    std::cout << "<text x='"<< left <<"' y='"<< baseline<<"</text>";
-}
-
 void svg_rect(double x, double y, double width, double height,std::string stroke = "black", std::string fill = "green"){
     std::cout<< "<rect x='"<< x <<"' y='"<< y <<"' width='"<< width <<"' height='"<< height <<"' stroke = '" << stroke <<"' fill = '" << fill <<"' />";
 }
@@ -55,7 +50,6 @@ show_histogram_svg(std::vector<size_t> bins,size_t max_count) {
         const auto TEXT_LEFT_PROCENT = SCALE+TEXT_WIDTH+20;
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
         svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
-        svg_proc(TEXT_LEFT_PROCENT, top + TEXT_BASELINE);
 
         top += BIN_HEIGHT;
         }}
@@ -65,19 +59,9 @@ show_histogram_svg(std::vector<size_t> bins,size_t max_count) {
         const auto TEXT_LEFT_PROCENT = (max_count*SCALE)+TEXT_WIDTH+20;
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
         svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
-        svg_proc(TEXT_LEFT_PROCENT, top + TEXT_BASELINE);
 
         top += BIN_HEIGHT;
     }
     svg_end();
     }
-    /*for (size_t i = 0; i < bins.size(); i++) {
-        const double bin_width = BLOCK_WIDTH * bins[i];
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
-        svg_proc(BLOCK_WIDTH*bins[i]+TEXT_LEFT+50, top + TEXT_BASELINE,procent[i]);
-
-        top += BIN_HEIGHT;
     }
-    svg_end();
-}*/}