переписана функция ввода

master
AnisenkovPD 11 месяцев назад
Родитель 62b78372fa
Сommit 7d41e081ce

@ -3,6 +3,7 @@
#include <vector> #include <vector>
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h"
using namespace std; using namespace std;
const size_t SCREEN_WIDTH = 80; const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
@ -13,17 +14,17 @@ struct Input {
}; };
Input Input
input_data() { input_data(istream& in) {
size_t number_count; size_t number_count;
cin >> number_count; in >> number_count;
Input in; Input inn;
in.numbers.resize(number_count); inn.numbers.resize(number_count);
for (size_t i = 0; i < number_count; i++) { for (size_t i = 0; i < number_count; i++) {
cin >> in.numbers[i]; in >> inn.numbers[i];
} }
size_t bin_count; size_t bin_count;
cin >> in.bin_count; in >> inn.bin_count;
return in; return inn;
} }
@ -34,9 +35,9 @@ input_data() {
int main() int main()
{ {
auto in = input_data(); auto in = input_data(cin);
auto bins = make_histogram(in.numbers, in.bin_count); auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_text(bins); show_histogram_svg(bins);
return 0; return 0;
} }

Загрузка…
Отмена
Сохранить