code: структурирование

.gitignore

@@ -1,3 +1,4 @@
 cs-lab34.cbp
+cs-lab34.depend
 /bin
 /obj

main.cpp

@@ -2,51 +2,84 @@
 #include <vector>
 
 using namespace std;
+const size_t SCREEN_WIDTH = 80;
+const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 
-int main(){
+struct Input {
-    size_t bin_count, numbers_count;
+    vector<double> numbers;
-    const size_t SCREEN_WIDTH = 80;
+    size_t bin_count{};
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+};
-    cerr << "Enter number count and bin count:";
+
-    cin >> numbers_count >> bin_count;
+Input input_data() {
-    vector<double> numbers ( numbers_count );
+
-    for (size_t i=0; i < numbers_count; i++){
+    size_t number_count;
-        cin >> numbers[i];
+
+    cerr << "Enter number count: ";
+    cin >> number_count;
+
+    Input in;
+
+    cerr << "Enter number of bins: ";
+    cin >> in.bin_count;
+
+    in.numbers.resize(number_count);
+
+    cerr << "Enter numbers: ";
+    for (size_t i = 0; i < number_count; i++)
+    {
+        cin >> in.numbers[i];
     }
-    vector<size_t> bins ( bin_count );
+
-    double minx = numbers[0];
+    return in;
-    double maxx = numbers[0];
+}
+
+void find_minmax(const vector<double> &numbers, double &min, double &max){
+    min = numbers[0];
+    max = numbers[0];
     for ( double x : numbers ){
-        if ( x < minx ){
+        if ( x < min ){
-            minx = x;
+            min = x;
-        } else if ( x > maxx ){
+        } else if ( x > max ){
-            maxx = x;
+            max = x;
         }
     }
-    double bin_size = ( maxx - minx ) / bin_count;
+}
-    for (size_t i=0; i < numbers_count; i++ ){
+
+int main(){
+
+    Input in = input_data();
+
+    vector<size_t> bins ( in.bin_count );
+    double min = in.numbers[0];
+    double max = in.numbers[0];
+
+    find_minmax(in.numbers, min, max);
+
+
+    double bin_size = ( max - min ) / in.bin_count;
+    for (size_t i=0; i <  in.numbers.size(); i++ ){
         bool found = false;
-        for (size_t j = 0; ( j < bin_count - 1 ) && !found; j++ ){
+        for (size_t j = 0; ( j < in.bin_count - 1 ) && !found; j++ ){
-            auto lo = minx + j * bin_size;
+            auto lo = min + j * bin_size;
-            auto hi = minx + ( j + 1 ) * bin_size;
+            auto hi = min + ( j + 1 ) * bin_size;
-            if (lo <= numbers[i] && ( numbers[i] < hi )){
+            if (lo <= in.numbers[i] && ( in.numbers[i] < hi )){
                 bins[j]++;
                 found = true;
             }
         }
         if ( !found ){
-            bins[bin_count-1]++;
+            bins[in.bin_count-1]++;
         }
     }
-
+    //
     size_t maxbin = bins[0];
-    for (size_t i=1; i < bin_count; i++){
+    for (size_t i=1; i < in.bin_count; i++){
         if (maxbin < bins[i]){
             maxbin = bins[i];
         }
     }
     if (maxbin <=MAX_ASTERISK){
-        for ( size_t i=0; i < bin_count; i++ ){
+        for ( size_t i=0; i < in.bin_count; i++ ){
             if ((bins[i] < 1000)&&(bins[i] > 99)){
                 cout << bins[i] << "|";
                 for ( size_t j=0; j < bins[i]; j++ ){
@@ -68,7 +101,7 @@ int main(){
             }
         }
     } else {
-        for (size_t i=0; i < bin_count; i++){
+        for (size_t i=0; i < in.bin_count; i++){
             size_t heightG= MAX_ASTERISK * (static_cast<double>(bins[i]) / maxbin);
             if ((bins[i] < 1000)&&(bins[i] > 99)){
                 cout << bins[i] << "|";
@@ -88,7 +121,7 @@ int main(){
                     cout << "*";
                 }
                 cout << endl;
+                }
             }
         }
     }
-}