Сравнить коммиты

..

Ничего общего в коммитах. 'efec85176de5d6be9cfdd053291147679587202d' и 'c0132463ee0817d57d6e256db6f76c1d4652eb0d' имеют совершенно разные истории.

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

@ -2,5 +2,3 @@
/obj /obj
*.depend *.depend
*.layout *.layout
/*.o
/curl

@ -13,12 +13,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add directory="curl/include" />
</Compiler> </Compiler>
<Linker>
<Add library="curl/lib/libcurl.dll.a" />
<Add directory="curl/lib" />
</Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="bin/Release/cs-lab34" prefix_auto="1" extension_auto="1" /> <Option output="bin/Release/cs-lab34" prefix_auto="1" extension_auto="1" />

@ -3,7 +3,6 @@
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h" #include "svg.h"
#include <curl/curl.h>
using namespace std; using namespace std;
@ -12,30 +11,24 @@ struct Input {
size_t bin_count{}; size_t bin_count{};
}; };
Input input_data(istream& stream, bool prompt) { Input
input_data(istream& stream) {
Input in; Input in;
size_t number_count; size_t number_count;
if (prompt) {
cerr << "Enter number count: "; cerr << "Enter number count: ";
}
stream >> number_count; stream >> number_count;
in.numbers.resize(number_count); in.numbers.resize(number_count);
for (size_t i = 0; i < number_count; i++) { for (size_t i = 0; i < number_count; i++)
if (prompt) { {
cerr << "Enter number " << i+1 << ": ";
}
stream >> in.numbers[i]; stream >> in.numbers[i];
} }
if (prompt) {
cerr << "Enter bin count: "; cerr << "Enter bin count: ";
}
stream >> in.bin_count; stream >> in.bin_count;
return in; return in;
} }
int main() { int main() {
curl_global_init(CURL_GLOBAL_ALL); Input in = input_data(cin);
Input in = input_data(cin, false);
vector<size_t> bins = make_histogram(in.numbers, in.bin_count); vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins); show_histogram_svg(bins);
} }

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