code: Добавлены функции make_histogram и show_histogram_text

.gitignore

@@ -0,0 +1,5 @@
+/bin
+/obj
+03-scaling.input.txt
+LAB1.layout
+main.exe

main.cpp

@@ -2,21 +2,38 @@
 #include <vector>
 using namespace std;
 
-int main()
-{
 const size_t SCREEN_WIDTH = 80;
 const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 
-    size_t number_count, bin_count, i, bin;
-    //cout << "Enter number count: " << endl;
+struct Input {
+    vector<double> numbers;
+    size_t bin_count{};
+};
+
+Input
+input_data(){
+
+    size_t number_count;
+    cerr << "Enter number_count: ";
     cin >> number_count;
-    vector<double> numbers(number_count);
-    //cout<< "Enter numbers: "<<endl;
+
+    Input in;
+    in.numbers.resize(number_count);
+    cerr << "Enter numbers: ";
     for (size_t i = 0; i < number_count; i++){
-        cin>>numbers[i];
+        cin >> in.numbers[i];
     }
-    double min = numbers[0];
-    double max = numbers[0];
+
+    cerr << "Enter bin count: ";
+    cin >> in.bin_count;
+
+    return in;
+}
+
+void
+find_minmax(vector<double>& numbers, double& min, double& max){
+    min = numbers[0];
+    max = numbers[0];
     for (double x : numbers) {
         if (x < min) {
             min = x;
@@ -25,42 +42,36 @@ int main()
             max = x;
         }
     }
+}
 
-    //cout<< "Enter bin count: "<<endl;
-    cin>>bin_count;
-    vector<size_t> bins(bin_count);
+vector<size_t> make_histogram(vector<double>& numbers, size_t bin_count) {
+    double min, max;
+    find_minmax(numbers, min, max);
+
+    vector<size_t> bins(bin_count, 0);
     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;
+    for (double number : numbers) {
+        size_t bin_index = bin_count - 1;  // default to last bin
+        if (number < max) {
+            bin_index = static_cast<size_t>((number - min) / bin_size);
         }
+        bins[bin_index]++;
     }
-        if (!found) {
-            bins[bin_count - 1]++;
-            }
+
+    return bins;
 }
+
+void show_histogram_text(const vector<size_t>& bins){
+    size_t i;
     size_t height = 0;
     size_t max_count = 0;
-    for (i = 0; i < bin_count; i++){
-        if (bins[i] > max_count) max_count = bins[i];
+    for (size_t x: bins) {
+        if (x > max_count) {
+            max_count = x;
         }
-    /*for(size_t bin:bins){
-        size_t height = bin;
-        height = MAX_ASTERISK * (static_cast<double>(bin) / max_count);
-        if(bin<100) cout<<" ";
-        if(bin<10) cout<<" ";
-        cout<<bin<<"|";
-        for(size_t i = 0; i < height; i++){
-            cout<<"*";
     }
-        cout<<endl;
-    }*/
+    if (max_count > MAX_ASTERISK) {
         for(size_t bin:bins){
             size_t height = bin;
             height = MAX_ASTERISK * (static_cast<double>(bin) / max_count);
@@ -72,5 +83,25 @@ int main()
             if(bin<10) cout<<" ";
             cout<<bin<<endl;
         }
+    } else {
+        for(size_t bin:bins){
+            size_t height = bin;
+            for(size_t i = 0; i < height; i++){
+                cout<<"*";
+            }
+            cout<<"|";
+            if(bin<100) cout<<" ";
+            if(bin<10) cout<<" ";
+            cout<<bin<<endl;
+        }
+    }
+}
+
+int
+main()
+{
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_text(bins);
     return 0;
 }