SpesivtsevYM
/
cs-lab34
1
0
Форкнуть 0
Код Задачи Запросы на слияние Пакеты Проекты Релизы Вики Активность

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

Основа: SpesivtsevYM:e6cf551e5c400c232fc81a3e66af8f0672607011
Ветки Теги
SpesivtsevYM:master
..
сравнить: SpesivtsevYM:5311fee3130aa0a2ae9ad0628fc2eb9d03c2896c
Ветки Теги
SpesivtsevYM:master

Ничего общего в коммитах. 'e6cf551e5c400c232fc81a3e66af8f0672607011' и '5311fee3130aa0a2ae9ad0628fc2eb9d03c2896c' имеют совершенно разные истории.
e6cf551e5c ... 5311fee313

12 изменённых файлов: 28 добавлений и 232 удалений
Показать статистику

3
Histogram/.gitignore поставляемый
Unescape Просмотреть файл

@ -1,3 +1,2 @@
bin/ bin/
obj/ obj/
curl/

18
Histogram/Histogram.cbp
Unescape Просмотреть файл

@ -13,13 +13,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-DCURL_STATICLIB" />
<Add directory="curl/include" />
</Compiler> </Compiler>
<Linker>
<Add library="libcurl.dll.a" />
<Add directory="curl/lib" />
</Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="bin/Release/Histogram" prefix_auto="1" extension_auto="1" /> <Option output="bin/Release/Histogram" prefix_auto="1" extension_auto="1" />
@ -28,32 +22,20 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DCURL_STATICLIB" />
<Add directory="curl/include" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
<Add library="libcurl.dll.a" />
<Add directory="curl/lib" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
<Add option="-DCURL_STATICLIB" />
<Add directory="curl/include" />
</Compiler> </Compiler>
<Linker>
<Add library="libcurl.dll.a" />
<Add directory="curl/lib" />
</Linker>
<Unit filename="histogram.cpp" /> <Unit filename="histogram.cpp" />
<Unit filename="histogram.h" /> <Unit filename="histogram.h" />
<Unit filename="histogram_internal.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>

91
Histogram/Histogram.depend
Unescape Просмотреть файл

@ -1,91 +0,0 @@
# depslib dependency file v1.0
1748183279 source:c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\main.cpp
<iostream>
<vector>
"histogram.h"
"text.h"
<string>
<sstream>
<curl/curl.h>
1745795032 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\histogram.h
<vector>
1745791758 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\text.h
<vector>
1747164718 source:c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\svg.cpp
"svg.h"
<iostream>
<string>
<vector>
1745841059 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\svg.h
<iostream>
<string>
<vector>
1746443355 source:c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\text.cpp
"text.h"
<iostream>
<vector>
1745841101 source:c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\histogram.cpp
"histogram.h"
<vector>
<string>
"svg.h"
1747048790 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\curl.h
"curlver.h"
"system.h"
<stdio.h>
<limits.h>
<sys/param.h>
<sys/types.h>
<time.h>
<winsock2.h>
<ws2tcpip.h>
<sys/select.h>
<sys/socket.h>
<sys/time.h>
"easy.h"
"multi.h"
"urlapi.h"
"options.h"
"header.h"
"websockets.h"
"mprintf.h"
"typecheck-gcc.h"
1747048790 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\curlver.h
1747048790 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\system.h
<ConditionalMacros.h>
<inttypes.h>
<inttypes.h>
<sys/types.h>
<sys/socket.h>
<sys/poll.h>
1747048790 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\easy.h
1747048790 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\multi.h
"curl.h"
1747048791 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\urlapi.h
"curl.h"
1747048790 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\options.h
1747048790 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\header.h
1747048791 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\websockets.h
1747048790 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\mprintf.h
<stdarg.h>
<stdio.h>
"curl.h"
1747048791 c:\users\yaros_tm2sc6p\Ðàáî÷èé ñòîë\cs-lab34\histogram\curl\include\curl\typecheck-gcc.h

34
Histogram/Histogram.layout
Unescape Просмотреть файл

@ -2,44 +2,34 @@
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<FileVersion major="1" minor="0" /> <FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" /> <ActiveTarget name="Debug" />
<File name="text.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="text.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="93" topLine="0" />
</Cursor>
</File>
<File name="histogram.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="0" topLine="17" />
</Cursor>
</File>
<File name="svg.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="931" topLine="12" /> <Cursor1 position="339" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="text.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="histogram.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="0" topLine="0" /> <Cursor1 position="843" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="main.cpp" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="histogram_internal.h" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="1632" topLine="55" /> <Cursor1 position="116" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="svg.h" open="0" top="0" tabpos="7" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="text.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="323" topLine="0" /> <Cursor1 position="93" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="histogram_internal.h" open="0" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="histogram.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="116" topLine="0" /> <Cursor1 position="205" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="histogram.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="main.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="33" topLine="0" /> <Cursor1 position="297" topLine="9" />
</Cursor> </Cursor>
</File> </File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>

Двоичные данные
Histogram/bin/Debug/Histogram.exe
Просмотреть файл

Двоичный файл не отображается.

13
Histogram/histogram.cpp
Unescape Просмотреть файл

@ -1,7 +1,6 @@
#include "histogram.h" #include "histogram.h"
#include <vector> #include <vector>
#include <string> #include <algorithm>
#include "svg.h"
size_t find_minmax(const std::vector<double>& numbers, double& min, double& max) { size_t find_minmax(const std::vector<double>& numbers, double& min, double& max) {
if (numbers.empty()) { if (numbers.empty()) {
@ -28,28 +27,19 @@ std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t bi
double min, max; double min, max;
find_minmax(numbers, min, max); find_minmax(numbers, min, max);
if (max == min) { if (max == min) {
return bins;
return bins; return bins;
} }
double bin_width = (max - min) / bin_count; double bin_width = (max - min) / bin_count;
for (double number : numbers) { for (double number : numbers) {
size_t bin_index = static_cast<size_t>((number - min) / bin_width); size_t bin_index = static_cast<size_t>((number - min) / bin_width);
if (bin_index >= bin_count) { if (bin_index >= bin_count) {
bin_index = bin_count - 1;
bin_index = bin_count - 1; bin_index = bin_count - 1;
} }
bins[bin_index]++; bins[bin_index]++;
} }
return bins; return bins;
}; };
void show_histogram_svg(const std::vector<size_t>& bins) { void show_histogram_svg(const std::vector<size_t>& bins) {
const auto IMAGE_WIDTH = 400; const auto IMAGE_WIDTH = 400;
const auto IMAGE_HEIGHT = 300; const auto IMAGE_HEIGHT = 300;
@ -68,4 +58,3 @@ void show_histogram_svg(const std::vector<size_t>& bins) {
} }
svg_end(); svg_end();
} }

73
Histogram/main.cpp
Unescape Просмотреть файл

@ -2,81 +2,34 @@
#include <vector> #include <vector>
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h"
#include <curl/curl.h>
#include <sstream>
#include <string>
struct Input{ struct Input{
std::vector<double> numbers; std::vector<double> numbers;
size_t bin_count{}; size_t bin_count{};
}; };
Input input_data(std::istream& in, bool prompt) { Input input_data() {
size_t number_count; size_t number_count;
if (prompt){ std::cerr << "Enter number count: ";
std::cerr << "Enter number count: "; std::cin >> number_count;
}
in >> number_count;
if (prompt){
std::cerr << "Enter numbers: \n";
}
Input result; std::cerr << "Enter numbers: \n";
result.numbers.resize(number_count); Input in;
in.numbers.resize(number_count);
for (size_t i = 0; i < number_count; ++i) { for (size_t i = 0; i < number_count; ++i) {
in >> result.numbers[i]; std::cin >> in.numbers[i];
} }
if (prompt){ std::cerr << "Enter bucket: ";
std::cerr << "Enter bucket: "; std::cin >> in.bin_count;
}
in >> result.bin_count;
return result; return in;
}; };
size_t write_data(void*items,size_t item_size, size_t item_count, void* ctx){
size_t data_size = item_size * item_count;
std::stringstream* buffer = static_cast<std::stringstream*>(ctx);
(*buffer).write(reinterpret_cast<const char*>(items), data_size);
return data_size;
}
Input download(const std::string&address){
std::stringstream buffer;
CURL* curl = curl_easy_init();
if(curl) {
CURLcode res;
curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
res = curl_easy_perform(curl);
if (res != CURLE_OK){
std::cerr << curl_easy_strerror(res);
curl_easy_cleanup(curl);
exit(1);
}
curl_easy_cleanup(curl);
}
return input_data(buffer, false);
}
using namespace std; using namespace std;
int main(int argc, char* argv[]) { int main() {
Input input; Input in = input_data();
if (argc > 1) { auto bins = make_histogram(in.numbers, in.bin_count);
input = download(argv[1]);
} else {
input = input_data(cin, true);
}
auto bins = make_histogram(input.numbers, input.bin_count);
show_histogram_svg(bins); show_histogram_svg(bins);
return 0; return 0;
} }

Двоичные данные
Histogram/obj/Debug/main.o
Просмотреть файл

Двоичный файл не отображается.

24
Histogram/svg.cpp
Unescape Просмотреть файл

@ -1,7 +1,6 @@
#include "svg.h" #include "svg.h"
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <vector>
void svg_begin(double width, double height) { void svg_begin(double width, double height) {
std::cout << "<?xml version='1.0' encoding='UTF-8'?>\n"; std::cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
@ -17,30 +16,9 @@ void svg_end() {
} }
void svg_rect(double x, double y, double width, double height, std::string stroke, std::string fill) { void svg_rect(double x, double y, double width, double height, std::string stroke, std::string fill) {
std::cout << "<rect x='" << x<< "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "' />\n"; std::cout << "<rect x='" << x << "' y='" << y << "' width='" << width << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "' />\n";
} }
void svg_text(double left, double baseline, std::string text) { void svg_text(double left, double baseline, std::string text) {
std::cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>\n"; std::cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>\n";
} }
void show_histogram_svg(const std::vector<size_t>& bins) {
const auto IMAGE_WIDTH = 400;
const auto IMAGE_HEIGHT = 300;
const auto TEXT_LEFT = 20;
const auto TEXT_BASELINE = 20;
const auto TEXT_WIDTH = 50;
const auto BIN_HEIGHT = 30;
const auto BLOCK_WIDTH = 10;
svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
for (size_t i = 0; i < bins.size(); ++i) {
const double bin_width = BLOCK_WIDTH * bins[i];
const double top = i * BIN_HEIGHT;
svg_text(TEXT_LEFT, top + TEXT_BASELINE, std::to_string(bins[i]));
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "black", "#aaffaa");
}
svg_end();
}

1
Histogram/svg.h
Unescape Просмотреть файл

@ -7,4 +7,3 @@ void svg_begin(double width, double height);
void svg_end(); void svg_end();
void svg_rect(double x, double y, double width, double height, std::string stroke = "black", std::string fill = "black"); void svg_rect(double x, double y, double width, double height, std::string stroke = "black", std::string fill = "black");
void svg_text(double left, double baseline, std::string text); void svg_text(double left, double baseline, std::string text);
void show_histogram_svg(const std::vector<size_t>& bins);

Двоичные данные
Histogram/svg.o
Просмотреть файл

Двоичный файл не отображается.

3
Histogram/text.cpp
Unescape Просмотреть файл

@ -24,7 +24,4 @@ void show_histogram_text(const std::vector<size_t>& bins) {
} }
std::cout << "\n"; std::cout << "\n";
} }
}
}; };

Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить