code: конечный код

1 месяц назад · 28bd0866d8
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,2 @@
 /bin
 /obj
-/lab01.layout
--- a/doctest.h
+++ b/doctest.h
--- a/histogram.cpp
+++ b/histogram.cpp
@ -1,54 +1,65 @@
-#include "text.h"
+#include "histogram.h"
 #include <iostream>
-#include <vector>
-using namespace std;
-
-void show_histogram_text(const vector <size_t>& bins,size_t bin_count, size_t max_count)
-{
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+#include <cstddef>

-    bool scaling = false;
+using namespace std;

-    if (max_count > MAX_ASTERISK)
+bool find_minmax(const vector<double>& numbers, double& minN, double& maxN)
 {
-        scaling = true;
+    if (numbers.empty()) {
+        minN = maxN = 0;
+        return false;
    }
+    minN = numbers[0];
+    maxN = numbers[0];

-    for (size_t i = 0; i < bin_count; i++)
+    for (double x: numbers)
    {
-        if (bins[i] < 10)
+        if (minN > x)
        {
-            cout << "  ";
+            minN = x;
        }
-        else if (bins[i] < 100)
+        if (maxN < x)
        {
-            cout << " ";
+            maxN = x;
        }
-        else
-        {
-            cout << "";
    }
-        cout << bins[i] << '|';
+    return true;
+}

-        size_t number_of_stars = bins[i];
+vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count)
+{
+    double minN, maxN;
+    find_minmax( numbers, minN, maxN);

-        if (scaling)
+    vector <size_t> bins(bin_count);
+    double diff = (maxN - minN) / bin_count;
+    size_t max_count = 0;
+    for (size_t i = 0; i <numbers.size() ; i++)
    {
-            if (bins[i] == max_count)
+        bool found = false;
+        for (size_t j = 0; (j < bin_count - 1) && !found; j++)
        {
-                number_of_stars = MAX_ASTERISK * 1.0;
-            }
-            else
+            auto lo = minN + j * diff;
+            auto hi = minN + (j + 1) * diff;
+            if ((lo <= numbers[i]) && (hi > numbers[i]))
+            {
+                bins[j]++;
+                if (bins[j] > max_count)
                {
-                number_of_stars = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
+                    max_count = bins[j];
                }
+                found = true;
            }
-
-        for (size_t j = 0; j < number_of_stars; j++)
+        }
+        if(!found)
+        {
+            bins[bin_count - 1]++;
+            if (bins[bin_count - 1] > max_count)
            {
-            cout << '*';
+                max_count = bins[bin_count - 1];
+            }
        }
-        cout << endl;
    }
+    return bins;
 }
--- a/histogram.h
+++ b/histogram.h
@ -2,7 +2,7 @@
 #define HISTOGRAM_H_INCLUDED

 #include <vector>
-
+#include <cstddef>
 std::vector<size_t>
 make_histogram(const std::vector<double>& numbers, size_t bin_count);

--- a/histogram_internal.h
+++ b/histogram_internal.h
@ -0,0 +1,9 @@
+#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
+#define HISTOGRAM_INTERNAL_H_INCLUDED
+
+#include <vector>
+#include <cstddef>
+//std::vector<size_t>
+bool find_minmax(const std::vector<double>& numbers, double& minN, double& maxN);
+
+#endif // HISTOGRAM_INTERNAL_H_INCLUDED
--- a/lab01.cbp
+++ b/lab01.cbp
@ -34,12 +34,19 @@
 		</Compiler>
 		<Unit filename=".gitignore" />
 		<Unit filename="histogram.cpp" />
-		<Unit filename="histogram.h">
+		<Unit filename="histogram.h" />
+		<Unit filename="histogram_internal.h">
 			<Option target="&lt;{~None~}&gt;" />
 		</Unit>
 		<Unit filename="main.cpp" />
-		<Extensions>
-			<lib_finder disable_auto="1" />
-		</Extensions>
+		<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;" />
+		</Unit>
+		<Extensions />
 	</Project>
 </CodeBlocks_project_file>
--- a/lab01.depend
+++ b/lab01.depend
@ -1,5 +1,52 @@
 # depslib dependency file v1.0
-1746105820 source:c:\users\liza\desktop\lab01\lab01\main.cpp
+1745706239 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\main.cpp
 	<iostream>
 	<vector>
+	"histogram.h"
+	"text.h"
+	"svg.h"
+
+1745844301 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.cpp
+	"histogram.h"
+	<iostream>
+	<vector>
+
+1745703309 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.h
+	<vector>
+
+1745703516 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\text.cpp
+	"text.h"
+	<iostream>
+	<vector>
+
+1745703516 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\text.h
+	<vector>
+
+1745706239 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\svg.h
+	<iostream>
+	<vector>
+
+1745708042 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\svg.cpp
+	"svg.h"
+	<string>
+
+1745706239 source:c:\users\liza\desktop\lab01\lab01\main.cpp
+	<iostream>
+	<vector>
+	"histogram.h"
+	"text.h"
+	"svg.h"
+
+1746171356 c:\users\liza\desktop\lab01\lab01\histogram.h
+	<vector>
+	<cstddef>
+
+1746171356 c:\users\liza\desktop\lab01\lab01\text.h
+	<vector>
+	<cstddef>
+
+1746171356 c:\users\liza\desktop\lab01\lab01\svg.h
+	<iostream>
+	<vector>
+	<cstddef>

--- a/lab01.layout
+++ b/lab01.layout
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+	<File name="histogram.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="text.cpp" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="77" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="svg.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="55" topLine="0" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>
--- a/main.cpp
+++ b/main.cpp
@ -1,52 +1,40 @@
 #include <iostream>
 #include <vector>
-using namespace std;
+#include "histogram.h"
+#include "text.h"
+#include "svg.h"

-int main(){
-    size_t number;
-    cout<<"Enter number count: ";
-    cin>> number;
+using namespace std;

-    vector <double> count(number);
-    cout<< "enter chicla";
-    for (int i=0;i<number;i++){
-        cin>>count[i];
-    }
+struct Input
+{
+    vector<double> numbers;
+    size_t bin_count{};
+};

-    size_t bin_count;
-    cout<<"Enter number bin_count: ";
-    cin>> bin_count;
+Input
+input_data()
+{
+    Input in;
+    size_t number_count;
+    cin >> number_count;
+    in.numbers.resize(number_count);

-    vector <size_t>  bins(bin_count);
+    vector<double> numbers(number_count);

-    double max=count[0];
-    for (size_t i=0;i<number; i++){
-        if(count[i]> max){
-                max=count[i];
-           }
+    for (size_t i = 0; i < number_count; i++)
+    {
+        cin >> in.numbers[i];
    }

-    double min=count[0];
-    for (size_t i=0;i<number; i++){
-        if(count[i]<min){
-                min=count[i];
-           }
+    cin >> in.bin_count;
+    return in;
 }

-    double bin_size = (max-min)/bin_count;
-
-    for(size_t i = 0; i<number; 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<=count[i])&&(count[i]<hi)){
-                bins[j]++;
-                found=true;
-            }
-        }
-        if (!found){
-            bins[bin_count-1]++;
-        }
-    }
+int main()
+{
+    size_t max_count;
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram_svg(bins);
 }
--- a/svg.cpp
+++ b/svg.cpp
@ -0,0 +1,55 @@
+#include "svg.h"
+#include <string>
+#include <cstddef>
+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 = "black", string fill = "black")
+{
+    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(400, 300);
+    double top = 0;
+
+    for (size_t bin : bins) {
+        const double bin_width = BLOCK_WIDTH * bin;
+        if(bin_width> IMAGE_WIDTH) {
+            const double bin_width= IMAGE_WIDTH - TEXT_WIDTH;
+        }
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "green");
+        top += BIN_HEIGHT;
+    }
+
+    //svg_text(20, 20, to_string(bins[0]));
+    //svg_rect(50, 0, bins[0] * 10, 30);
+    svg_end();
+}
+
--- a/svg.h
+++ b/svg.h
@ -0,0 +1,8 @@
+#ifndef SVG_H_INCLUDED
+#define SVG_H_INCLUDED
+#include <iostream>
+#include <vector>
+#include <cstddef>
+void show_histogram_svg(const std::vector<size_t> &bins);
+
+#endif // SVG_H_INCLUDED
--- a/text.cpp
+++ b/text.cpp
@ -0,0 +1,55 @@
+#include "text.h"
+#include <iostream>
+#include <vector>
+#include <cstddef>
+using namespace std;
+
+void show_histogram_text(const vector <size_t>& bins,size_t bin_count, size_t max_count)
+{
+    const size_t SCREEN_WIDTH = 80;
+    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
+
+    bool scaling = false;
+
+    if (max_count > MAX_ASTERISK)
+    {
+        scaling = true;
+    }
+
+    for (size_t i = 0; i < bin_count; i++)
+    {
+        if (bins[i] < 10)
+        {
+            cout << "  ";
+        }
+        else if (bins[i] < 100)
+        {
+            cout << " ";
+        }
+        else
+        {
+            cout << "";
+        }
+        cout << bins[i] << '|';
+
+        size_t number_of_stars = bins[i];
+
+        if (scaling)
+        {
+            if (bins[i] == max_count)
+            {
+                number_of_stars = MAX_ASTERISK * 1.0;
+            }
+            else
+            {
+                number_of_stars = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
+            }
+        }
+
+        for (size_t j = 0; j < number_of_stars; j++)
+        {
+            cout << '*';
+        }
+        cout << endl;
+    }
+}
--- a/text.h
+++ b/text.h
@ -0,0 +1,7 @@
+#ifndef TEXT_H_INCLUDED
+#define TEXT_H_INCLUDED
+#include <vector>
+#include <cstddef>
+void show_histogram_text(const std::vector <size_t>& bins,size_t bin_count, size_t max_count);
+
+#endif // TEXT_H_INCLUDED
--- a/unittest.cbp
+++ b/unittest.cbp
@ -0,0 +1,41 @@
+<?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>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="unittest.cpp" />
+		<Extensions>
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
--- a/unittest.cpp
+++ b/unittest.cpp
@ -0,0 +1,48 @@
+#define DOCTEST_CONFIG_NO_MULTITHREADING
+#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
+#include "doctest.h"
+#include "histogram_internal.h"
+#include <vector>
+
+TEST_CASE("distinct positive numbers") {
+    double min = 0;
+    double max = 0;
+    find_minmax({1, 2}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 2);
+    CHECK(find_minmax({1, 2}, min, max));
+}
+
+TEST_CASE("distinct negative numbers")
+{
+    double min = 0;
+    double max = 0;
+    find_minmax({-1, -2}, min, max);
+    CHECK(min == -2);
+    CHECK(max == -1);
+    CHECK(find_minmax({-1, -2}, min, max));
+}
+TEST_CASE("vector 1 element")
+{
+    double min = 0;
+    double max = 0;
+    find_minmax({1}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 1);
+    CHECK(find_minmax({1}, min, max));
+}
+TEST_CASE("distinct equals numbers")
+{
+    double min = 0;
+    double max = 0;
+    find_minmax({1, 1}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 1);
+    CHECK(find_minmax({1, 1}, min, max));
+}
+TEST_CASE("distinct empty vector")
+{
+    double min = -1;
+    double max = -1;
+    CHECK(!find_minmax({}, min, max));
+}
--- a/unittest.depend
+++ b/unittest.depend
@ -0,0 +1,62 @@
+# depslib dependency file v1.0
+1745848382 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.cpp
+	"histogram.h"
+	<iostream>
+	<vector>
+
+1745845585 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.h
+	<vector>
+
+1745848628 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\unittest.cpp
+	"doctest.h"
+	"histogram_internal.h"
+	<vector>
+
+1745704427 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\doctest.h
+	<signal.h>
+	<ciso646>
+	<cstddef>
+	<ostream>
+	<istream>
+	<type_traits>
+	"doctest_fwd.h"
+	<ctime>
+	<cmath>
+	<climits>
+	<math.h>
+	<new>
+	<cstdio>
+	<cstdlib>
+	<cstring>
+	<limits>
+	<utility>
+	<fstream>
+	<sstream>
+	<iostream>
+	<algorithm>
+	<iomanip>
+	<vector>
+	<atomic>
+	<mutex>
+	<set>
+	<map>
+	<unordered_set>
+	<exception>
+	<stdexcept>
+	<csignal>
+	<cfloat>
+	<cctype>
+	<cstdint>
+	<string>
+	<sys/types.h>
+	<unistd.h>
+	<sys/sysctl.h>
+	<AfxWin.h>
+	<windows.h>
+	<io.h>
+	<sys/time.h>
+	<unistd.h>
+
+1745848412 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram_internal.h
+	<vector>
+
--- a/unittest.layout
+++ b/unittest.layout
@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+	<File name="histogram_internal.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="250" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="205" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="unittest.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="623" topLine="6" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>