the third stage

histogram.cpp

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

histogram.h

@@ -0,0 +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);
+
+
+#endif // HISTOGRAM_H_INCLUDED

lab01.cbp

@@ -32,7 +32,15 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="main.cpp" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

main.cpp

@@ -1,5 +1,7 @@
 #include <iostream>
 #include <vector>
+#include "histogram.h"
+#include "text.h"
 
 using namespace std;
 
@@ -28,93 +30,7 @@ Input 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<size_t> make_histogram(const vector<double>& numbers, size_t bin_count)
-{
-    double min, max;
-    find_minmax(numbers, min, max);
-
-    double bin_size = (max - min) / bin_count;
-    vector<size_t> bins(bin_count);
-
-    for (double number : numbers)
-    {
-        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 <= number) && (number < hi))
-            {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (!found)
-        {
-            bins[bin_count - 1]++;
-        }
-    }
-    return bins;
-}
-
-void show_histogram_text(const vector<size_t>& bins, size_t bin_count) {
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-    Input in;
-
-    size_t max_count = bins[0];
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i] > max_count) {
-            max_count = bins[i];
-        }
-    }
-
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i]<10) {
-            cout << "  " << bins[i] << "|";
-            }
-        else if (bins[i]<100) {
-            cout << " " << bins[i] << "|";
-        }
-        else if (bins[i]<1000) {
-            cout << bins[i] << "|";
-        }
-
-        size_t height;
-
-        if (max_count<=MAX_ASTERISK) {
-            height = bins[i];
-        }
-        else {
-            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
-        }
-
-        for (size_t j = 0; j < height; j++) {
-            cout << "*";
-        }
-        cout << endl;
-    }
-}
 
 int main()
 {

text.cpp

@@ -0,0 +1,43 @@
+#include "text.h"
+
+using namespace std;
+
+void show_histogram_text(const vector<size_t>& bins, size_t bin_count) {
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+    size_t max_count = bins[0];
+    for (size_t i = 0; i < bin_count; i++)
+    {
+        if (bins[i] > max_count) {
+            max_count = bins[i];
+        }
+    }
+
+    for (size_t i = 0; i < bin_count; i++)
+    {
+        if (bins[i]<10) {
+            cout << "  " << bins[i] << "|";
+            }
+        else if (bins[i]<100) {
+            cout << " " << bins[i] << "|";
+        }
+        else if (bins[i]<1000) {
+            cout << bins[i] << "|";
+        }
+
+        size_t height;
+
+        if (max_count<=MAX_ASTERISK) {
+            height = bins[i];
+        }
+        else {
+            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
+        }
+
+        for (size_t j = 0; j < height; j++) {
+            cout << "*";
+        }
+        cout << endl;
+    }
+}

text.h

@@ -0,0 +1,9 @@
+#ifndef TEXT_H_INCLUDED
+#define TEXT_H_INCLUDED
+
+#include <vector>
+#include <iostream>
+
+void show_histogram_text(const std::vector<size_t>& bins, size_t bin_count);
+
+#endif // TEXT_H_INCLUDED