histogram.cpp

@@ -1,32 +0,0 @@
-#include "histogram.h"
-#include "histogram_internal.h"
-#include <vector>
-#include <cstddef>
-
-using namespace std;
-
-void find_minmax(const vector<double>& numbers, double& min, double& max) {
-    if (numbers.empty()) {
-        return;
-    }
-    min = numbers[0];
-    max = numbers[0];
-
-    for (double x : numbers) {
-        if (x < min) min = x;
-        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);
-
-    vector<size_t> bins(bin_count);
-    for (double x : numbers) {
-        size_t bin_index = (x - min) / (max - min) * bin_count;
-        if (bin_index == bin_count) bin_index--;
-        bins[bin_index]++;
-    }
-    return bins;
-}

histogram.h

@@ -1,9 +0,0 @@
-#ifndef HISTOGRAM_H_INCLUDED
-#define HISTOGRAM_H_INCLUDED
-
-#include <vector>
-#include <cstddef>
-
-std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t bin_count);
-
-#endif

histogram_internal.h

@@ -1,8 +0,0 @@
-#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
-#define HISTOGRAM_INTERNAL_H_INCLUDED
-
-#include <vector>
-
-void find_minmax(const std::vector<double>& numbers, double& min, double& max);
-
-#endif

main.cpp

@@ -1,7 +1,5 @@
 #include <iostream>
 #include <vector>
-#include "histogram.h"
-#include "svg.h"
 
 using namespace std;
 
@@ -28,9 +26,45 @@ Input input_data()
     return in;
 }
 
+void find_minmax(const vector<double>& numbers, double& min, double& max) {
+    if (numbers.empty()) {
+        return;
+    }
+    min = numbers[0];
+    max = numbers[0];
+
+    for (double x : numbers) {
+        if (x < min) min = x;
+        if (x > max) max = x;
+    }
+}
+
 int main() {
     auto in = input_data();
-    auto bins = make_histogram(in.numbers, in.bin_count);
+
-    show_histogram_svg(bins);
+    double min, max;
+    find_minmax(in.numbers, min, max);
+
+    vector<size_t> bins(in.bin_count);
+    for (double x : in.numbers) {
+        size_t bin_index = (x - min) / (max - min) * in.bin_count;
+        if (bin_index == in.bin_count) bin_index--;
+        bins[bin_index]++;
+    }
+
+    const size_t SCREEN_WIDTH = 80;
+    size_t max_count = 0;
+    for (size_t count : bins) {
+        if (count > max_count) max_count = count;
+    }
+
+    for (size_t bin : bins) {
+        size_t height = bin * SCREEN_WIDTH / max_count;
+        for (size_t i = 0; i < height; i++) {
+            cout << '*';
+        }
+        cout << endl;
+    }
+
     return 0;
 }

svg.cpp

@@ -1,45 +0,0 @@
-#include "svg.h"
-#include <iostream>
-#include <vector>
-#include <string>
-
-using namespace std;
-
-void svg_begin(double width, double height) {
-    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
-    cout << "<svg width='" << width << "' height='" << height << "' viewBox='0 0 " << width << " " << height << "' xmlns='http://www.w3.org/2000/svg'>\n";
-}
-
-void svg_end() {
-    cout << "</svg>\n";
-}
-
-void svg_text(double left, double baseline, string text) {
-    cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>\n";
-}
-
-void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") {
-    cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "'/>\n";
-}
-
-void show_histogram_svg(const vector<size_t>& bins) {
-    const auto IMAGE_WIDTH = 400;
-    const auto IMAGE_HEIGHT = 300;
-    const auto TEXT_LEFT = 20;
-    const auto TEXT_BASELINE = 20;
-    const auto TEXT_WIDTH = 50;
-    const auto BIN_HEIGHT = 30;
-    const auto BLOCK_WIDTH = 10;
-
-    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
-
-    double top = 0;
-    for (size_t bin : bins) {
-        const double bin_width = BLOCK_WIDTH * bin;
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "red", "#ffeeee");
-        top += BIN_HEIGHT;
-    }
-
-    svg_end();
-}

svg.h

@@ -1,9 +0,0 @@
-#ifndef SVG_H_INCLUDED
-#define SVG_H_INCLUDED
-
-#include <vector>
-#include <cstddef>
-
-void show_histogram_svg(const std::vector<size_t>& bins);
-
-#endif

text.cpp

@@ -1,22 +0,0 @@
-#include "text.h"
-#include <iostream>
-#include <vector>
-#include <cstddef>
-
-using namespace std;
-
-void show_histogram_text(const vector<size_t>& bins) {
-    const size_t SCREEN_WIDTH = 80;
-    size_t max_count = 0;
-    for (size_t count : bins) {
-        if (count > max_count) max_count = count;
-    }
-
-    for (size_t bin : bins) {
-        size_t height = bin * SCREEN_WIDTH / max_count;
-        for (size_t i = 0; i < height; i++) {
-            cout << '*';
-        }
-        cout << endl;
-    }
-}

text.h

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