project/histogram.cpp

@@ -2,58 +2,38 @@
 #include <vector>
 #include "histogram.h"
 using namespace std;
-bool
+void
-find_minmax(vector<double> numbers, double& min, double& max)
+find_minmax(vector<double> numbers, double& min, double& max) {
-{
-    bool check;
-    if(numbers.size()==0)
-    {
-
-        check = false;
-    }
-    else
-    {
     min = numbers[0];
     max = numbers[0];
-        for (double x : numbers)
+    for (double x : numbers) {
-        {
+    if (x < min) {
-            if (x < min)
-            {
         min = x;
     }
-            else if (x > max)
+    else if (x > max) {
-            {
         max = x;
     }
-        }
+}
-    }
-   return check;
 }
 
 vector<size_t>
-make_histogram(vector<double> numbers, size_t bin_count)
+make_histogram(vector<double> numbers, size_t bin_count) {
-{
     vector <size_t> bins(bin_count);
     double min, max;
-    bool check;
+    find_minmax(numbers, min, max);
-    check = find_minmax(numbers, min, max);
     size_t countt;
     double bin_size = (max - min) / bin_count;
-    for (size_t i = 0; i < numbers.size(); i++)
+    for (size_t i = 0; i < numbers.size(); i++) {
-    {
     bool found = false;
-        for (size_t j = 0; (j < bin_count - 1) && !found; j++)
+    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))
+        if ((lo <= numbers[i]) && (numbers[i] < hi)) {
-            {
             bins[j]++;
             found = true;
         }
     }
-        if (!found)
+        if (!found) {
-        {
         bins[bin_count - 1]++;
     }
     }

project/main.cpp

@@ -1,83 +1,32 @@
-#include <curl/curl.h>
 #include <iostream>
 #include <vector>
 #include "histogram.h"
 #include "text.h"
 #include "svg.h"
-#include "emptiness.h"
-#include <sstream>
-#include <string>
 using namespace std;
-struct Input
+struct Input {
-{
     vector<double> numbers;
     size_t bin_count{};
 };
 
 Input
-input_data(istream& tin, bool prompt)
+input_data(){
-{
     size_t number_count;
-    if (prompt)
     cerr << "Enter number count: ";
-    tin >> number_count;
+    cin >> number_count;
     Input in;
     in.numbers.resize(number_count);
-    for(int i; i<number_count; i++)
+    for(int i;i<number_count;i++)
     {
-        tin >> in.numbers[i];
+        cin >> in.numbers[i];
     }
-    if (prompt)
     cerr << "Enter bin count: ";
-    tin >> in.bin_count;
+    cin >> in.bin_count;
     return in;
 }
-
+int main()
-size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx)
+{   Input in = input_data();
-{
+    auto bins = make_histogram(in.numbers, in.bin_count);
-    size_t data_size = item_size * item_count;
-    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    buffer->write(reinterpret_cast<const char*>(items), data_size);
-    return data_size;
-}
-
-Input
-download(const string& address)
-{
-    stringstream buffer;
-    CURL *curl = curl_easy_init();
-    if(curl)
-    {
-        CURLcode res;
-        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
-        res = curl_easy_perform(curl);
-        if (res != CURLE_OK)
-        {
-            fprintf(stderr, "curl_easy_perform() failed: %s\n",curl_easy_strerror(res));
-            exit(1);
-        }
-        curl_easy_cleanup(curl);
-
-    }
-    return input_data(buffer, false);
-}
-
-int
-main(int argc, char* argv[])
-{
-    Input input;
-    if (argc > 1)
-    {
-        input = download(argv[1]);
-    }
-    else
-    {
-        input = input_data(cin, true);
-    }
-
-    const auto bins = make_histogram(input.numbers, input.bin_count);
     show_histogram_svg(bins);
+    return 0;
 }
-

project/project.cbp

@@ -13,12 +13,7 @@
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
-					<Add directory="curl/include" />
 				</Compiler>
-				<Linker>
-					<Add library="libcurl.dll.a" />
-					<Add directory="curl/lib" />
-				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="bin/Release/project" prefix_auto="1" extension_auto="1" />
@@ -37,31 +32,7 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Unit filename=".gitignore" />
-		<Unit filename="emptiness.cpp" />
-		<Unit filename="emptiness.h">
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
-		<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="tasktest.h">
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
-		<Unit filename="test.cpp" />
-		<Unit filename="text.cpp" />
-		<Unit filename="text.h">
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>

project/svg.cpp

@@ -4,7 +4,6 @@
 #include <vector>
 #include <string>
 #include "svg.h"
-#include "emptiness.h"
 using namespace std;
 
 void
@@ -42,7 +41,7 @@ show_histogram_svg(const vector<size_t>& bins) {
     const auto TEXT_WIDTH = 50;
     const auto BIN_HEIGHT = 30;
     const auto BLOCK_WIDTH = 10;
-    const double MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;
+    const auto MAX_WIDTH = IMAGE_WIDTH-TEXT_WIDTH;
 
 
     svg_begin(IMAGE_WIDTH,IMAGE_HEIGHT);
@@ -55,7 +54,8 @@ double max_count = bins[0];
     }
     for (size_t bin : bins) {
         const double bin_width = MAX_WIDTH * (bin/max_count);
-        double emptiness_width = emptiness(MAX_WIDTH,bin_width);
+        const double emptiness_width = MAX_WIDTH - bin_width;
+        svg_rect(0, top, emptiness_width, BIN_HEIGHT, "white", "#ffffff");
         svg_text(TEXT_LEFT + MAX_WIDTH, top + TEXT_BASELINE, to_string(bin));
         svg_rect(emptiness_width, top, bin_width, BIN_HEIGHT, "red", "#aaffaa");
         top += BIN_HEIGHT;

unittest.cpp

@@ -1,38 +1,16 @@
 #define DOCTEST_CONFIG_NO_MULTITHREADING
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
 #include "doctest.h"
-#include "project\emptiness.h"
 #include "project\histogram_internal.h"
 
-TEST_CASE("difference check") {
+TEST_CASE("distinct positive numbers") {
-    double a = 20;
-    double b = 10;
-    double c = emptiness(a,b);
-    CHECK(c == 10);
-    CHECK(c > 0);
-    }
-TEST_CASE("more then 0 check") {
-    double a = 20;
-    double b = 10;
-    double c = emptiness(a,b);
-    CHECK(c > 0);
-    }
-TEST_CASE("less then 0 check") {
-    double a = 10;
-    double b = 20;
-    double c = emptiness(a,b);
-    CHECK(c < 0);
-    }
-TEST_CASE("not 0 check") {
-    double a = 20;
-    double b = 10;
-    double c = emptiness(a,b);
-    CHECK(c != 0);
-    }
-TEST_CASE("is massif full") {
     double min = 0;
     double max = 0;
-    std::vector<double>v{};
+    std::vector<double>v{2,1};
-    bool c = find_minmax(v,min,max);
+    CHECK(v.size() != 0);
-    CHECK(c == false);
+    CHECK(v.size() != 1);
-    }
+    find_minmax({1, 2}, min, max);
+    CHECK(min == 1);
+    CHECK(max == 2);
+    CHECK(min != max);
+}