code:split_on_files_fixed[3]

histogram.cpp

@@ -1 +1,41 @@
 #include "histogram.h"
+
+std::vector<size_t> make_histogram(std::vector<double> numbers, size_t bin_count)
+{
+    double max;
+    double min;
+    std::vector<size_t> bins;
+    bins.resize(bin_count);
+    find_minmax(numbers, min, max);
+    double bin_size = (max - min) / bin_count;
+    for (size_t 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;
+            auto hi = min + (j + 1) * bin_size;
+            if ((lo <= numbers[i]) && (hi > numbers[i])) {
+                bins[j]++;
+                found = true;
+            }
+        }
+        if (!found) {
+            bins[bin_count - 1]++;
+        }
+    }
+    return bins;
+}
+
+
+static void find_minmax(std::vector<double> numbers, double& min, double& max) {
+    min = numbers[0];
+    max = numbers[0];
+    for (double number : numbers) {
+        if (min > number) {
+            min = number;
+        }
+        if (max < number) {
+            max = number;
+        }
+    }
+    return;
+}

histogram.h

@@ -1,9 +1,10 @@
 #ifndef HISTOGRAM_H_INCLUDED
 #define HISTOGRAM_H_INCLUDED
 
-
 #include <vector>
 
-std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t bin_count);
+
+static void find_minmax(std::vector<double> numbers, double& min, double& max);
+std::vector<size_t> make_histogram(std::vector<double> numbers, size_t bin_count);
 
 #endif // HISTOGRAM_H_INCLUDED

main.cpp

@@ -1,53 +1,31 @@
+using namespace std;
+#include "histogram.h"
+#include "text.h"
 
-#include <vector>
-#include <iostream>
 #include <cstdio>
 
-using namespace std;
 struct Input {
-    vector<double> numbers;
+    std::vector<double> numbers;
     size_t bin_count{};
 };
 
-void find_minmax(vector<double> numbers, double& min, double& max);
+
-size_t maxBin(vector<size_t> bins);
+
-vector<size_t> make_histogram(vector<double> numbers, size_t bin_count);
 Input input_data();
-void show_histogram_text(vector<size_t> bins , size_t bin_count);
+
-const size_t SCREEN_WIDTH = 80;
+
-const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 
 int main()
 {
 
     Input in = input_data();
-    vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
+    std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
     show_histogram_text(bins, in.bin_count);
     return 0;
 }
 
-size_t maxBin(vector<size_t> bins) {
+
-    size_t max = bins[0];
+
-    for (int i = 1; i < bins.size(); i++) {
-        if (max < bins[i]) {
-            max = bins[i];
-        }
-    }
-    return max;
-}
-void find_minmax(vector<double> numbers, double& min, double& max) {
-    min = numbers[0];
-    max = numbers[0];
-    for (double number : numbers) {
-        if (min > number) {
-            min = number;
-        }
-        if (max < number) {
-            max = number;
-        }
-    }
-    return;
-}
 
 
 Input input_data() {
@@ -69,59 +47,7 @@ Input input_data() {
     return input_struct;
 }
 
-vector<size_t> make_histogram(vector<double> numbers, size_t bin_count)
+
-{
-    double max;
-    double min;
-    vector<size_t> bins;
-    bins.resize(bin_count);
-    find_minmax(numbers, min, max);
-    double bin_size = (max - min) / bin_count;
-    for (size_t 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;
-            auto hi = min + (j + 1) * bin_size;
-            if ((lo <= numbers[i]) && (hi > numbers[i])) {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (!found) {
-            bins[bin_count - 1]++;
-        }
-    }
-    return bins;
-}
-void show_histogram_text(vector<size_t> bins , size_t bin_count) {
-    size_t maxCount = maxBin(bins);
-    size_t count_stars;
-    for (size_t i = 0; i < bin_count; i++) {
-
-        if (bins[i] < 100) {
-            cout << " ";
-        }
-        if (bins[i] < 10) {
-            cout << " ";
-        }
-
-        cout << bins[i];
-        cout << "|";
-
-        if (maxCount > MAX_ASTERISK) {
-            count_stars = MAX_ASTERISK * (static_cast<double>(bins[i]) / maxCount);
-        }
-        else {
-            count_stars = bins[i];
-        }
-        for (size_t i2 = 0; i2 < count_stars; i2++) {
-            cout << "*";
-        }
-        cout << endl;
-
-
-    }
-}