histogram.cpp

@@ -1,41 +0,0 @@
-#include "histogram.h"
-#include <vector>
-using namespace std;
-
-void find_minmax(const vector<double>& numbers, double& min, double& max) {
-    if (numbers.empty())
-    {
-        min = 0;
-        max = 0;
-        return;
-    }
-    max = numbers[0];
-    min = numbers[0];
-    for (double x : numbers) {
-        if (x < min) min = x;
-        else if (x > max) max = x;
-    }
-}
-
-vector<size_t> make_histogram(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 (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]) && (numbers[i] < hi)) {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (!found) {
-            bins[bin_count - 1]++;
-        }
-    }
-    return bins;
-}

histogram.h

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

histogram_internal.h

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

main.cpp

@@ -1,35 +1,95 @@
 #include <iostream>
 #include <vector>
-#include "histogram.h"
-#include "text.h"
-#include "svg.h"
-using namespace std;
 
-struct Input {
+using namespace std;
-    vector<double> numbers;
-    size_t bin_count;
-};
 
-Input input_data() {
+int main()
-    Input in;
+{
     size_t number_count;
     cerr << "Enter number count: ";
     cin >> number_count;
 
-    in.numbers.resize(number_count);
+    vector<double> numbers(number_count);
     cerr << "Enter numbers: ";
-    for (size_t i = 0; i < number_count; i++) {
+    for(size_t i = 0; i < number_count; i ++)
-        cin >> in.numbers[i];
+    {
+        cin >> numbers[i];
     }
 
+    size_t bin_count;
     cerr << "Enter bin count: ";
-    cin >> in.bin_count;
+    cin >> bin_count;
-    return in;
+
-}
+    double min = numbers[0];
+    double max = numbers[0];
+    for(double number : numbers)
+    {
+        if(number < min)
+        {
+            min = number;
+        }
+        if(number > max)
+        {
+            max = number;
+        }
+    }
+
+    vector<size_t> bins(bin_count, 0);
+    double bin_size = (max - min) / bin_count;
+    for(size_t i = 0; i < number_count; 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]) && (numbers[i] < hi))
+            {
+                bins[j]++;
+                found = true;
+            }
+        }
+        if (!found)
+        {
+            bins[bin_count-1]++;
+        }
+    }
+
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+    size_t max_bin = bins[0];
+    for(size_t i = 0; i < bin_count; i++)
+    {
+        if(bins[i] > max_bin)
+        {
+            max_bin = bins[i];
+        }
+    }
+
+    for (size_t bin: bins)
+    {
+        size_t height = bin;
+
+        if (max_bin > MAX_ASTERISK)
+        {
+          height = MAX_ASTERISK * (static_cast<double>(bin) / max_bin);
+        }
+
+        if (bin < 100)
+        {
+            cout << ' ';
+        }
+        if (bin < 10)
+        {
+            cout << ' ';
+        }
+        cout << bin << "|";
+        for(size_t i = 0; i < height; i++)
+        {
+            cout << "*";
+        }
+        cout << endl;
+    }
 
-int main() {
-    auto in = input_data();
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins);
-    return 0;
 }

marks.txt

@@ -1,3 +0,0 @@
-10
-3 3 4 4 4 4 4 5 5 5
-3

svg.cpp

@@ -1,62 +0,0 @@
-#include <iostream>
-#include <vector>
-#include <string>
-#include "svg.h"
-
-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) {
-    if (bins.empty()) {
-        cerr << "Error: Empty bins vector\n";
-        return;
-    }
-
-    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 MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
-
-    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
-
-    double top = 0;
-    size_t max_count = bins[0];
-    for (size_t bin : bins) {
-        if (max_count < bin) {
-            max_count = bin;
-        }
-    }
-
-    for (size_t bin : bins) {
-        const double bin_width = MAX_WIDTH * (static_cast<double>(bin) / max_count);
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "red");
-        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 // SVG_H_INCLUDED

text.cpp

@@ -1,37 +0,0 @@
-#include "text.h"
-#include <iostream>
-using namespace std;
-
-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;
-    double max_bin;
-    size_t height;
-    max_bin = bins[0];
-    height = bins[0];
-    for (size_t i = 0; i < bin_count; i++) {
-        if (bins[i] > max_bin) {
-            max_bin = bins[i];
-        }
-    }
-
-    bool flag = false;
-    if (max_bin > 80) {
-        flag = true;
-    }
-    for (size_t i = 0; i < bin_count; i++) {
-        if (bins[i] < 100) cout << " ";
-        if (bins[i] < 10) cout << " ";
-        cout << bins[i] << "|";
-        if (flag == true) {
-            height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_bin);
-        }
-        else {
-            height = bins[i];
-        }
-        for (size_t j = 0; j < height; j++) {
-            cout << "*";
-        }
-        cout << endl;
-    }
-}

text.h

@@ -1,9 +0,0 @@
-#ifndef TEXT_H_INCLUDED
-#define TEXT_H_INCLUDED
-
-#include <vector>
-using namespace std;
-
-void show_histogram_text(vector<size_t> bins, size_t bin_count);
-
-#endif

unittest.cbp

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="unittest" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin/Debug/unittest" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="bin/Release/unittest" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-		</Compiler>
-		<Extensions />
-	</Project>
-</CodeBlocks_project_file>

unittest.cpp

@@ -1,44 +0,0 @@
-#define DOCTEST_CONFIG_NO_MULTITHREADING
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "doctest.h"
-#include "histogram_internal.h"
-
-TEST_CASE("distinct positive numbers") {
-    double min = 0;
-    double max = 0;
-    find_minmax({1, 2}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 2);
-}
-
-TEST_CASE("empty array") {
-    double min = 0;
-    double max = 0;
-    find_minmax({}, min, max);
-    CHECK(min == 0);
-    CHECK(max == 0);
-}
-
-TEST_CASE("array with a single element") {
-    double min = 0;
-    double max = 0;
-    find_minmax({1}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 1);
-}
-
-TEST_CASE("array of negative elements") {
-    double min = 0;
-    double max = 0;
-    find_minmax({-1, -2}, min, max);
-    CHECK(min == -2);
-    CHECK(max == -1);
-}
-
-TEST_CASE("array of identical elements") {
-    double min = 0;
-    double max = 0;
-    find_minmax({1, 1}, min, max);
-    CHECK(min == 1);
-    CHECK(max ==    1);
-}