Сравнить коммиты
2 Коммитов
0eb008b27e
...
0bdf67a606
| Автор | SHA1 | Дата | |
|---|---|---|---|
| 0bdf67a606 | |||
| 97036095fa |
@@ -36,9 +36,7 @@
|
|||||||
<Unit filename="histogram.h" />
|
<Unit filename="histogram.h" />
|
||||||
<Unit filename="main.cpp" />
|
<Unit filename="main.cpp" />
|
||||||
<Unit filename="svg.cpp" />
|
<Unit filename="svg.cpp" />
|
||||||
<Unit filename="svg.h">
|
<Unit filename="svg.h" />
|
||||||
<Option target="<{~None~}>" />
|
|
||||||
</Unit>
|
|
||||||
<Unit filename="text.cpp" />
|
<Unit filename="text.cpp" />
|
||||||
<Unit filename="text.h" />
|
<Unit filename="text.h" />
|
||||||
<Extensions>
|
<Extensions>
|
||||||
|
|||||||
12
main.cpp
12
main.cpp
@@ -1,4 +1,3 @@
|
|||||||
#include <curl/curl.h>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <string>
|
#include <string>
|
||||||
@@ -12,19 +11,20 @@ struct Input {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Input
|
Input
|
||||||
input_data(istream& in, bool prompt) {
|
input_data(istream& in) {
|
||||||
size_t number_count;
|
size_t number_count;
|
||||||
if (prompt) {cerr << "Enter number count: ";}
|
cerr << "Enter number count: ";
|
||||||
in >> number_count;
|
in >> number_count;
|
||||||
|
|
||||||
Input in1;
|
Input in1;
|
||||||
in1.numbers.resize(number_count);
|
in1.numbers.resize(number_count);
|
||||||
if (prompt) {cerr << "Enter numbers: ";}
|
cerr << "Enter numbers: ";
|
||||||
for (size_t i = 0; i < number_count; i++) {
|
for (size_t i = 0; i < number_count; i++) {
|
||||||
in >> in1.numbers[i];
|
in >> in1.numbers[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (prompt) {cerr << "Enter bin count: ";}
|
|
||||||
|
cerr << "Enter bin count: ";
|
||||||
in >> in1.bin_count;
|
in >> in1.bin_count;
|
||||||
|
|
||||||
return in1;
|
return in1;
|
||||||
@@ -36,7 +36,7 @@ int main()
|
|||||||
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
|
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
|
||||||
bool prompt = true;
|
bool prompt = true;
|
||||||
|
|
||||||
auto in = input_data(cin, prompt);
|
auto 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);
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
<Compiler>
|
<Compiler>
|
||||||
<Add option="-Wall" />
|
<Add option="-Wall" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
<Unit filename="histogram.cpp" />
|
<Unit filename="doctest.h" />
|
||||||
<Unit filename="unittest.cpp" />
|
<Unit filename="unittest.cpp" />
|
||||||
<Extensions>
|
<Extensions>
|
||||||
<lib_finder disable_auto="1" />
|
<lib_finder disable_auto="1" />
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user