.gitignore

@@ -0,0 +1,4 @@
+bin/
+obj/
+*.o
+*.exe

histogram.cpp

@@ -1,65 +0,0 @@
-#include "histogram.h"
-#include <iostream>
-#include <vector>
-using namespace std;
-
-//std::vector<size_t>
-bool find_minmax(const vector<double>& numbers, double& minN, double& maxN)
-{
-    if (numbers.empty()) {
-        minN = maxN = 0;
-        return false;
-    }
-    minN = numbers[0];
-    maxN = numbers[0];
-
-    for (double x: numbers)
-    {
-        if (minN > x)
-        {
-            minN = x;
-        }
-        if (maxN < x)
-        {
-            maxN = x;
-        }
-    }
-    return true;
-}
-
-vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count)
-{
-    double minN, maxN;
-    find_minmax( numbers, minN, maxN);
-
-    vector <size_t> bins(bin_count);
-    double diff = (maxN - minN) / bin_count;
-    size_t max_count = 0;
-    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 = minN + j * diff;
-            auto hi = minN + (j + 1) * diff;
-            if ((lo <= numbers[i]) && (hi > numbers[i]))
-            {
-                bins[j]++;
-                if (bins[j] > max_count)
-                {
-                    max_count = bins[j];
-                }
-                found = true;
-            }
-        }
-        if(!found)
-        {
-            bins[bin_count - 1]++;
-            if (bins[bin_count - 1] > max_count)
-            {
-                max_count = 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,9 +0,0 @@
-#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
-#define HISTOGRAM_INTERNAL_H_INCLUDED
-
-#include <vector>
-
-//std::vector<size_t>
-bool find_minmax(const std::vector<double>& numbers, double& minN, double& maxN);
-
-#endif // HISTOGRAM_INTERNAL_H_INCLUDED

lab01.cbp

@@ -31,27 +31,10 @@
 		<Compiler>
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
-			<Add directory="curl/include" />
 		</Compiler>
-		<Linker>
-			<Add library="curl/lib/libcurl.dll.a" />
-			<Add directory="curl/lib" />
-		</Linker>
-		<Unit filename=".gitignore" />
-		<Unit filename="histogram.cpp" />
-		<Unit filename="histogram.h" />
-		<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 />
+		<Extensions>
+			<lib_finder disable_auto="1" />
+		</Extensions>
 	</Project>
 </CodeBlocks_project_file>

lab01.layout

@@ -0,0 +1,10 @@
+<?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="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="1461" topLine="0" />
+		</Cursor>
+	</File>
+</CodeBlocks_layout_file>

main.cpp

@@ -1,96 +1,68 @@
 #include <iostream>
 #include <vector>
-#include "histogram.h"
-#include "text.h"
-#include "svg.h"
-#include <curl/curl.h>
-#include <sstream>
-#include <string>
-
 using namespace std;
-
-struct Input
+int main()
 {
-    vector<double> numbers;
-    size_t bin_count{};
-};
+    size_t number_count,bin_count;
 
-Input
-input_data(istream& in, bool prompt)
-{
-    Input cin;
-    string numbCntPrmt, numbsPrmt, binCntPrmt;
-    if (prompt == true) {
-        numbCntPrmt = "Enter number count: ";
-        numbsPrmt = "Enter numbers: ";
-        binCntPrmt = "Enter bin count: ";
-    }
-    size_t number_count;
-    cerr << numbCntPrmt;
-    in >> number_count;
-    cin.numbers.resize(number_count);
+    cout << "Enter number count: ";
+    cin >> number_count;
 
     vector<double> numbers(number_count);
-
-    cerr << numbsPrmt;
     for (size_t i = 0; i < number_count; i++)
     {
-        in >> cin.numbers[i];
+        cout <<"Enter number: ";
+        cin >> numbers[i];
     }
+    cout <<"Enter number of bins: ";
+    cin >> bin_count;
 
-    cerr << binCntPrmt;
-    in >> cin.bin_count;
-    return cin;
-}
-
-size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
-     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);
+    vector<size_t> bins(bin_count);
+    double min = numbers[0];
+    double max = numbers[0];
+    for (double x : numbers) {
+        if (x < min) {
+            min = x;
+        }
+        else if (x > max) {
+            max = x;
+        }
+    }
 
-        res = curl_easy_perform(curl);
 
-        if(!res) {
-            curl_off_t ul;
-            res = curl_easy_getinfo(curl, CURLINFO_SIZE_DOWNLOAD_T, &ul);
-            if(!res) {
-                cerr<<"Uploaded bytes" << ul << endl;
+    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 low = min + j * bin_size;
+            auto high = min + (j + 1) * bin_size;
+            if ((low <= numbers[i]) && (numbers[i] < high))
+            {
+                bins[j]++;
+                found = true;
             }
         }
+        if (!found)
+        {
+            bins[bin_count - 1]++;
+        }
+    }
 
-        if (res != 0){
-            cerr << curl_easy_strerror(res);
-            exit(1);
+    /*for (size_t i = 0; i < bins.size(); ++i) {
+        cout << "Bin " << i + 1 << ": " << bins[i] << " |";
+        for (size_t j = 0; j < bins[i]; ++j) {
+            cout << "*";
         }
-        curl_easy_cleanup(curl);
+        cout << endl;
     }
-    return input_data(buffer, false);
-}
 
-int main(int argc, char* argv[])
-{
-    CURL* curl = curl_easy_init();
-    Input input;
-    if (argc > 1) {
-        input = download(argv[1]);
-    } else {
+    return 0;*/
+
+
+
 
-        input = input_data(cin, true);
-    }
 
-    auto bins = make_histogram(input.numbers, input.bin_count);
-    show_histogram_svg(bins);
 }
+

svg.cpp

@@ -1,92 +0,0 @@
-#include "svg.h"
-#include <string>
-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 svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black", double fill_opacity = 1.0) {
-    cout << "<rect x='" << x << "' y='" << y << "' width='" << width
-         << "' height='" << height << "' stroke='" << stroke
-         << "' fill='" << fill << "' fill-opacity='" << fill_opacity << "'/>";
-}
-
-void show_histogram_svg(const vector<size_t>& bins) {
-    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;
-
-    size_t max_count = *max_element(bins.begin(), bins.end());
-    if (max_count == 0) max_count = 1;
-
-    svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
-    double top = 0;
-
-    for (size_t bin : bins) {
-        const double bin_width = min(static_cast<double>(BLOCK_WIDTH * bin), static_cast<double>(IMAGE_WIDTH - TEXT_WIDTH));
-        double opacity = static_cast<double>(bin) / max_count;
-
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT,
-                "blue", "green", opacity);
-        top += BIN_HEIGHT;
-    }
-
-    svg_end();
-}
-*/
-
-void show_histogram_svg(const vector<size_t>& bins) {
-    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(400, 300);
-    double top = 0;
-
-    for (size_t bin : bins) {
-        const double bin_width = BLOCK_WIDTH * bin;
-        if(bin_width> IMAGE_WIDTH) {
-            const double bin_width= IMAGE_WIDTH - TEXT_WIDTH;
-        }
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "green");
-        top += BIN_HEIGHT;
-    }
-    svg_end();
-}
-

svg.h

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

text.cpp

@@ -1,54 +0,0 @@
-#include "text.h"
-#include <iostream>
-#include <vector>
-using namespace std;
-
-void show_histogram_text(const vector <size_t>& bins,size_t bin_count, size_t max_count)
-{
-    const size_t SCREEN_WIDTH = 80;
-    const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
-
-    bool scaling = false;
-
-    if (max_count > MAX_ASTERISK)
-    {
-        scaling = true;
-    }
-
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i] < 10)
-        {
-            cout << "  ";
-        }
-        else if (bins[i] < 100)
-        {
-            cout << " ";
-        }
-        else
-        {
-            cout << "";
-        }
-        cout << bins[i] << '|';
-
-        size_t number_of_stars = bins[i];
-
-        if (scaling)
-        {
-            if (bins[i] == max_count)
-            {
-                number_of_stars = MAX_ASTERISK * 1.0;
-            }
-            else
-            {
-                number_of_stars = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
-            }
-        }
-
-        for (size_t j = 0; j < number_of_stars; j++)
-        {
-            cout << '*';
-        }
-        cout << endl;
-    }
-}

text.h

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

unittest.cbp

@@ -1,41 +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>
-			<lib_finder disable_auto="1" />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

unittest.cpp

@@ -1,48 +0,0 @@
-#define DOCTEST_CONFIG_NO_MULTITHREADING
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "doctest.h"
-#include "histogram_internal.h"
-#include <vector>
-
-TEST_CASE("distinct positive numbers") {
-    double min = 0;
-    double max = 0;
-    find_minmax({1, 2}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 2);
-    CHECK(find_minmax({1, 2}, min, max));
-}
-
-TEST_CASE("distinct negative numbers")
-{
-    double min = 0;
-    double max = 0;
-    find_minmax({-1, -2}, min, max);
-    CHECK(min == -2);
-    CHECK(max == -1);
-    CHECK(find_minmax({-1, -2}, min, max));
-}
-TEST_CASE("vector 1 element")
-{
-    double min = 0;
-    double max = 0;
-    find_minmax({1}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 1);
-    CHECK(find_minmax({1}, min, max));
-}
-TEST_CASE("distinct equals numbers")
-{
-    double min = 0;
-    double max = 0;
-    find_minmax({1, 1}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 1);
-    CHECK(find_minmax({1, 1}, min, max));
-}
-TEST_CASE("distinct empty vector")
-{
-    double min = -1;
-    double max = -1;
-    CHECK(!find_minmax({}, min, max));
-}