BaranovEK 11 месяцев назад
Родитель c0d2a43b70
Сommit d25a052b48

1
.gitignore поставляемый

@ -1,4 +1,5 @@
/bin /bin
/obj /obj
/lab03.layout /lab03.layout
/curl

@ -7,7 +7,7 @@
1716797551 c:\users\lenov\desktop\lab03\histogram.h 1716797551 c:\users\lenov\desktop\lab03\histogram.h
<vector> <vector>
1717268069 source:c:\users\lenov\desktop\lab03\main.cpp 1717517969 source:c:\users\lenov\desktop\lab03\main.cpp
<iostream> <iostream>
<vector> <vector>
"histogram.h" "histogram.h"
@ -22,10 +22,10 @@
"text.h" "text.h"
<vector> <vector>
1716819918 c:\users\lenov\desktop\lab03\svg.h 1717516760 c:\users\lenov\desktop\lab03\svg.h
<vector> <vector>
1716819750 source:c:\users\lenov\desktop\lab03\svg.cpp 1717516760 source:c:\users\lenov\desktop\lab03\svg.cpp
<iostream> <iostream>
<vector> <vector>
<string> <string>

@ -11,25 +11,23 @@ struct Input {
}; };
Input Input
input_data() { input_data(istream& stream) {
Input in;
size_t number_count; size_t number_count;
cerr << "Enter number count: "; cerr << "Enter number count: ";
cin >> number_count; stream >> number_count;
Input in;
in.numbers.resize(number_count); in.numbers.resize(number_count);
cerr << "Enter numbers: ";
for (size_t i = 0; i < number_count; i++) { for (size_t i = 0; i < number_count; i++) {
cin >> in.numbers[i]; stream >> in.numbers[i];
} }
cerr << "Enter bin count: "; cerr << "Enter bin count: ";
cin>> in.bin_count; stream >> in.bin_count;
return in; return in;
} }
int int
main() { main() {
auto in = input_data(); Input in = input_data(cin);
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);

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