koko

.gitignore

@@ -1,3 +1,4 @@
-\bin
+/bin
-\obj
+/Obj
-\*.layout
+/*.layout
+/curl

histogram.cpp

@@ -3,17 +3,28 @@
 
 using namespace std;
 
-
+void find_minmax(const vector<double>& numbers, double& min, double& max)
-void
+{
-static find_minmax(const vector<double>& numbers, double& min, double& max) {
 min = numbers[0];
-    max = numbers[0];
+for (auto i = 0; i < numbers.size(); i++)
-    for(size_t i=0; i< numbers.size(); i++){
+{
-        if(min > numbers[i])
+if (numbers[i] < min)
+{
 min = numbers[i];
-        if(max < numbers[i])
+}
+}
+
+max = numbers[0];
+for (auto i = 0; i < numbers.size(); i++)
+{
+if (numbers[i] > max)
+{
 max = numbers[i];
-}}
+}
+}
+
+}
+
 
 vector<size_t> make_histogram(vector<double>& numbers, size_t bin_count)
 {

histogram.h

@@ -1,13 +1,9 @@
 #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);
-
 
+#include <vector>
 
+std::vector<size_t> make_histogram(std::vector<double>& numbers, size_t bin_count);
 
 #endif // HISTOGRAM_H_INCLUDED
 

histogram.h.save-failed

@@ -1,15 +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):
-
-
-find_minmax(const std::vector<double>& numbers, double& min, double& max):
-
-
-
-#endif // HISTOGRAM_H_INCLUDED
-

histogram_internal.h

@@ -1,9 +1,8 @@
-#ifndef HISTOGRAM_H_INCLUDED
+#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
-#define HISTOGRAM_H_INCLUDED
+#define HISTOGRAM_INTERNAL_H_INCLUDED
 
 #include <vector>
 
-std::vector<size_t> make_histogram(std::vector<double>& numbers, size_t bin_count);
+void find_minmax(const std::vector<double>& numbers, double& min, double& max);
-
-#endif // HISTOGRAM_H_INCLUDED
 
+#endif // HISTOGRAM_INTERNAL_H_INCLUDED

main.cpp

@@ -1,66 +1,83 @@
 #include <iostream>
 #include <vector>
+#inclide <cmath>
+#invlude <string>
+#include "histogram.h"
+#include "text.h"
 #include <conio.h>
-
+#include "histogram_internal.h"
-using namespace std;
+#include <curl/curl.h>
+#include <sstream>
+#include "svg.h"
 
 
+using namespace std;
 
+struct Input
+{
+vector<double> numbers;
+size_t bin_count{};
+};
 
-int main()
+Input
+input_data(istream &tin, bool promt)
 {
+Input in;
 size_t number_count;
 
-cerr << "Enter number count: ";              //количество чисел
+if (promt)
-cin >> number_count;
+{
-
+    cerr << "enter number count";
-vector<double> numbers(number_count);         //векток с числами
+}
+tin>> number_count;
 
-for(size_t i=0; i < number_count; i++)       //заполнение вектора
-    cin >> numbers[i];
 
-size_t bin_count;                               //количество корзин
-cerr << "Enter bin count: ";
-cin >> bin_count;
 
-vector<size_t> bins(bin_count);
+in.numbers.resize(number_count);
+for (size_t i = 0; i < number_count; i++)
+{
+in>> in.numbers[i];
+}
 
-double min;
+if (promt)
-min = numbers[0];
+{
-for (size_t i = 1; i < numbers.size(); i++)
+    cerr<<"enter bin count:";
-    if (numbers[i] < min)
+}
-        min = numbers[i];
+in >>in.bin_count;
 
+return in;
+}
 
-double max;
-max = numbers[0];
-for (size_t i = 1; i < numbers.size(); i++)
-    if (numbers[i] > max)
-        max = numbers[i];
 
-double bin_size = (max - min) / bin_count;
 
-for (size_t i = 0; i < number_count; i++) {
+int main(int arg, char* argv[])
-    bool found = false;
+{
-    for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
+    if (arg > 1)
-        auto lo = min + j * bin_size;
+    {
-        auto hi = min + (j + 1) * bin_size;
+        CURL* curl = curl_easy_init();
-        if ((lo <= numbers[i]) && (numbers[i] < hi)) {
+        if(curl)
-            bins[j]++;
+        {
-            found = true;
+            CURLcode res;
-        }
+            curl_easy_setopt(curl,CURLOPT_URL,argv[1]);
-    }
+            res = curl_easy_perform(curl);
-     if (!found) {
+            curl_easy_cleanup(curl);
-        bins[bin_count - 1]++;
+            if (res != CURE_OK)
+            {
+                cout<<curl_easy_strerror;
+                exit(1);
             }
         }
+        return 0;
 
-for (size_t i=0; i<bins.size(); i++)
-    {cout << bins[i] << "|";
-    for (size_t j=0; j<bins[i]; j++)
-        cout << "*";
-    cout << "\n" ;
     }
 
+Input in = input_data();
+char arr[bin_count];
+for(int i=0; i<bin_count;i++)
+{
+    cin>>arr[i];
+}
+auto bins = make_histogram(in.numbers, in.bin_count);
+show_histogram_svg(bins);
 return 0;
 }

unittest.cpp

@@ -26,4 +26,3 @@ find_minmax({-2, -1}, min, max);
 CHECK(min == -2);
 CHECK(max == -1);
 }
-