.gitignore

@@ -1,8 +1,6 @@
-lab04.cbp
+lab03.cbp
-/curl
 /bin
 /obj
-lab04.depend
+lab03.depend
-lab04.layout
 unittest.depend
 unittest.cbp

histogram.cpp

@@ -1,45 +1,51 @@
 #include "histogram.h"
 
-vector<size_t> make_histogram(const vector<double> &numbers, size_t bin_count) {
+vector <size_t>
+make_histogram(const vector<double>& numbers, size_t & bin_count, size_t & number_count, size_t & max_count) {
     double min, max;
-    bool res = false;
+    find_minmax(numbers, min, max);
-    find_minmax(numbers, min, max, res);
+    double bin_size = (max - min) / bin_count;
-    double bin_size = ( max - min ) / bin_count;
+    vector<size_t> bins(bin_count);
-    vector<size_t> bins ( bin_count );
+    max_count = bins[0];
-    for (size_t i=0; i <  numbers.size(); i++ ){
+    for (size_t i = 0; i < number_count; 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;
+            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 (bins[j] > max_count){
+                max_count = bins[j];
+            }
+        }
+        if (!found){
+            bins[bin_count - 1]++;
         }
-        if ( !found ){
+        if (bins[bin_count - 1] > max_count){
-            bins[bin_count-1]++;
+            max_count = bins[bin_count - 1];
         }
     }
     return bins;
 }
 
-
 void
-find_minmax(const vector <double> &numbers, double &min, double &max, bool &res) {
+find_minmax(const vector<double>& numbers, double& min, double& max) {
-
+    if (!numbers.empty()) {
-    if (numbers.size()==0){
+        min = numbers[0];
-        res = true;
+        max = numbers[0];
-        return;
+    } else {
+        min = 0;
+        max = 0;
     }
-
+    for (double x : numbers)
-    min = numbers[0];
+    {
-    max = numbers[0];
+        if (x < min){
-    for ( double x : numbers ){
-        if ( x < min ){
             min = x;
-        } else if ( x > max ){
+        }
+        else if (x > max){
             max = x;
         }
     }
 }
-

histogram.h

@@ -6,9 +6,9 @@
 using namespace std;
 
 vector<size_t>
-make_histogram(const std::vector<double>& numbers, size_t bin_count);
+make_histogram(const vector<double>& numbers, size_t & bin_count, size_t & number_count, size_t & max_count);
 
 void
-find_minmax(const vector <double> &numbers, double &min, double &max, bool &res);
+find_minmax(const vector<double>& numbers, double& min, double& max);
 
 #endif // HISTOGRAM_H_INCLUDED

main.cpp

@@ -1,98 +1,45 @@
 #include <iostream>
 #include <vector>
 #include "histogram.h"
-#include "text.h"
 #include "svg.h"
 #include "show_svg.h"
-#include <curl/curl.h>
-#include <sstream>
-#include <string>
-
 using namespace std;
 
+
 struct Input {
     vector<double> numbers;
     size_t bin_count{};
+    size_t number_count{};
+    size_t max_count{};
 };
 
-Input input_data(istream& stream, bool prompt) {
+Input
-
+input_data() {
-
-    size_t number_count;
-    if (prompt) {
-        cerr << "Enter number count: ";
-    }
-    stream >> number_count;
-
     Input in;
+    cerr << "Enter number count: ";
+    cin >> in.number_count;
 
-    in.numbers.resize(number_count);
 
-    if (prompt){
+    vector<double> numbers(in.number_count);
-            cerr << "Enter numbers: ";
+    in.numbers.resize(in.number_count);
-    }
+    for (size_t i = 0; i < in.number_count; i++) {
-    for (size_t i = 0; i < number_count; i++)
+        cin >> in.numbers[i];
-    {
-        stream >> in.numbers[i];
     }
 
-    if (prompt){
+    size_t bin_count;
-    cerr << "Enter number of bins: ";
+    cerr << "Enter bin count: ";
-    }
+    cin >> in.bin_count;
-        stream >> in.bin_count;
 
+    size_t max_count;
+    in.max_count = 0;
     return in;
 }
 
-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);
-    auto text = reinterpret_cast<const char*>(items);
-    buffer->write(text, data_size);
-    return data_size;
-}
-
-Input download(const string& address) {
-
-    stringstream buffer;
-
-    curl_global_init(CURL_GLOBAL_ALL);
-
-        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) {
-                curl_easy_strerror(res);
-                exit(1);
-            }
-            curl_easy_cleanup(curl);
-        }
-    return input_data(buffer, false);
-}
-
-
-
-
-int main(int argc, char* argv[]){
-
-    Input in;
-    if (argc > 1) {
-        in = download(argv[1]);
-    } else {
-        in = input_data(cin, true);
-    }
-
-
-    auto bins = make_histogram(in.numbers, in.bin_count);
 
+int main()
+{
+    Input in = input_data();
+    vector<size_t> bins = make_histogram(in.numbers, in.bin_count, in.number_count, in.max_count);
     show_histogram_svg(bins);
-
+    return 0;
-
+}
-    }