code: разделение программы

histogram.cpp

@@ -1,38 +1,40 @@
 #include "histogram.h"
 #include <vector>
+#include <iostream>
+using namespace std;
 
 void
-find_minmax(const std::vector<double> numbers, double& min, double& max) {
+find_minmax(const std::vector<double>& numbers, double& min, double& max) {
     min = numbers[0];
     max = numbers[0];
     for (double x : numbers)
-    {
+        {
-
+            if (x < min) {min = x;}
-        if(x < min){min = x;}
+            else if (x > max) {max = x;}
-        else if (x > max){max = x;}
+        }
-    }
+}
-    }
 
-std::vector<size_t>
+std::vector<double>
-make_histogram(const std::vector<double>& numbers, size_t bin_count){
+make_histogram(const std::vector<double>& numbers, size_t bin_count)
-    std::vector<size_t> bins(bin_count);
+{
-    double min = 0;
+    std::vector<double> bins (bin_count);
-    double max = 0;
+    double min = 0, max = 0;
     find_minmax(numbers, min, max);
     double bin_size = (max - min) / bin_count;
-    for (size_t i =0; i < numbers.size(); i++)
+    for (int 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;
+            bool found = false;
-            auto hi = min + (j+1) * bin_size;
+            for (int j = 0; (j < bin_count - 1) && !found; j++)
-            if ((lo <= numbers[i]) && (numbers[i] < hi))
             {
-                bins[j]++;
+                auto lo = min + j * bin_size;
-                found = true;
+                auto hi = min + (j + 1) * bin_size;
-            }}
+                if ((lo <= numbers[i]) && (numbers[i] < hi))
-        if (!found){bins[bin_count - 1]++;}
+                {
-    }
+                    bins[j]++;
+                    found = true;
+                }
+            }
+            if (!found) {bins[bin_count - 1]++;}
+        }
     return bins;
-    }
+}