show_histogram

maincpp.cpp

@@ -26,33 +26,35 @@ void find_minmax(vector<double> vec, double& min, double& max) {
         if (x < min) {
             min = x;
         }
-        else
+        else if(x > max)
         {
             max = x;
         }
     }
 }
-int main() {
+vector<size_t> make_histogram(size_t number, vector<double> vec) {
-    auto in = input_data();
+    vector<size_t> bins(number);
-    vector<size_t> bins(in.korz);
     double mn, mx;
-    find_minmax(in.vec, mn, mx);
+    find_minmax(vec, mn, mx);
-    float bin_size = (mx - mn) / in.korz;
+    float bin_size = (mx - mn) / number;
-    for (size_t i = 0; i < in.vec.size(); i++) {
+    for (size_t i = 0; i < vec.size(); i++) {
         bool fl = false;
-        for (size_t j = 0; (j < in.korz - 1) && !fl; j++) {
+        for (size_t j = 0; (j < number - 1) && !fl; j++) {
             auto lo = mn + j * bin_size;
             auto hi = mn + (j + 1) * bin_size;
-            if ((lo <= in.vec[i]) && (in.vec[i] < hi)) {
+            if ((lo <= vec[i]) && (vec[i] < hi)) {
                 bins[j]++;
                 fl = true;
             }
         }
         if (!fl) {
-            bins[in.korz - 1]++;
+            bins[number - 1]++;
 
         }
     }
+    return bins;
+}
+void show_histogram(vector<size_t> bins) {
     bool gigant = false;
     auto spaces = 0;
     size_t mx_count = 0;
@@ -133,3 +135,9 @@ int main() {
         }
     }
 }
+int main() {
+    auto in = input_data();
+    auto bins = make_histogram(in.korz, in.vec);
+    show_histogram(bins);
+    
+}