diff --git a/main.cpp b/main.cpp index 8f4aa90..632b71f 100644 --- a/main.cpp +++ b/main.cpp @@ -1,121 +1,66 @@ + #include #include +#include "histogram.h" +#include "text.h" -using namespace std; -const size_t SCREEN_WIDTH = 80; -const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; -struct Input { +#include "svg.h" +using namespace std; + +struct Input +{ vector numbers; size_t bin_count{}; + size_t number_count;//количество чисел }; + + Input -input_data(){ - size_t number_count; +input_data() +{ - cerr << "Enter number count: "; - cin >> number_count; Input in; - in.numbers.resize(number_count); - for(int i;i> in.numbers[i]; + cerr<<"Kol-vo chisel -> "; + cin>>in.number_count; + // vector numbers(number_count);//вектор с количсетвом эл. number_count + in.numbers.resize(in.number_count); + + cerr<<"Vvedite chisla:"; + cout<>in.numbers[i]; + //cout<> in.bin_count; + cerr<<"vvedite kolvo bins -> "; + cin>>in.bin_count; return in; } -void -find_minmax(vector numbers, double& min, double& max) { - min = numbers[0]; - max = numbers[0]; - for (double x : numbers) { - if (x < min) { - min = x; - } - else if (x > max) { - max = x; - } -} -} - -vector -make_histogram(vector numbers, size_t bin_count) { - vector bins(bin_count); - double min, max; - find_minmax(numbers, min, max); - size_t countt; - - 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; - -} -void -show_histogram_text(auto bins, size_t bin_count){ - size_t max_count = 0; - for (size_t i = 0; i < bin_count; i++){ - if(bins[i]>max_count) - max_count = bins[i]; +int main() +{ + size_t number_count;//количество чисел + Input in = input_data(); + auto bins = make_histogram(in.numbers, in.bin_count); + // show_histogram_text(bins, in.bin_count); + show_histogram_svg(bins,in.number_count); + return 0; + // size_t bin_count;//количество корзин - } - size_t height; - for (size_t i = 0; i < bin_count; i++) - { - if (bins[i] < 100) - cout << " "; - if (bins[i] < 10) - cout << " "; - cout<MAX_ASTERISK){ - for (size_t j = 0; j <(height = MAX_ASTERISK * (static_cast(bins[i]) / max_count)) ; j++) - { - cout<<"*"; - } - cout< bins(bin_count); +} -} -int main() -{ Input in = input_data(); - auto bins = make_histogram(in.numbers, in.bin_count); - show_histogram_text(bins, in.bin_count); - return 0; -}