Индивидуальное задание

lab1.depend

@@ -3,7 +3,7 @@
 	<iostream>
 	<vector>
 
-1682281166 source:c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\main.cpp
+1685271547 source:c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\main.cpp
 	<iostream>
 	<vector>
 	<cmath>
@@ -12,6 +12,7 @@
 	"text.h"
 	"svg.h"
 	<conio.h>
+	"histogam_internal.h"
 
 1682273839 c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\histogam.h
 	<vector>
@@ -37,7 +38,7 @@
 1682273796 c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\histogam_internal.h
 	<vector>
 
-1682280585 source:c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\svg.cpp
+1682339808 source:c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\svg.cpp
 	<math.h>
 	<iostream>
 	<conio.h>
@@ -45,5 +46,5 @@
 	<string>
 	"svg.h"
 
-1682280301 c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\svg.h
+1685271547 c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\svg.h
 

lab1.layout

@@ -4,7 +4,7 @@
 	<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">
 		<Cursor>
-			<Cursor1 position="296" topLine="0" />
+			<Cursor1 position="712" topLine="0" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>

main.cpp

@@ -6,6 +6,7 @@
 #include "text.h"
 #include "svg.h"
 #include <conio.h>
+#include "histogam_internal.h"
 using namespace std;
 
 
@@ -26,7 +27,7 @@ input_data() {
         cin >> in.numbers[i];
     }
 
-    cout << "Enter number of bins";
+    cerr<< "Enter number of bins";
     cin >> in.bin_count;
     return in;
 }
@@ -35,6 +36,8 @@ int main()
 {
     Input in = input_data();
     auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins);
+    double min, max;
+    find_minmax(in.numbers,min,max);
+    show_histogram_svg(bins,min,max);
     return 0;
     }

svg.cpp

@@ -6,7 +6,17 @@
 #include "svg.h"
 using namespace std;
 
-
+size_t k=0;
+float
+step(size_t& k, size_t bin_count, double min,double max){
+    float interval;
+    double bin_size= (max-min)/bin_count;
+    if (k < bin_count - 1){
+            interval = min + (k + 1) * bin_size;
+            k+=1;
+        }
+    return interval;
+}
 void
 svg_begin(double width, double height) {
     cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
@@ -26,12 +36,37 @@ 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 colour = "black", string fill = "black"){
+    cout << "<rect x='"<<x<<"' y='"<<y<<"' width='"<<width<<"' height='"<<height<<"' stroke = '"<<colour <<"' fill = '"<<fill<<"' />";
+}
 
 void
-show_histogram_svg(const vector<size_t>& bins) {
+show_histogram_svg(const vector<size_t>& bins, double min,double max) {
+    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;
+    const auto INTER_WIDTH=30;
+    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];
+    }
     svg_begin(400, 300);
-    svg_text(20, 20, to_string(bins[0]));
+    for (size_t bin : bins) {
+        const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH)*(bin/max_count);
+        svg_text(TEXT_LEFT+INTER_WIDTH, top + TEXT_BASELINE, to_string(bin));
+        svg_rect(TEXT_WIDTH+INTER_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "#FF00FF");
+        top += BIN_HEIGHT;
+        if (bin!=bins[bins.size()-1]){
+            float inter=step(k,bins.size(),min,max);
+            svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(inter));
+            top += BIN_HEIGHT;
+        }
+    }
     svg_end();
 }

svg.h

@@ -2,6 +2,6 @@
 #define SVG_H_INCLUDED
 
 void
-show_histogram_svg(const std::vector<size_t>& bins);
+show_histogram_svg(const std::vector<size_t>& bins,double min, double max);
 
 #endif // SVG_H_INCLUDED

unittest.depend

@@ -1,10 +1,11 @@
 # depslib dependency file v1.0
-1682273864 source:c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\histogam.cpp
+1682280773 source:c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\histogam.cpp
 	<iostream>
 	<vector>
 	<cmath>
 	"histogam.h"
 	"histogam_internal.h"
+	<conio.h>
 
 1682273839 c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\histogam.h
 	<vector>
@@ -12,7 +13,7 @@
 1682273796 c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\histogam_internal.h
 	<vector>
 
-1682276727 source:c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\unittest.cpp
+1682276830 source:c:\users\admin\onedrive\Ðàáî÷èé ñòîë\lab1\unittest.cpp
 	"doctest.h"
 	"histogam_internal.h"
 	<vector>

unittest.layout

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<FileVersion major="1" minor="0" />
+	<ActiveTarget name="Debug" />
+</CodeBlocks_layout_file>