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

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

Основа: BreganIM:ef0fcfca11ee309ffeced74ebef9a786d726096e
Ветки Теги
BreganIM:main
..
сравнить: BreganIM:07c73e533511dc1bc8974a0927d39e4eb123ac46
Ветки Теги
BreganIM:main

Ничего общего в коммитах. 'ef0fcfca11ee309ffeced74ebef9a786d726096e' и '07c73e533511dc1bc8974a0927d39e4eb123ac46' имеют совершенно разные истории.
ef0fcfca11 ... 07c73e5335

7 изменённых файлов: 58 добавлений и 100 удалений
Показать статистику

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

@ -1,6 +1,5 @@
/bin/ /bin/
/obj/ /obj/
/curl/
*.rsuser *.rsuser
*.suo *.suo
*.user *.user

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

@ -1,13 +1,13 @@
#include "histogram.h" #include "histogram.h"
#include "histogram_internal.h" #include "histogram_internal.h"
#include <iostream>
#include <vector> #include <vector>
using namespace std; using namespace std;
bool find_minmax(const vector<double>& numbers, double& min, double& max) { bool find_minmax(const vector<double>& numbers, double& min, double& max) {
if (numbers.empty()) { if (numbers.empty())
return false; return false;
}
min = numbers[0]; min = numbers[0];
max = numbers[0]; max = numbers[0];
for (double x : numbers) { for (double x : numbers) {
@ -16,7 +16,7 @@ bool find_minmax(const vector<double>& numbers, double& min, double& max) {
if (x > max) if (x > max)
max = x; max = x;
} }
return false; return true;
} }
vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count) { vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count) {
@ -27,7 +27,6 @@ vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count) {
for (size_t i = 0; i < numbers.size(); i++) { for (size_t i = 0; i < numbers.size(); i++) {
bool found = false; bool found = false;
for (size_t j = 0; j < bin_count - 1 && !found; j++) { for (size_t j = 0; j < bin_count - 1 && !found; j++) {
double lo = min + j * bin_size; double lo = min + j * bin_size;
double hi = min + (j + 1) * bin_size; double hi = min + (j + 1) * bin_size;
@ -36,9 +35,15 @@ vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count) {
found = true; found = true;
} }
} }
if (!found) if (!found)
bins[bin_count - 1]++; bins[bin_count - 1]++;
} }
return bins; return bins;
} }
double compute_bin_size(const std::vector<double>& numbers, size_t bin_count) {
double min, max;
if (!find_minmax(numbers, min, max))
return 0.0;
return (max - min) / bin_count;
}

2
histogram.h
Unescape Просмотреть файл

@ -2,3 +2,5 @@
#include <vector> #include <vector>
std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t bin_count); std::vector<size_t> make_histogram(const std::vector<double>& numbers, size_t bin_count);
double compute_bin_size(const std::vector<double>& numbers, size_t bin_count);
void show_histogram_svg(const std::vector<size_t>& bins, double bin_size, double min_val);

70
laba01upd3.cpp
Unescape Просмотреть файл

@ -1,11 +1,10 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <sstream>
#include <string>
#include "histogram.h" #include "histogram.h"
#include "histogram_internal.h"
#include "svg.h" #include "svg.h"
#include "text.h" #include "text.h"
#include <curl/curl.h> #include <string>
using namespace std; using namespace std;
@ -14,62 +13,35 @@ struct Input {
size_t bin_count{}; size_t bin_count{};
}; };
Input input_data(istream& in, bool prompt) { Input input_data() {
if (prompt) cerr << "Enter number count: ";
size_t number_count; size_t number_count;
in >> number_count; cerr << "Enter number count: ";
Input data; cin >> number_count;
data.numbers.resize(number_count);
if (prompt) cerr << "Enter " << number_count << " numbers: "; Input in;
in.numbers.resize(number_count);
cerr << "Enter " << number_count << " numbers: ";
for (size_t i = 0; i < number_count; i++) { for (size_t i = 0; i < number_count; i++) {
in >> data.numbers[i]; cin >> in.numbers[i];
} }
if (prompt) cerr << "Enter bin count: ";
in >> data.bin_count;
return data;
}
static size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) { cerr << "Enter bin count: ";
size_t data_size = item_size * item_count; cin >> in.bin_count;
auto* buffer = reinterpret_cast<stringstream*>(ctx);
buffer->write(reinterpret_cast<const char*>(items), data_size); return in;
return data_size;
} }
Input download(const string& address) { int main() {
stringstream buffer; auto in = input_data();
CURL* curl = curl_easy_init();
curl_easy_setopt(curl, CURLOPT_URL, address.c_str()); double min_val, max_val;
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data); find_minmax(in.numbers, min_val, max_val);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
CURLcode res = curl_easy_perform(curl);
if (res != CURLE_OK) {
cerr << "curl_easy_perform() failed: " << curl_easy_strerror(res) << "\n";
curl_easy_cleanup(curl);
exit(1);
}
double download_speed = 0.0; double bin_size = compute_bin_size(in.numbers, in.bin_count);
curl_easy_getinfo(curl, CURLINFO_SPEED_DOWNLOAD, &download_speed); auto bins = make_histogram(in.numbers, in.bin_count);
cerr << "Download speed: " << download_speed << " bytes/sec\n";
curl_easy_cleanup(curl); show_histogram_svg(bins, bin_size, min_val);
return input_data(buffer, false);
}
int main(int argc, char* argv[]) {
curl_global_init(CURL_GLOBAL_ALL);
Input in;
if (argc > 1) {
in = download(argv[1]);
}
else {
in = input_data(cin, true);
}
const auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins);
show_histogram_text(bins); show_histogram_text(bins);
curl_global_cleanup();
return 0; return 0;
} }

22
laba01upd3.vcxproj
Unescape Просмотреть файл

@ -76,16 +76,10 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>
</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<AdditionalDependencies>
</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -96,18 +90,12 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>
</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<AdditionalDependencies>
</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -116,18 +104,11 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>C:\Users\brega\OneDrive\Рабочий стол\lab03\laba01upd3\curl\include</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\Users\brega\OneDrive\Рабочий стол\lab03\laba01upd3\curl\lib</AdditionalLibraryDirectories>
<AdditionalDependencies>;libcurl.dll.a;libcurl.dll.a;libcrypto.a;libssl.a</AdditionalDependencies>
</Link> </Link>
<PostBuildEvent>
<Command>
</Command>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
@ -137,15 +118,12 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>C:\Users\brega\OneDrive\Рабочий стол\lab03\laba01upd3\curl\include</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding> <EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>C:\Users\brega\OneDrive\Рабочий стол\lab03\laba01upd3\curl\lib</AdditionalLibraryDirectories>
<AdditionalDependencies>libcurl.lib;%(AdditionalDependencies);libcurl.dll.a;libcurl.dll.a;libcrypto.a;libssl.a</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>

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

@ -4,11 +4,11 @@ using namespace std;
void svg_begin(double width, double height) { void svg_begin(double width, double height) {
cout << "<?xml version='1.0' encoding='UTF-8'?>\n"; cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
cout << "<svg "; cout << "<svg "
cout << "width='" << width << "' "; << "width='" << width << "' "
cout << "height='" << height << "' "; << "height='" << height << "' "
cout << "viewBox='0 0 " << width << " " << height << "' "; << "viewBox='0 0 " << width << " " << height << "' "
cout << "xmlns='http://www.w3.org/2000/svg'>\n"; << "xmlns='http://www.w3.org/2000/svg'>\n";
} }
void svg_end() { void svg_end() {
@ -33,38 +33,40 @@ void svg_rect(double x, double y, double width, double height,
<< "' />\n"; << "' />\n";
} }
void show_histogram_svg(const vector<size_t>& bins) { void show_histogram_svg(const std::vector<size_t>& bins, double bin_size, double min_val) {
const double IMAGE_WIDTH = 400; const double IMAGE_WIDTH = 400;
const double IMAGE_HEIGHT = 300; const double IMAGE_HEIGHT = 300;
const double TEXT_LEFT = 20; const double TEXT_LEFT = 20;
const double TEXT_BASELINE = 20; const double TEXT_BASELINE = 20;
const double TEXT_WIDTH = 50; const double TEXT_WIDTH = 50;
const double BIN_HEIGHT = 30; const double BIN_HEIGHT = 30;
const double BLOCK_WIDTH = 10; const double VSPACE = BIN_HEIGHT + TEXT_BASELINE * 2 + 5;
svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT); svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
size_t max_count = 0; size_t max_count = 0;
for (size_t count : bins) { for (size_t c : bins)
if (count > max_count) { if (c > max_count)
max_count = count; max_count = c;
} double max_width = IMAGE_WIDTH - TEXT_WIDTH - 100;
}
for (size_t j = 0; j < bins.size(); ++j) {
size_t count = bins[j];
double y = j * VSPACE;
double max_width = IMAGE_WIDTH - TEXT_WIDTH; double width;
double top = 0;
for (size_t count : bins) {
double bin_width;
if (max_count > 0) { if (max_count > 0) {
bin_width = static_cast<double>(count) / max_count * max_width; width = static_cast<double>(count) / max_count * max_width;
} }
else { else {
bin_width = 0.0; width = 0.0;
} }
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(count)); svg_text(TEXT_LEFT, y + TEXT_BASELINE, to_string(count));
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "blue"); svg_rect(TEXT_WIDTH, y, width, BIN_HEIGHT, "blue", "blue");
top += BIN_HEIGHT; double boundary = min_val + bin_size * (j + 1);
svg_text(TEXT_WIDTH,y + BIN_HEIGHT + TEXT_BASELINE,to_string(boundary)
);
} }
svg_end(); svg_end();

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

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

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