вывод гистограммы в svg формате

histogram.cpp

@@ -1,40 +0,0 @@
-#include "histogram.h"
-bool
-find_minmax(std::vector<double> numbers, double& min, double& max) {
-    if(numbers.size() == 0){
-        return false;
-    }
-    min = numbers[0];
-    max = numbers[0];
-    for (double x : numbers) {
-        if (x < min) {
-            min = x;
-        }
-        else if (x > max)
-        {
-                max = x;
-        }
-    }
-    return true;
-}
-std::vector<size_t>
-make_histogram(const std::vector<double>& numbers,size_t bin_count){
-    std::vector<size_t> bins(bin_count);
-    double min,max;
-    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;
-}

histogram.h

@@ -1,8 +0,0 @@
-#ifndef HISTOGRAM_H_INCLUDED
-#define HISTOGRAM_H_INCLUDED
-#include <vector>
-#include <iostream>
-std::vector<size_t>
-make_histogram(const std::vector<double>& numbers, size_t bin_count);
-
-#endif

histogram_internal.h

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

main.cpp

@@ -1,12 +1,5 @@
-#include <curl/curl.h>
-#include <sstream>
-#include <string>
-#include "histogram.h"
-#include "text.h"
 #include <iostream>
 #include <vector>
-#include "svg.h"
-
 
 using namespace std;
 struct Input {
@@ -14,57 +7,108 @@ struct Input {
     size_t bin_count{};
 };
 Input
-input_data(istream& in,bool promt = false) {
+input_data(){
     size_t number_count;
-    if (promt)
     cerr << "Number_count: ";
-    in >> number_count;
-    Input im;
-    im.numbers.resize(number_count);
+    cin >> number_count;
+    Input in;
+    in.numbers.resize(number_count);
     for (size_t i = 0; i < number_count; i++) {
-        in >> im.numbers[i];
+        cin >> in.numbers[i];
     }
-    if (promt)
     cerr << "Enter bin_count: ";
-    in >> im.bin_count;
-    return im;
+    cin >> in.bin_count;
+    return in;
 }
-size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx){
-    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
-    size_t data_size = item_size * item_count;
-    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) {
-        curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
-        curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
-        curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
-        CURLcode res = curl_easy_perform(curl);
-        curl_easy_cleanup(curl);
-        if(res != 0){
-            cerr << curl_easy_strerror(res);
-            exit(1);
+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;
+        }
+        if(x>max){
+            max=x;
         }
     }
-    return input_data(buffer, false);
 }
-
-int main(int argc, char* argv[]) {
-
-    curl_global_init(CURL_GLOBAL_ALL);
-
-    Input input;
-    if (argc > 1) {
-        input = download(argv[1]);
-    } else {
-        input = input_data(cin, true);
+vector<size_t>
+make_histogram(const vector<double>& numbers,size_t bin_count){
+    vector<size_t> bins(bin_count);
+    double min,max;
+    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;
             }
-    auto bins = make_histogram(input.numbers, input.bin_count);
-    show_histogram_svg(bins);
+        }if(!found){
+            bins[bin_count-1]++;
+        }
+    }
+    return bins;
+}
+void
+show_histogram(vector<size_t>bins,size_t bin_count){
+    size_t Maxbins = 0;
+    for (size_t i = 0; i < bin_count; i++)
+    {
+        if (bins[i] > Maxbins)
+        {
+            Maxbins = bins[i];
+        }
+    }
+    const size_t MAX_HEIGHT = 76;
+    if (Maxbins <= MAX_HEIGHT)
+    {
+        for (size_t i = 0; i < bin_count; i++)
+        {
+            if (bins[i] < 10)
+            {
+                cout << " ";
+            }
+            cout << " " << bins[i]<< "|";
+            for (size_t j = 0; j < bins[i]; j++)
+            {
+                cout << "*";
+            }
+            cout << endl;
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < bin_count; i++)
+        {
+            size_t height = static_cast<size_t>(MAX_HEIGHT * (static_cast<double>(bins[i]) / Maxbins));
+
+            if (bins[i] < 100)
+            {
+                cout << " ";
+            }
+            if (bins[i] < 10)
+            {
+                cout << " ";
+            }
+            cout << bins[i] << "|";
+            for (size_t j = 0; j < height; j++)
+            {
+                cout << "*";
+            }
+            cout << endl;
+        }
+    }
+}
+int
+main() {
+    auto in = input_data();
+    auto bins = make_histogram(in.numbers, in.bin_count);
+    show_histogram(bins,in.bin_count);
     return 0;
 }
 

svg.h

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

text.cpp

@@ -1,51 +0,0 @@
-#include "text.h"
-void
-show_histogram_text(std::vector<size_t>bins,size_t bin_count){
-    size_t Maxbins = 0;
-    for (size_t i = 0; i < bin_count; i++)
-    {
-        if (bins[i] > Maxbins)
-        {
-            Maxbins = bins[i];
-        }
-    }
-    const size_t MAX_HEIGHT = 76;
-    if (Maxbins <= MAX_HEIGHT)
-    {
-        for (size_t i = 0; i < bin_count; i++)
-        {
-            if (bins[i] < 10)
-            {
-                std::cout << " ";
-            }
-            std::cout << " " << bins[i]<< "|";
-            for (size_t j = 0; j < bins[i]; j++)
-            {
-                std::cout << "*";
-            }
-            std::cout << std::endl;
-        }
-    }
-    else
-    {
-        for (size_t i = 0; i < bin_count; i++)
-        {
-            size_t height = static_cast<size_t>(MAX_HEIGHT * (static_cast<double>(bins[i]) / Maxbins));
-
-            if (bins[i] < 100)
-            {
-                std::cout << " ";
-            }
-            if (bins[i] < 10)
-            {
-                std::cout << " ";
-            }
-            std::cout << bins[i] << "|";
-            for (size_t j = 0; j < height; j++)
-            {
-                std::cout << "*";
-            }
-            std::cout << std::endl;
-        }
-    }
-}

text.h

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

unittest.cbp

@@ -0,0 +1,40 @@
+<?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="doctest.h" />
+		<Unit filename="histogram.cpp" />
+		<Unit filename="histogram_internal.h" />
+		<Unit filename="unittest.cpp" />
+		<Extensions />
+	</Project>
+</CodeBlocks_project_file>