code: программа разбита на файлы 2

.gitignore

@@ -0,0 +1,4 @@
+lab03.cbp
+/bin
+/obj
+lab03.depend

main.cpp

@@ -1,140 +1,42 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
+#include "text.h"
 using namespace std;
 
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
+    size_t number_count{};
+    size_t max_count{};
 };
 
 Input
 input_data() {
     Input in;
+    cerr << "Enter number count: ";
+    cin >> in.number_count;
 
-    size_t number_count;
-    cerr << "Enter quantity of numbers: ";
-    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++) {
+    vector<double> numbers(in.number_count);
+    in.numbers.resize(in.number_count);
+    for (size_t i = 0; i < in.number_count; i++) {
         cin >> in.numbers[i];
     }
 
+    size_t bin_count;
     cerr << "Enter bin count: ";
     cin >> in.bin_count;
 
+    size_t max_count;
+    in.max_count = 0;
     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 <size_t>
-make_histogram(const vector<double> numbers, size_t bin_count) {
-    double min;
-    double max;
-
-    find_minmax(numbers, min, max);
-
-    vector<size_t> bins(bin_count);
-    double bin_size = (max - min) / bin_count;
-    for (size_t i = 0; i < numbers.size(); 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]++;
-        }
-    }
-    return bins;
-}
-
-void show_histogram_text(const vector<size_t> bins, size_t bin_count) {
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-    int max_count = 0;
-    for (int i =0; i<bin_count;i++){
-        if (bins[i]>max_count){
-            max_count=bins[i];
-        }
-    }
-    if (max_count>MAX_ASTERISK){
-        for (int i=0; i<bin_count; i++){
-            size_t height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
-            if (bins[i]<10){
-                cout<<"  "<<bins[i]<<"|";
-                for (int j=0;j<height;j++){
-                    cout<<"*";
-                }
-                cout<<endl;
-            }
-            else if(bins[i]<100){
-                cout<<" "<<bins[i]<<"|";
-                for (int j=0;j<height;j++){
-                    cout<<"*";
-                }
-                cout<<endl;
-            }
-            else{
-                cout<<bins[i]<<"|";
-                for (int j=0;j<height;j++){
-                    cout<<"*";
-                }
-                cout<<endl;
-            }
-
-    }
-    }else{
-        for (int i=0; i<bin_count; i++){
-            if (bins[i]<10){
-                cout<<"  "<<bins[i]<<"|";
-                for (int j=0;j<bins[i];j++){
-                    cout<<"*";
-                }
-                cout<<endl;
-            }
-            else if(bins[i]<100){
-                cout<<" "<<bins[i]<<"|";
-                for (int j=0;j<bins[i];j++){
-                    cout<<"*";
-                }
-            cout<<endl;
-            }
-            else{
-                cout<<bins[i]<<"|";
-                for (int j=0;j<bins[i];j++){
-                    cout<<"*";
-                }
-                cout<<endl;
-            }
-
-        }
-    }
-}
+int main()
+{
+    Input in = input_data();
+    vector<size_t> bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
+    show_histogram_text(bins, in.max_count, in.bin_count);
+    return 0;
 
-int
-main(){
-    auto in = input_data();
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
 }