Сравнить коммиты
3 Коммитов
a5aeaa0976
...
960722ab48
| Автор | SHA1 | Дата | |
|---|---|---|---|
| 960722ab48 | |||
| 328a9f28bb | |||
| ad6006ab90 |
1
.gitignore
поставляемый
1
.gitignore
поставляемый
@@ -1,2 +1,3 @@
|
|||||||
/bin
|
/bin
|
||||||
/obj
|
/obj
|
||||||
|
/curl
|
||||||
7
Lab1.cbp
7
Lab1.cbp
@@ -36,7 +36,12 @@
|
|||||||
<Compiler>
|
<Compiler>
|
||||||
<Add option="-Wall" />
|
<Add option="-Wall" />
|
||||||
<Add option="-fexceptions" />
|
<Add option="-fexceptions" />
|
||||||
|
<Add directory="D:/Projects_Code_Blocks/2_halfYear/Lab4/Lab1/curl/include" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
|
<Linker>
|
||||||
|
<Add library="curl/lib/libcurl.dll.a" />
|
||||||
|
<Add directory="D:/Projects_Code_Blocks/2_halfYear/Lab4/Lab1/curl/lib" />
|
||||||
|
</Linker>
|
||||||
<Unit filename="histogram.cpp">
|
<Unit filename="histogram.cpp">
|
||||||
<Option target="Debug" />
|
<Option target="Debug" />
|
||||||
</Unit>
|
</Unit>
|
||||||
@@ -47,8 +52,6 @@
|
|||||||
<Option target="<{~None~}>" />
|
<Option target="<{~None~}>" />
|
||||||
</Unit>
|
</Unit>
|
||||||
<Unit filename="main.cpp" />
|
<Unit filename="main.cpp" />
|
||||||
<Unit filename="prot.cpp" />
|
|
||||||
<Unit filename="prot.h" />
|
|
||||||
<Unit filename="svg.cpp" />
|
<Unit filename="svg.cpp" />
|
||||||
<Unit filename="svg.h" />
|
<Unit filename="svg.h" />
|
||||||
<Unit filename="text.cpp">
|
<Unit filename="text.cpp">
|
||||||
|
|||||||
7
main.cpp
7
main.cpp
@@ -1,10 +1,12 @@
|
|||||||
|
#include <curl/curl.h>
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
#include "histogram.h"
|
#include "histogram.h"
|
||||||
#include "text.h"
|
#include "text.h"
|
||||||
#include "svg.h"
|
#include "svg.h"
|
||||||
|
|
||||||
|
|
||||||
|
//313
|
||||||
struct Input {
|
struct Input {
|
||||||
std::vector<double> numbers;
|
std::vector<double> numbers;
|
||||||
size_t bin_count{};
|
size_t bin_count{};
|
||||||
@@ -14,8 +16,9 @@ Input input_data(istream& in, bool promt);
|
|||||||
|
|
||||||
int main()
|
int main()
|
||||||
{
|
{
|
||||||
|
curl_global_init(CURL_GLOBAL_ALL);
|
||||||
|
|
||||||
Input in = input_data(cin);
|
Input in = input_data(cin,true);
|
||||||
std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
|
std::vector<size_t> bins = make_histogram(in.numbers, in.bin_count);
|
||||||
show_histogram_svg(bins);
|
show_histogram_svg(bins);
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user