code: refactoring

project/lab34.cbp

@@ -32,7 +32,18 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram.h" />
+		<Unit filename="histogram_internal.h" />
 		<Unit filename="main.cpp" />
+		<Unit filename="percent.cpp" />
+		<Unit filename="percent.h" />
+		<Unit filename="show_histogram.cpp" />
+		<Unit filename="show_svg.h" />
+		<Unit filename="svg.cpp" />
+		<Unit filename="svg.h" />
+		<Unit filename="text.cpp" />
+		<Unit filename="text.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

project/main.cpp

@@ -3,6 +3,7 @@
 #include "histogram.h"
 #include "svg.h"
 #include "show_svg.h"
+#include <curl/curl.h>
 using namespace std;
 
 struct Input {
@@ -13,29 +14,39 @@ struct Input {
 };
 
 Input
-input_data() {
+input_data(istream& stream, bool prompt) {
-    Input in;
+    size_t number_count;
+    if (prompt) {
         cerr << "Enter number count: ";
-    cin >> in.number_count;
+    }
+    stream >> number_count;
 
-    vector<double> numbers(in.number_count);
+    Input in;
-    in.numbers.resize(in.number_count);
+    in.numbers.resize(number_count);
-    for (size_t i = 0; i < in.number_count; i++) {
+
-        cin >> in.numbers[i];
+
+   if (prompt){
+            cerr << "Enter numbers: ";
+    }
+    for (size_t i = 0; i < number_count; i++)
+    {
+        stream >> in.numbers[i];
     }
 
-    size_t bin_count;
+    if (prompt){
-    cerr << "Enter bin count: ";
+    cerr << "Enter number of bins: ";
-    cin >> in.bin_count;
+    }
+        stream >> in.bin_count;
+
 
-    size_t max_count;
-    in.max_count = 0;
     return in;
 }
 
 int main()
 {
-    Input in = input_data();
+     curl_global_init(CURL_GLOBAL_ALL);
+    bool prompt = true;
+    auto in = input_data(cin, prompt);
     vector<size_t> bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
     show_histogram_svg(bins);
     return 0;

project/show_histogram.cpp

@@ -1,5 +1,5 @@
 #include "svg.h"
-#include "percent.h"
+
 
 void
 show_histogram_svg(const vector<size_t>& bins) {
@@ -29,10 +29,10 @@ show_histogram_svg(const vector<size_t>& bins) {
         }
     }
     for (size_t bin : bins) {
-            const double bin_width = BLOCK_WIDTH * bin;
+            const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * (bin) / (longest);
             if (bin == longest){
                 svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-                svg_rect(TEXT_WIDTH, top, IMAGE_WIDTH - 2*TEXT_WIDTH, BIN_HEIGHT, "#000000", "#ff00a2");
+                svg_rect(TEXT_WIDTH, top, IMAGE_WIDTH - TEXT_WIDTH, BIN_HEIGHT, "#000000", "#ff00a2");
                 top += BIN_HEIGHT;
             } else{
                 svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
@@ -40,11 +40,5 @@ show_histogram_svg(const vector<size_t>& bins) {
                 top += BIN_HEIGHT;
             }
     }
-    top = 0;
-    percent(bins, bins_percent);
-    for (size_t bin_percent : bins_percent){
-            svg_text(IMAGE_WIDTH - TEXT_WIDTH + TEXT_LEFT, top + TEXT_BASELINE, to_string(bin_percent)+"%");
-            top += BIN_HEIGHT;
-    }
     svg_end();
 }

project/unittest.cbp

@@ -33,6 +33,8 @@
 		</Compiler>
 		<Unit filename="histogram.cpp" />
 		<Unit filename="histogram_internal.h" />
+		<Unit filename="percent.cpp" />
+		<Unit filename="percent.h" />
 		<Unit filename="unittest.cpp" />
 		<Extensions>
 			<lib_finder disable_auto="1" />

project/unittest.cpp

@@ -2,7 +2,6 @@
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"
 #include "histogram_internal.h"
-#include "percent.h"
 
 TEST_CASE("distinct empty") {
     double min = 0;
@@ -39,9 +38,3 @@ TEST_CASE("distinct negative numbers") {
     CHECK(min == -4);
     CHECK(max == -1.5);
 }
-TEST_CASE("percent 1") {
-    const vector<size_t>bins{5, 10, 10, 50, 25};
-    vector<size_t>bins_percent{};
-    percent(bins, bins_percent);
-    CHECK(bins_percent[0] == 5);
-}