Родитель
							
								
									a0b7d3e83a
								
							
						
					
					
						Сommit
						bdab39b266
					
				| @ -0,0 +1,2 @@ | ||||
| /bin | ||||
| obj/ | ||||
| @ -0,0 +1,55 @@ | ||||
| #include <iostream> | ||||
| #include <vector> | ||||
| #include "histogram.h" | ||||
| 
 | ||||
| void find_minmax(const std::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; | ||||
|         } | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| std::vector<int> make_histogram(const std::vector<double>& numbers, size_t bin_count) | ||||
| { | ||||
|     std::vector<int> bins(bin_count); | ||||
|     int max_count = bins[0]; | ||||
|     double min = numbers[0]; | ||||
|     double max = numbers[0]; | ||||
| 
 | ||||
|     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; | ||||
| } | ||||
| @ -0,0 +1,8 @@ | ||||
| #ifndef HISTOGRAM_H_INCLUDED | ||||
| #define HISTOGRAM_H_INCLUDED | ||||
| 
 | ||||
| 
 | ||||
| std::vector<int> | ||||
| make_histogram(const std::vector<double>& numbers, size_t bin_count); | ||||
| 
 | ||||
| #endif // HISTOGRAM_H_INCLUDED
 | ||||
| @ -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="main.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> | ||||
| 		<Cursor> | ||||
| 			<Cursor1 position="429" topLine="0" /> | ||||
| 		</Cursor> | ||||
| 	</File> | ||||
| 	<File name="histogram.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> | ||||
| 		<Cursor> | ||||
| 			<Cursor1 position="855" topLine="0" /> | ||||
| 		</Cursor> | ||||
| 	</File> | ||||
| </CodeBlocks_layout_file> | ||||
| @ -0,0 +1,71 @@ | ||||
| #include <iostream> | ||||
| #include <vector> | ||||
| #include "svg.h" | ||||
| // #include"svg_rect.h"
 | ||||
| 
 | ||||
| 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; | ||||
| 
 | ||||
| void svg_begin(double width, double height) | ||||
| { | ||||
|     std::cout << "<?xml version='1.0' encoding='UTF-8'?>\n"; | ||||
|     std::cout << "<svg "; | ||||
|     std::cout << "width='" << width << "' "; | ||||
|     std::cout << "height='" << height << "' "; | ||||
|     std::cout << "viewBox='0 0 " << width << " " << height << "' "; | ||||
|     std::cout << "xmlns='http://www.w3.org/2000/svg'>\n"; | ||||
| } | ||||
| 
 | ||||
| void svg_end() | ||||
| { | ||||
|     std::cout << "</svg>\n"; | ||||
| } | ||||
| 
 | ||||
| void svg_text(double left, double baseline, std::string text) | ||||
| { | ||||
|     // std::cout << "<text x='20' y='35'>text</text>";
 | ||||
| 
 | ||||
|     std::cout << "<text x=' " << left << " ' y='" << baseline << "' > " << text << " </text>"; | ||||
| 
 | ||||
|     // std::cout << "<text x='20' y='" << baseline << "' >2</text>";
 | ||||
| } | ||||
| 
 | ||||
| void svg_rect(double x, double y, double width, double height) | ||||
| { | ||||
| 
 | ||||
|     std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << " ' stroke='yellow' fill='#9932CC' ></rect>"; | ||||
| } | ||||
| 
 | ||||
| void show_histogram_svg(const std::vector<int> &bins) | ||||
| { | ||||
|     const auto SCALE = (IMAGE_WIDTH - TEXT_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; | ||||
|     const auto BLOCK_WIDTH = 10; | ||||
|     svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); | ||||
|     double top = 0; | ||||
|     for (size_t bin : bins) | ||||
|     { | ||||
|         double bin_width = BLOCK_WIDTH * bin; | ||||
| 
 | ||||
|         if (bin_width > SCALE) | ||||
|         { | ||||
|             bin_width = SCALE; | ||||
|         } | ||||
| 
 | ||||
|         svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bin)); | ||||
|         svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT); | ||||
|         top += BIN_HEIGHT; | ||||
|     } | ||||
| 
 | ||||
|     svg_end(); | ||||
| } | ||||
| @ -0,0 +1,8 @@ | ||||
| #ifndef SVG_H_INCLUDED | ||||
| #define SVG_H_INCLUDED | ||||
| #include <vector> | ||||
| 
 | ||||
| void | ||||
| show_histogram_svg(const std::vector<int>& bins); | ||||
| 
 | ||||
| #endif     //SVG_H_INCLUDED
 | ||||
| @ -0,0 +1,51 @@ | ||||
| #include <iostream> | ||||
| #include <vector> | ||||
| #include "text.h" | ||||
| 
 | ||||
| const size_t SCREEN_WIDTH = 80; | ||||
| const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; | ||||
| 
 | ||||
| 
 | ||||
| void show_histogram_text(std::vector<int> &bins, size_t bin_count) | ||||
| { | ||||
|     int max_count = bins[0]; | ||||
|     for (int i = 0; i < bin_count; i++) | ||||
|     { | ||||
|         if (bins[i] > max_count) | ||||
|         { | ||||
|             max_count = bins[i]; | ||||
|         } | ||||
|     } | ||||
|     std::vector<double> height(bin_count); | ||||
|     for (int i = 0; i < bin_count; i++) | ||||
|     { | ||||
|         if (bins[i] > MAX_ASTERISK) | ||||
|         { | ||||
|             height[i] = (MAX_ASTERISK * bins[i]) / max_count; | ||||
|         } | ||||
|         else | ||||
|             height[i] = bins[i]; | ||||
|     } | ||||
| 
 | ||||
|     for (int i = 0; i < bin_count; i++) | ||||
|     { | ||||
| 
 | ||||
|         if (bins[i] < 100) | ||||
|         { | ||||
|            std::cout << " "; | ||||
|         } | ||||
| 
 | ||||
|         if (bins[i] < 10) | ||||
|         { | ||||
|             std::cout << " " ; | ||||
|         } | ||||
| 
 | ||||
|         std::cout << bins[i] << "|"; | ||||
| 
 | ||||
|         for (int j = 0; j < height[i]; j++) | ||||
|         { | ||||
|             std::cout << "*"; | ||||
|         } | ||||
|        std::cout << std::endl; | ||||
|     } | ||||
| } | ||||
| @ -0,0 +1,8 @@ | ||||
| #ifndef TEXT_H_INCLUDED | ||||
| #define TEXT_H_INCLUDED | ||||
| #include <vector> | ||||
| 
 | ||||
| void | ||||
| show_histogram_text(std::vector<int> &bins, size_t bin_count); | ||||
| 
 | ||||
| #endif // TEXT_H_INCLUDED
 | ||||
| @ -0,0 +1 @@ | ||||
| 
 | ||||
| @ -0,0 +1,38 @@ | ||||
| <?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> | ||||
| 		<Extensions> | ||||
| 			<lib_finder disable_auto="1" /> | ||||
| 		</Extensions> | ||||
| 	</Project> | ||||
| </CodeBlocks_project_file> | ||||
| @ -0,0 +1,12 @@ | ||||
| #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); | ||||
| } | ||||
| @ -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> | ||||
					Загрузка…
					
					
				
		Ссылка в новой задаче
	
	 MovsisianRG
						MovsisianRG