master
AndrosovDS 4 недель назад
Родитель 80405024dd
Сommit 0b8d63da09

@ -1,42 +1,35 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "histogram.h" #include "histogram.h"
#include "text.h"
#include "svg.h" #include "svg.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;
}; };
// Ôóíêöèÿ ââîäà äàííûõ
Input input_data() { Input input_data() {
Input in; Input in;
int number_count; size_t number_count;
cerr << "Enter number count: ";
cin >> number_count; cin >> number_count;
while (number_count < 1) {
cin >> number_count;
}
cin >> in.bin_count;
while (in.bin_count < 1) {
cin >> in.bin_count;
}
in.numbers.resize(number_count); in.numbers.resize(number_count);
for (int i = 0; i < number_count; i++) { cerr << "Enter numbers: ";
for (size_t i = 0; i < number_count; i++) {
cin >> in.numbers[i]; cin >> in.numbers[i];
} }
cerr << "Enter 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); // Âûâîä ãèñòîãðàììû â ôîðìàòå SVG show_histogram_svg(bins);
return 0;
} }

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