code: разбиение на файлы

histogram.cpp

@@ -0,0 +1,43 @@
+#include "histogram.h"
+#include <vector>
+#include <iostream>
+using namespace std;
+
+static 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;
+        }
+    }
+}
+
+std::vector<double>
+make_histogram(const std::vector<double>& numbers, size_t bin_count){
+    vector<double> bins (bin_count);
+
+    double min = 0, max = 0;
+    find_minmax(numbers, min, max);
+
+    double bin_size = (max - min) / bin_count;
+    for (int i = 0; i < numbers.size(); i++) {
+            bool found = false;
+            for (int 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;
+}

histogram.h

@@ -0,0 +1,6 @@
+#pragma once
+#include <vector>
+
+std::vector<double>
+make_histogram(const std::vector<double>& numbers, size_t bin_count);
+

main.cpp

@@ -1,6 +1,8 @@
 #include <vector>
 #include <iostream>
 #include <string>
+#include "histogram.h"
+#include "text.h"
 using namespace std;
 struct Input {
     vector<double> numbers;
@@ -26,65 +28,6 @@ input_data() {
     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 <double>
-make_histogram(const vector<double>& numbers, size_t bin_count){
-    vector<double> bins (bin_count);
-
-    double min = 0, max = 0;
-    find_minmax(numbers, min, max);
-
-    double bin_size = (max - min) / bin_count;
-    for (int i = 0; i < numbers.size(); i++) {
-            bool found = false;
-            for (int 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<double>& bins,size_t MAX_ASTERISK, size_t bin_count){
-    double max_count = bins[0];
-    for (double x: bins){
-        if (x > max_count) {
-            max_count = x;
-        }
-    }
-
-    for (int i = 0; i < bin_count; i++){
-        double count = bins[i];
-        size_t height = MAX_ASTERISK * (static_cast<double>(count) / max_count);
-        string line (height , '*');
-        if (bins[i]<100)
-            {cout << ' ';}
-        if (bins[i]<10)
-        {cout << ' ';}
-        cout << bins[i] << "|" << line << endl;
-    }
-}
 int main()
 {
     const size_t SCREEN_WIDTH = 80;

text.cpp

@@ -0,0 +1,25 @@
+#include "text.h"
+#include <string>
+#include <iostream>
+using namespace std;
+
+void
+show_histogram_text (const vector<double>& bins,size_t MAX_ASTERISK, size_t bin_count){
+    double max_count = bins[0];
+    for (double x: bins){
+        if (x > max_count) {
+            max_count = x;
+        }
+    }
+
+    for (int i = 0; i < bin_count; i++){
+        double count = bins[i];
+        size_t height = MAX_ASTERISK * (static_cast<double>(count) / max_count);
+        string line (height , '*');
+        if (bins[i]<100)
+            {cout << ' ';}
+        if (bins[i]<10)
+        {cout << ' ';}
+        cout << bins[i] << "|" << line << endl;
+    }
+}

text.h

@@ -0,0 +1,5 @@
+#pragma once
+#include <vector>
+
+void
+show_histogram_text (const std::vector<double>& bins,size_t MAX_ASTERISK, size_t bin_count);