a lot of changes

devlab1.cbp

@@ -35,7 +35,13 @@
 		<Linker>
 			<Add option="-static-libstdc++" />
 		</Linker>
+		<Unit filename="doctest.h" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h" />
+		<Unit filename="histogram_internal.h" />
 		<Unit filename="main.cpp" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h" />
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>

devlab1.depend

@@ -1,5 +1,30 @@
 # depslib dependency file v1.0
-1676897437 source:c:\program files\codeblocks\devlab1\main.cpp
+1681732107 source:c:\program files\codeblocks\devlab1\main.cpp
+	<iostream>
+	<vector>
+	<cmath>
+	"histogram.h"
+	"svg.h"
+
+1681732312 c:\program files\codeblocks\devlab1\histogram.h
+	<vector>
+
+1681730387 source:c:\program files\codeblocks\devlab1\histogram.cpp
+	"histogram.h"
+	<vector>
+
+1680530385 c:\program files\codeblocks\devlab1\text.h
+	<vector>
+	<iostream>
+
+1680530410 source:c:\program files\codeblocks\devlab1\text.cpp
+	"text.h"
+
+1681731817 c:\program files\codeblocks\devlab1\svg.h
+	<vector>
+
+1681732105 source:c:\program files\codeblocks\devlab1\svg.cpp
+	"svg.h"
 	<iostream>
 	<vector>
 

devlab1.layout

@@ -2,9 +2,39 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="main.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="histogram_internal.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="3670" topLine="115" />
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="main.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="154" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="doctest.h" open="1" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="text.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="69" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="123" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="histogram.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="69" topLine="0" />
+		</Cursor>
+	</File>
+	<File name="text.cpp" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="342" topLine="0" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>

histogram.cpp

@@ -0,0 +1,43 @@
+#include "histogram.h"
+#include <vector>
+using namespace std;
+void
+find_minmax(const vector<double>& numbers, double& min, double& max)
+{
+    min = numbers[0];
+    max = numbers[0];
+    for ( size_t i=0; i < numbers.size(); i++)
+    {
+        if (numbers[i] > max) max=numbers[i];
+        if (numbers[i] < min) min=numbers[i];
+    }
+};
+
+std::vector<long long unsigned int>
+make_histogram(const vector<double>& numbers,size_t bin_count)
+{
+    float lo,hi,dif;
+    double min, max;
+    find_minmax(numbers, min, max);
+    vector <size_t> bins(bin_count) ;
+    dif=(max - min)/bin_count;
+    for(int i=0; i < numbers.size(); i++)
+    {
+        bool found = false;
+        for (int j=0; (j < bin_count-1)&&!found; j++)
+        {
+            lo= min + j*dif;
+            hi= min + (j+1)*dif;
+            if ((lo <= numbers[i]) && (numbers[i] <hi ))
+            {
+                bins[j]++;
+                found = true;
+            }
+        }
+        if (!found)
+        {
+            bins[bin_count - 1]++;
+        }
+    }
+    return bins;
+}

histogram.h

@@ -0,0 +1,9 @@
+#pragma once
+#include <vector>
+
+std::vector<long long unsigned int>
+make_histogram(const std::vector<double>& numbers, size_t bin_count);
+
+//void
+//show_histogram_text(std::vector<double> bins, const std::vector<double>& numbers, size_t bin_count);
+//

histogram_internal.h

@@ -0,0 +1,6 @@
+#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,11 +1,33 @@
 #include <iostream>
 #include <vector>
+#include <cmath>
+#include "histogram.h"
+#include "svg.h"
+
 using namespace std;
+int inbl()
+{
+    int BLOCK_WIDTH;
+    cout << "block width is";
+    cin>>BLOCK_WIDTH;
+    if (BLOCK_WIDTH>30)
+    {
+        cout<< "too big, please make it smaller";
+        inbl;
+    }
+    else if (BLOCK_WIDTH<3)
+    {
+        cout<< "too small, please make it bigger";
+        inbl;
+    }
+    else return BLOCK_WIDTH;
 
+}
 struct Input
 {
     vector<double> numbers;
     size_t bin_count;
+    int BLOCK_WIDTH;
 };
 Input
 input_data()
@@ -20,69 +42,16 @@ input_data()
     }
     size_t bin_count;
     cin >> bin_count;
+    int BLOCK_WIDTH = inbl();
     return in;
 }
 
-void
-find_minmax(const vector<double>& numbers, double& min, double& max)
-{
-    min = numbers[0];
-    max = numbers[0];
-    for ( size_t i=0; i < numbers.size(); i++)
-    {
-        if (numbers[i] > max) max=numbers[i];
-        if (numbers[i] < min) min=numbers[i];
-    }
-};
 
-std::vector<long long unsigned int>
-make_histogram(const vector<double>& numbers,size_t bin_count)
-{
-    float lo,hi,dif;
-    double min, max;
-    find_minmax(numbers, min, max);
-    vector <size_t> bins(bin_count) ;
-    dif=(max - min)/bin_count;
-    for(int i=0; i < numbers.size(); i++)
-    {
-        bool found = false;
-        for (int j=0; (j < bin_count-1)&&!found; j++)
-        {
-            lo= min + j*dif;
-            hi= min + (j+1)*dif;
-            if ((lo <= numbers[i]) && (numbers[i] <hi ))
-            {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (!found)
-        {
-            bins[bin_count - 1]++;
-        }
-    }
-    return bins;
-}
-void show_histogram_text(vector <size_t> &bins)
-{
-    for (size_t i=0; i<bins.size(); i++)
-    {
-        if (bins[i]!=0)
-        {
-            cout<<bins[i]<<" | "  ;
-            for (size_t j=0; j<bins[i]; j++)
-            {
-                cout<<"*";
-            }
-            cout<<endl;
-        }
-    }
-}
 int main()
 {
     auto in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_text(bins);
+    show_histogram_svg(bins,in.BLOCK_WIDTH);
 
 
     return 0;

marks.txt

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

svg.cpp

@@ -0,0 +1,80 @@
+#include "svg.h"
+#include <iostream>
+#include <vector>
+
+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 << fill << fill << "' />";
+}
+
+void
+show_histogram_svg(const vector<double>& bins, int BLOCK_WIDTH)
+{
+
+    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;
+
+
+
+    svg_begin(400, 300);
+
+    double top = 0;
+    const size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH;
+    auto maxb = bins[0];
+
+    for (size_t j = 1; j < bins.size(); j++)
+    {
+        if (bins[j] > maxb) maxb = bins[j];
+    }
+
+    auto maxb1 = maxb * BLOCK_WIDTH;
+
+    for (size_t bin : bins)
+    {
+
+        double bin_width;
+
+        int color = (10 - (bin * 9) / maxb);
+
+        if (maxb1 > MAX_ASTERISK)
+        {
+            bin_width  = BLOCK_WIDTH * MAX_ASTERISK * (bin / maxb1);
+        }
+        else bin_width = BLOCK_WIDTH * bin;
+
+        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "violet", to_string(color));
+        top += BIN_HEIGHT;
+    }
+
+    svg_end();
+}

svg.h

@@ -0,0 +1,5 @@
+#pragma once
+#include <vector>
+
+void
+show_histogram_svg(const std::vector<long long unsigned int>& bins, int BLOCK_WIDTH);

text.c

@@ -0,0 +1,16 @@
+#include "text.h"
+void show_histogram_text(vector <size_t> &bins)
+{
+    for (size_t i=0; i<bins.size(); i++)
+    {
+        if (bins[i]!=0)
+        {
+            cout<<bins[i]<<" | "  ;
+            for (size_t j=0; j<bins[i]; j++)
+            {
+                cout<<"*";
+            }
+            cout<<endl;
+        }
+    }
+}

text.cpp

@@ -0,0 +1,17 @@
+
+#include "text.h"
+void show_histogram_text(std::vector <size_t> &bins)
+{
+    for (size_t i=0; i<bins.size(); i++)
+    {
+        if (bins[i]!=0)
+        {
+            std::cout<<bins[i]<<" | "  ;
+            for (size_t j=0; j<bins[i]; j++)
+            {
+                std::cout<<"*";
+            }
+            std::cout<<std::endl;
+        }
+    }
+}

text.h

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

unittest.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="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="doctest.h" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="unittest.cpp" />
+		<Extensions />
+	</Project>
+</CodeBlocks_project_file>

unittest.cpp

@@ -0,0 +1,36 @@
+#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("distinct identical numbers") {
+    double min = 0;
+    double max = 0;
+    find_minmax({5, 5}, min, max);
+    CHECK(min == 5);
+    CHECK(max == 5);
+}
+
+TEST_CASE("distinct one number") {
+    double min = 0;
+    double max = 0;
+    find_minmax({3}, min, max);
+    CHECK(min == 3);
+    CHECK(max == 3);
+}
+
+TEST_CASE("distinct negative numbers") {
+    double min = 0;
+    double max = 0;
+    find_minmax({-3, -1}, min, max);
+    CHECK(min == -3);
+    CHECK(max == -1);
+}

unittest.depend

@@ -0,0 +1,59 @@
+# depslib dependency file v1.0
+1680530029 source:c:\program files\codeblocks\devlab1\histogram.cpp
+	"histogram.h"
+	<vector>
+
+1680530141 c:\program files\codeblocks\devlab1\histogram.h
+	<vector>
+
+1681719645 source:c:\program files\codeblocks\devlab1\unittest.cpp
+	"doctest.h"
+	"histogram_internal.h"
+
+1681707623 c:\program files\codeblocks\devlab1\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>
+
+1681730258 c:\program files\codeblocks\devlab1\histogram_internal.h
+

unittest.layout

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+	<File name="doctest.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="96971" topLine="2177" />
+		</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="227" topLine="0" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>