изменения

histogram.cpp

@@ -0,0 +1,52 @@
+#include <iostream>
+#include <vector>
+#include "histogram.h"
+
+//std::vector<size_t>
+
+void
+find_minmax(const std::vector<double> numbers, double& min, double& max)
+{
+/*/double/*/ min = numbers[0];//ïîèñê ìèí è ìàêñ
+/*/ double/*/ max = numbers[0];
+for (double x : numbers)
+{
+if (x < min)
+{
+min = x;
+}
+else if (x > max)
+{
+max = x;
+}
+}
+}
+std::vector<size_t>
+make_histogram(const std::vector<double> numbers, size_t bin_count)
+{
+std::vector <size_t> bins(bin_count);
+double min, max;
+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]) && (numbers[i] < 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
+
+
+

histogram_internal.h

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

main.cpp

@@ -1,121 +1,66 @@
+
 #include <iostream>
 #include <vector>
 
+#include "histogram.h"
+#include "text.h"
 
+
+
+#include "svg.h"
 using namespace std;
-const size_t SCREEN_WIDTH = 80;
-const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 
-
-struct Input {
+struct Input
+{
     vector<double> numbers;
     size_t bin_count{};
+    size_t number_count;//êîëè÷åñòâî ÷èñåë
 };
 
+
+
 Input
-input_data(){
-    size_t number_count;
-
-    cerr << "Enter number count: ";
-    cin >> number_count;
-
-    Input in;
-    in.numbers.resize(number_count);
-    for(int i;i<number_count;i++)
+input_data()
 {
 
-        cin >> in.numbers[i];
-    }
-    cerr << "Enter bin count: ";
 
+    Input in;
+
+    cerr<<"Kol-vo chisel -> ";
+    cin>>in.number_count;
+    //  vector <double> numbers(number_count);//âåêòîð ñ êîëè÷ñåòâîì ýë. number_count
+    in.numbers.resize(in.number_count);
+
+    cerr<<"Vvedite chisla:";
+    cout<<endl;//çàïîëíåíèå âåêòîðà
+    for(size_t i=0; i<in.number_count; i++)
+    {
+        cin>>in.numbers[i];
+        //cout<<endl;
+    }
+
+    cerr<<"vvedite kolvo bins -> ";
     cin>>in.bin_count;
     return in;
 }
 
-void
-find_minmax(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(vector<double> numbers, size_t bin_count) {
-    vector <size_t> bins(bin_count);
-    double min, max;
-    find_minmax(numbers, min, max);
-    size_t countt;
-
-    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]) && (numbers[i] < hi)) {
-            bins[j]++;
-            found = true;
-        }
-    }
-        if (!found) {
-        bins[bin_count - 1]++;
-    }
-    }
-        return bins;
-
-
-}
-
-void
-show_histogram_text(auto bins, size_t bin_count){
-        size_t max_count = 0;
-        for (size_t i = 0; i < bin_count; i++){
-        if(bins[i]>max_count)
-        max_count = bins[i];
-
-
-        }
-    size_t height;
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i] < 100)
-            cout << " ";
-        if (bins[i] < 10)
-            cout << " ";
-        cout<<bins[i]<<"|";
-        if(max_count>MAX_ASTERISK){
-        for (size_t j = 0; j <(height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count)) ; j++)
-        {
-            cout<<"*";
-        }
-        cout<<endl;
-        }
-        else
-        {
-           for (size_t j = 0; j <bins[i] ; j++)
-        {
-            cout<<"*";
-        }
-        cout<<endl;
-        }
-    }
-
-
-
-}
 
 
 int main()
-{   Input in = input_data();
+{
+     size_t number_count;//êîëè÷åñòâî ÷èñåë
+
+    Input in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins, in.bin_count);
+  //  show_histogram_text(bins, in.bin_count);
+    show_histogram_svg(bins,in.number_count);
     return 0;
+    //  size_t bin_count;//êîëè÷åñòâî êîðçèí
+
+    //  vector<size_t> bins(bin_count);
+
 }
+
+
+
+

project.cbp

@@ -32,11 +32,21 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename="doctest.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="histogram.cpp" />
 		<Unit filename="histogram.h">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
+		<Unit filename="histogram_internal.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="main.cpp" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h">
+			<Option target="&lt;{~None~}&gt;" />
+		</Unit>
 		<Unit filename="text.cpp" />
 		<Unit filename="text.h">
 			<Option target="&lt;{~None~}&gt;" />

svg.cpp

@@ -0,0 +1,117 @@
+#include <math.h>
+#include <iostream>
+#include <conio.h>
+#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 ";
+    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 << "'>" << text << "</text>";
+}
+
+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, size_t number_count)
+{
+    setlocale(LC_ALL, "Russian");
+    int noi=0;
+    auto IMAGE_WIDTH = 0;
+    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;
+    const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;
+//
+    cerr<<"Ââåäèòå æåëàåìóþ øèðèíó ñòðîêè";
+    //cerr<<endl;
+    cerr<<"Ó÷òèòå, ÷òî îíà äîëæíà áûòü áîëüøå 70 è ìåíüøå 800, à òàêæå";
+   // cerr<<endl;
+    cerr<<"áîëåå òðåòè êîëè÷åñâà ÷èñåë, óìíîæåííûõ íà øèðèíó áëîêà .  âàøåì ñëó÷àå áîëåå "<<(( number_count*BLOCK_WIDTH)/3)<<" ";
+    //cerr<<endl;
+    //cin>>IMAGE_WIDTH;
+    while (noi == 0)
+    {
+        cerr<<" in cicle";
+        //cerr<<endl;
+        cin>> IMAGE_WIDTH;
+        if ((IMAGE_WIDTH<800)&&(IMAGE_WIDTH>70)&&(IMAGE_WIDTH>(number_count*BLOCK_WIDTH)/3))
+        {
+            noi=noi+1;
+        }
+
+        if (IMAGE_WIDTH>800)
+        {
+            cerr<<" ß æå ñêàçàë ìåíüøå 800. Ââåäèòå çàíîâî";
+           // cerr<<endl;
+        }
+        if (IMAGE_WIDTH<70)
+        {
+            cerr<<" ß æå ñêàçàë áîëüøå 70.Ââåäèòå çàíîâî";
+            //cerr<<endl;
+        }
+        if (IMAGE_WIDTH<(number_count*BLOCK_WIDTH)/3)
+        {
+            cerr<<" ß æå ñêàçàë áîëüøå " << (number_count*BLOCK_WIDTH)/3<<" Ââåäèòå çàíîâî";
+           // cerr<<endl;
+        }
+
+    }
+
+
+
+//string k;
+//string m;
+    svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
+
+    double top = 0; //ìàøòàáèðâîàíèå
+    double max_count = bins[0];
+    for (size_t i = 0; i < bins.size(); i++)
+    {
+        if (bins[i] > max_count)
+            max_count = bins[i];
+    }
+    for (size_t bin : bins)
+    {
+        const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH)*(bin/max_count);
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        /*/
+        cout<<"Ââåäèòå öâåò 1 â ôîðìàòå #RRGGBB";
+        cin>> k;
+        cout<<endl;
+        cout<<"Ââåäèòå öâåò 2 â ôîðìàòå #RRGGBB";
+        cin >> m;
+        /*/
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT,"#00CCFF" /*/k/*/,"#0000FF" /*/m/*/);
+        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);
+
+
+#endif // SVG_H_INCLUDED

text.cpp

@@ -0,0 +1,67 @@
+#include <iostream>
+#include <vector>
+#include "text.h"
+
+using namespace std;
+
+void
+show_histogram_text(vector<size_t> bins, size_t bin_count)
+{
+
+    size_t max_count=0;
+    for (size_t i =0; i<bin_count; i++)
+    {
+        if (max_count <bins[i])
+        {
+            max_count=bins[i];
+        }
+    }
+
+
+
+    float procent;
+    for(size_t i=0; i<bin_count; i++)
+    {
+
+
+
+        int procent =(float)bins[i];
+
+
+        if (procent<10)
+        {
+            cout<<"  "<<procent<<" | ";
+        }
+        if ((procent<100)&&(procent>=10))
+        {
+            cout<<" "<<procent<<" | ";
+        }
+
+
+        size_t height = 0;
+
+        if (max_count>76)
+        {
+            size_t height = 76 * (static_cast<double>(bins[i]) / max_count);
+            for(size_t j=0; j<=height; j++)
+            {
+
+                cout<<"*";
+            }
+        }
+        else
+        {
+            for(size_t j=0; j<=bins[i]-1; j++)
+            {
+
+                cout<<"*";
+            }
+        }
+
+
+
+        cout<<endl;
+    }
+
+return;
+}

text.h

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

unittest.cpp

@@ -0,0 +1,39 @@
+#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);
+}
+
+
+