histogram.cpp

@@ -1,40 +0,0 @@
-#include <vector>
-#include "histogram.h"
-using namespace std;
-void find_minmax(const 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(const vector<double>& numbers, size_t bin_count)
-{
-    double min,max;
-    find_minmax(numbers, min, max);
-    vector<size_t> bins(bin_count);
-    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 ( (numbers[i] >= lo) && (numbers[i] < hi) ) {
-                bins[j]++;
-                found = true;
-            }
-        }
-        if (!found) {
-            bins[bin_count-1]++;
-        }
-
-    }
-    return bins;
-}

histogram.h

@@ -1,9 +0,0 @@
-#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

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

laba.cbp

@@ -32,22 +32,7 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<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;" />
-		</Unit>
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>

main.cpp

@@ -1,38 +1,92 @@
 #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{
+int main()
-    vector<double> numbers;
-    size_t bin_count{};
-};
-
-Input input_data()
 {
     size_t number_count;
     cerr << "Enter number count: ";
     cin >> number_count;
 
-    Input in;
+    vector<double> numbers(number_count);
-
-    in.numbers.resize(number_count);
     cerr << "Enter numbers: ";
     for(size_t i = 0; i < number_count; i++){
-        cin >> in.numbers[i];
+        cin >> numbers[i];
     }
 
+    size_t bin_count;
     cerr << "Enter bin count: ";
-    cin >> in.bin_count;
+    cin >> bin_count;
-    return in;
+
+    double min = numbers[0];
+    double max = numbers[0];
+    for (double x : numbers) {
+        if (x < min) {
+            min = x;
+        }
+        else if (x > max) {
+            max = x;
+        }
+    }
+    vector<size_t> bins(bin_count);
+    double bin_size = (max-min)/bin_count;
+    for (size_t i = 0; i < number_count; 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 ( (numbers[i] >= lo) && (numbers[i] < hi) ) {
+                bins[j]++;
+                found = true;
+            }
+        }
+        if (!found) {
+            bins[bin_count-1]++;
         }
 
-int main()
+    }
-{
+    size_t max_count = bins[0];
-    auto in = input_data();
+    for(size_t x: bins){
-    auto bins = make_histogram(in.numbers, in.bin_count);
+        if(x > max_count){
-    show_histogram_svg(bins);
+            max_count = x;
+        }
+    }
+    if (max_count > MAX_ASTERISK){
+        for(size_t count: bins){
+            size_t height = MAX_ASTERISK * (static_cast<double>(count) /max_count);
+            if (count < 10){
+                cout << "  " << count << "|";
+            }
+            else if (count < 100){
+                cout << " " << count << "|";
+            }
+            else{
+                cout << count << "|";
+            }
+            for(size_t i = 0; i < height; i++){
+                cout << "*";
+            }
+            cout << "\n";
+        }
+    }
+    else{
+        for(double x : bins){
+            if (x < 10){
+                cout << "  " << x << "|";
+            }
+            else if (x < 100){
+                cout << " " << x << "|";
+            }
+            else{
+                cout << x << "|";
+            }
+            for(size_t i = 0; i < x; i++){
+                cout << "*";
+            }
+            cout << "\n";
+        }
+    }
     return 0;
 }

marks.txt

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

svg.cpp

@@ -1,73 +0,0 @@
-#include "svg.h"
-#include <iostream>
-#include <vector>
-#include <string>
-const size_t x=20;
-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 = IMAGE_WIDTH-30;
-    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);
-    auto space = IMAGE_WIDTH - TEXT_WIDTH;
-    size_t max_count = bins[0];
-    for(size_t x: bins){
-        if(x > max_count){
-            max_count = x;
-        }
-    }
-    double top = 0;
-    if ((max_count*BLOCK_WIDTH) > space){
-        for (size_t bin : bins) {
-            const double bin_width = space * bin / max_count;
-            svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-            svg_rect(TEXT_LEFT - bin_width - 20, top, bin_width, BIN_HEIGHT, "black", "blue");
-            top += BIN_HEIGHT;
-        }
-        svg_end();
-    }
-    else{
-        for (size_t bin : bins) {
-            const double bin_width = BLOCK_WIDTH * bin;
-            svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-            svg_rect(TEXT_LEFT - bin_width - 20, top, bin_width, BIN_HEIGHT, "black", "blue");
-            top += BIN_HEIGHT;
-        }
-        svg_end();
-    }
-}
-
-

svg.h

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

text.cpp

@@ -1,50 +0,0 @@
-#include <vector>
-#include "text.h"
-#include <iostream>
-using namespace std;
-const size_t SCREEN_WIDTH = 80;
-const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-void show_histogram_text(const vector<size_t>& bins)
-{
-    size_t max_count = bins[0];
-    for(size_t x: bins){
-        if(x > max_count){
-            max_count = x;
-        }
-    }
-    if (max_count > MAX_ASTERISK){
-        for(size_t count: bins){
-            size_t height = MAX_ASTERISK * (static_cast<double>(count) /max_count);
-            if (count < 10){
-                cout << "  " << count << "|";
-            }
-            else if (count < 100){
-                cout << " " << count << "|";
-            }
-            else{
-                cout << count << "|";
-            }
-            for(size_t i = 0; i < height; i++){
-                cout << "*";
-            }
-            cout << "\n";
-        }
-    }
-    else{
-        for(double x : bins){
-            if (x < 10){
-                cout << "  " << x << "|";
-            }
-            else if (x < 100){
-                cout << " " << x << "|";
-            }
-            else{
-                cout << x << "|";
-            }
-            for(size_t i = 0; i < x; i++){
-                cout << "*";
-            }
-            cout << "\n";
-        }
-    }
-}

text.h

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

unittest.cbp

@@ -1,39 +0,0 @@
-<?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 />
-	</Project>
-</CodeBlocks_project_file>

unittest.cpp

@@ -1,12 +0,0 @@
-#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 , -5}, min, max);
-    CHECK(min == -3);
-    CHECK(max == -1);
-}