code; cin изменен на in
Этот коммит содержится в:
3
.gitignore
поставляемый
3
.gitignore
поставляемый
@@ -2,5 +2,6 @@
|
|||||||
/obj
|
/obj
|
||||||
/lab01.depend
|
/lab01.depend
|
||||||
/lab01.layout
|
/lab01.layout
|
||||||
/main.exe
|
|
||||||
/main.o
|
/main.o
|
||||||
|
/main.exe
|
||||||
|
/unittest.layout
|
||||||
|
|||||||
@@ -33,9 +33,12 @@
|
|||||||
<Add option="-fexceptions" />
|
<Add option="-fexceptions" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
<Unit filename=".gitignore" />
|
<Unit filename=".gitignore" />
|
||||||
<Unit filename="Header.cpp" />
|
<Unit filename="histogram.cpp" />
|
||||||
<Unit filename="Header.h" />
|
<Unit filename="histogram.h" />
|
||||||
|
<Unit filename="histogram_internal.h" />
|
||||||
<Unit filename="main.cpp" />
|
<Unit filename="main.cpp" />
|
||||||
|
<Unit filename="svg.cpp" />
|
||||||
|
<Unit filename="svg.h" />
|
||||||
<Unit filename="text.cpp" />
|
<Unit filename="text.cpp" />
|
||||||
<Unit filename="text.h" />
|
<Unit filename="text.h" />
|
||||||
<Extensions>
|
<Extensions>
|
||||||
|
|||||||
18
main.cpp
18
main.cpp
@@ -6,23 +6,23 @@ struct Input {
|
|||||||
vector<double> vec;
|
vector<double> vec;
|
||||||
size_t korz{};
|
size_t korz{};
|
||||||
};
|
};
|
||||||
Input input_data() {
|
|
||||||
Input in;
|
Input input_data(istream& in) {
|
||||||
|
Input lin;
|
||||||
size_t n, korz;
|
size_t n, korz;
|
||||||
|
|
||||||
cerr << "Number of elements: ";
|
cerr << "Number of elements: ";
|
||||||
cin >> n;
|
in >> n;
|
||||||
in.vec.resize(n);
|
lin.vec.resize(n);
|
||||||
cerr << "Elements: ";
|
|
||||||
for (size_t i = 0; i < n; i++)
|
for (size_t i = 0; i < n; i++)
|
||||||
cin >> in.vec[i];
|
in >> lin.vec[i];
|
||||||
cerr << "Enter bin count: ";
|
cerr << "Enter bin count: ";
|
||||||
cin >> in.korz;
|
in >> lin.korz;
|
||||||
return in;
|
return lin;
|
||||||
}
|
}
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
auto in = input_data();
|
auto in = input_data(cin);
|
||||||
auto bins = make_histogram(in.korz, in.vec);
|
auto bins = make_histogram(in.korz, in.vec);
|
||||||
show_histogram_svg(bins);
|
show_histogram_svg(bins);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,6 +31,10 @@
|
|||||||
<Compiler>
|
<Compiler>
|
||||||
<Add option="-Wall" />
|
<Add option="-Wall" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
|
<Unit filename="doctest.h" />
|
||||||
|
<Unit filename="histogram.cpp" />
|
||||||
|
<Unit filename="histogram_internal.h" />
|
||||||
|
<Unit filename="unittest.cpp" />
|
||||||
<Extensions />
|
<Extensions />
|
||||||
</Project>
|
</Project>
|
||||||
</CodeBlocks_project_file>
|
</CodeBlocks_project_file>
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user