code: Добавлен параметр cin в input_data
Этот коммит содержится в:
17
lab1.cbp
17
lab1.cbp
@@ -32,11 +32,22 @@
|
||||
<Add option="-Wall" />
|
||||
<Add option="-fexceptions" />
|
||||
</Compiler>
|
||||
<Unit filename="histogram.cpp" />
|
||||
<Unit filename="histogram.h">
|
||||
<Option target="<{~None~}>" />
|
||||
</Unit>
|
||||
<Unit filename="histogram_internal.h">
|
||||
<Option target="<{~None~}>" />
|
||||
</Unit>
|
||||
<Unit filename="main.cpp" />
|
||||
<Unit filename="svg.cpp" />
|
||||
<Unit filename="svg.h">
|
||||
<Option link="1" />
|
||||
<Option target="<{~None~}>" />
|
||||
</Unit>
|
||||
<Unit filename="text.cpp" />
|
||||
<Unit filename="text.h" />
|
||||
<Extensions>
|
||||
<code_completion />
|
||||
<envvars />
|
||||
<debugger />
|
||||
<lib_finder disable_auto="1" />
|
||||
</Extensions>
|
||||
</Project>
|
||||
|
||||
4
main.cpp
4
main.cpp
@@ -10,7 +10,7 @@ struct Input {
|
||||
};
|
||||
|
||||
Input
|
||||
input_data(){
|
||||
input_data(istream& in){
|
||||
|
||||
size_t number_count;
|
||||
cerr << "Enter number_count: ";
|
||||
@@ -32,7 +32,7 @@ input_data(){
|
||||
int
|
||||
main()
|
||||
{
|
||||
auto in = input_data();
|
||||
auto in = input_data(cin);
|
||||
auto bins = make_histogram(in.numbers, in.bin_count);
|
||||
show_histogram_svg(bins);
|
||||
return 0;
|
||||
|
||||
@@ -31,6 +31,9 @@
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
</Compiler>
|
||||
<Unit filename="histogram.cpp" />
|
||||
<Unit filename="histogram_internal.h" />
|
||||
<Unit filename="unittest.cpp" />
|
||||
<Extensions>
|
||||
<lib_finder disable_auto="1" />
|
||||
</Extensions>
|
||||
|
||||
Ссылка в новой задаче
Block a user