code: изменение функции input_data()

master
victoriaCS 4 месяцев назад
Родитель da84686c71
Сommit b7e2e9af42

@ -1,17 +1,18 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "histogram.h"
#include "text.h"
#include "svg.h" #include "svg.h"
#include "hictogram.h" //#include "doctest.h"
using namespace std; using namespace std;
struct Input { struct Input {
vector<double> numbers; vector<double> numbers;
size_t bin_count{}; size_t bin_count{};
size_t block_width{};
}; };
Input input_data() { Input input_data(istream& in_steam = cin) {
size_t number_count;
cerr << "Enter number count: "; cerr << "Enter number count: ";
cin >> number_count; cin >> number_count;
@ -21,16 +22,17 @@ Input input_data() {
for (size_t i = 0; i < number_count; i++) { for (size_t i = 0; i < number_count; i++) {
cin >> in.numbers[i]; cin >> in.numbers[i];
} }
cerr << "Enter bin count: "; cerr << "Enter bin count: ";
cin >> in.bin_count; cin >> in.bin_count;
return in; return in;
} }
int main() { int main() {
auto in = input_data(); auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count); auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins); show_histogram_svg(bins, in.block_width);
} }

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