code; cin изменен на in

main
LatyshevGI 2 недель назад
Родитель 6210fae2ed
Сommit d0b5fddd35

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

@ -2,5 +2,6 @@
/obj
/lab01.depend
/lab01.layout
/main.exe
/main.o
/main.exe
/unittest.layout

@ -33,9 +33,12 @@
<Add option="-fexceptions" />
</Compiler>
<Unit filename=".gitignore" />
<Unit filename="Header.cpp" />
<Unit filename="Header.h" />
<Unit filename="histogram.cpp" />
<Unit filename="histogram.h" />
<Unit filename="histogram_internal.h" />
<Unit filename="main.cpp" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h" />
<Unit filename="text.cpp" />
<Unit filename="text.h" />
<Extensions>

@ -6,23 +6,23 @@ struct Input {
vector<double> vec;
size_t korz{};
};
Input input_data() {
Input in;
Input input_data(istream& in) {
Input lin;
size_t n, korz;
cerr << "Number of elements: ";
cin >> n;
in.vec.resize(n);
cerr << "Elements: ";
in >> n;
lin.vec.resize(n);
for (size_t i = 0; i < n; i++)
cin >> in.vec[i];
in >> lin.vec[i];
cerr << "Enter bin count: ";
cin >> in.korz;
return in;
in >> lin.korz;
return lin;
}
int main() {
auto in = input_data();
auto in = input_data(cin);
auto bins = make_histogram(in.korz, in.vec);
show_histogram_svg(bins);
}

@ -31,6 +31,10 @@
<Compiler>
<Add option="-Wall" />
</Compiler>
<Unit filename="doctest.h" />
<Unit filename="histogram.cpp" />
<Unit filename="histogram_internal.h" />
<Unit filename="unittest.cpp" />
<Extensions />
</Project>
</CodeBlocks_project_file>

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