добавлен файл dactest

histogram.cpp

@@ -0,0 +1,59 @@
+#include <vector>
+#include "histogram.h"
+#include "histogram_internal.h"
+
+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;
+        }
+        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);
+
+    vector <size_t> bins(bin_count,0);
+
+
+    double bin_size = (max-min)/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,6 @@
+#pragma once
+#include <vector>
+
+std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t bin_count);
+void find_minmax(const std::vector <double>& numbers, double& min, double& max);
+

histogram_internal.h

@@ -0,0 +1,6 @@
+#pragma once
+#include <vector>
+
+void find_minmax(const std::vector<double>& numbers, double& min, double& max);
+
+

project.cbp

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="project" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin/Debug/project" 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/project" 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" />
+			<Add option="-fexceptions" />
+		</Compiler>
+		<Unit filename="main.cpp" />
+		<Extensions>
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

svg.cpp

@@ -0,0 +1,66 @@
+
+#include <iostream>
+#include <vector>
+#include "svg.h"
+#include "algorithm"
+
+using namespace std;
+
+void svg_begin(double width, double height){
+    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
+    cout << "<svg ";
+    cout << "width='" << width << "' ";
+    cout << "height='" << height << "' ";
+    cout << "viewBox='0 0 " << width << " " << height << "' ";
+    cout << "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
+         << "'front-family='Verdana' front-size='12'>" << text << "</text>\n";
+}
+
+void svg_rect(double x, double y, double width, double height, string stroke, string fill)
+{
+    cout << "<rect x='"<<x<<"' y='"<<y
+         <<"' width='"<<width<<"' height='"<<height
+         <<"' stroke='"<<stroke<<"' fill='"<<fill<<"' />";
+
+}
+
+
+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);
+
+    size_t max_bin ='max_element(bins.begin(), bins.end())';
+    double scaling_factor = 1.0;
+    if (max_bin * BLOCK_WIDTH>IMAGE_WIDTH - TEXT_WIDTH){
+        scaling_factor = static_cast<double>(IMAGE_WIDTH - TEXT_WIDTH)/(max_bin * BLOCK_WIDTH);
+    }
+
+    double top = 0;
+     for (size_t bin : bins)
+    {
+        const double bin_width = BLOCK_WIDTH *bin *scaling_factor;
+        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

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

text.cpp

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

text.h

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

unittest.cpp

@@ -0,0 +1,50 @@
+#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("vector 1 element")
+{
+    double min = 0;
+    double max = 0;
+    find_minmax({1}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 1);
+}
+TEST_CASE("distinct negativ numbers")
+{
+    double min = 0;
+    double max = 0;
+    find_minmax({-1, -2}, min, max);
+    CHECK(min == -2);
+    CHECK(max == -1);
+}
+TEST_CASE("distinct positive numbers")
+{
+    double min = 0;
+    double max = 0;
+    find_minmax({2, 2}, min, max);
+    CHECK(min == 2);
+    CHECK(max == 2);
+}
+
+TEST_CASE("distinct positive numbers")
+{
+    double min = 0;
+    double max = 0;
+    //int n =2;
+    std::vector<double> vector_pust;
+
+    CHECK(find_minmax(vector_pust, min, max)==false);
+
+
+}