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

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

Основа: MamakinYR:var12
Ветки Теги
MamakinYR:var12
MamakinYR:master
..
сравнить: MamakinYR:master
Ветки Теги
MamakinYR:var12
MamakinYR:master

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

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

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

@ -1,6 +1,3 @@
/curl.h
/Debug
/curl/
/03-scaling.actual.txt /03-scaling.actual.txt
/03-scaling.expected.txt /03-scaling.expected.txt
/03-scaling.input.txt /03-scaling.input.txt

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

@ -4,7 +4,7 @@
#include "histogram.h" #include "histogram.h"
using namespace std; using namespace std;
bool find_minmax(const vector<double>& numbers, double& min, double& max) { void find_minmax(const vector<double>& numbers, double& min, double& max) {
if (numbers.size() != 0) if (numbers.size() != 0)
{ {
min = numbers[0]; min = numbers[0];
@ -20,29 +20,7 @@ bool find_minmax(const vector<double>& numbers, double& min, double& max) {
max = x; max = x;
} }
} }
return true;
} }
return false;
}
void find_max_capacity(const vector<size_t>& bins, size_t& max_bin_capacity)
{
max_bin_capacity = bins[0];
for (size_t x : bins)
{
if (x > max_bin_capacity)
{
max_bin_capacity = x;
}
}
}
void find_range_border(const vector<double>& numbers, size_t bin_count, size_t bin_number, double& range_border)
{
double min_number, max_number;
find_minmax(numbers, min_number, max_number);
double bin_size = abs((max_number - min_number) / bin_count);
range_border = min_number + bin_number * bin_size;
} }
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)
@ -54,7 +32,7 @@ vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count)
{ {
bins[i] = 0; bins[i] = 0;
} }
double bin_size = abs((max_number - min_number) / bin_count); double bin_size = (max_number - min_number) / 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;

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

@ -2,5 +2,3 @@
#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);
void find_range_border(const std::vector<double>& numbers, size_t bin_count, size_t bin_number, double& range_border);
void find_max_capacity(const std::vector<size_t>& bins, size_t& max_bin_capacity);

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

@ -1,4 +1,4 @@
#pragma once #pragma once
#include <vector> #include <vector>
bool find_minmax(const std::vector<double>& numbers, double& min, double& max); void find_minmax(const std::vector<double>& numbers, double& min, double& max);

27
lab03.vcxproj
Unescape Просмотреть файл

@ -29,7 +29,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClInclude> </ClInclude>
<ClInclude Include="histogram_internal.h" /> <ClInclude Include="histogram_internal.h" />
<ClInclude Include="range_border.h" />
<ClInclude Include="svg.h" /> <ClInclude Include="svg.h" />
<ClInclude Include="text.h" /> <ClInclude Include="text.h" />
</ItemGroup> </ItemGroup>
@ -85,24 +84,16 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath>
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<ExternalIncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath)</ExternalIncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<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>D:/prg/lab03/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>D:\prg\lab03\curl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(CoreLibraryDependencies);libcurl.dll.a;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -113,15 +104,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>D:/prg/lab03/curl/include;%(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>D:\prg\lab03\curl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(CoreLibraryDependencies);libcurl.dll.a;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@ -130,13 +118,10 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>D:/prg/lab03/curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>D:\prg\lab03\curl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(CoreLibraryDependencies);libcurl.dll.a;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -147,25 +132,13 @@
<SDLCheck>true</SDLCheck> <SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode> <ConformanceMode>true</ConformanceMode>
<AdditionalModuleDependencies>
</AdditionalModuleDependencies>
<AdditionalIncludeDirectories>D:/prg/lab03/curl/include;%(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>D:\prg\lab03\curl\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(CoreLibraryDependencies);libcurl.dll.a;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<CustomBuildStep>
<Inputs>
</Inputs>
</CustomBuildStep>
<ProjectReference>
<UseLibraryDependencyInputs>true</UseLibraryDependencyInputs>
</ProjectReference>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

94
lab1.cpp
Unescape Просмотреть файл

@ -4,108 +4,30 @@
#include "histogram.h" #include "histogram.h"
#include "text.h" #include "text.h"
#include "svg.h" #include "svg.h"
#include <curl/curl.h>
#include <sstream>
#include <string>
using namespace std; using namespace std;
struct Input { struct Input {
vector<double> numbers; vector<double> numbers;
size_t bin_count{}; size_t bin_count{};
string fill="black";
}; };
Input input_data(istream& in_stream, bool prompt) { Input input_data() {
Input in; Input in;
size_t number_count; size_t number_count;
if (prompt) { cin >> number_count;
cerr << "Введите количество значений\n";
}
in_stream >> number_count;
in.numbers.resize(number_count); in.numbers.resize(number_count);
if (prompt) {
cerr << "Введите значения\n";
}
for (size_t i = 0; i < number_count; i++) { for (size_t i = 0; i < number_count; i++) {
in_stream >> in.numbers[i]; cin >> in.numbers[i];
}
if (prompt) {
cerr << "Введите количество столбцов гистограммы\n";
} }
in_stream >> in.bin_count; cin >> in.bin_count;
return in; return in;
} }
size_t write_data(void* items, size_t item_size, size_t item_count, void* ctx) { int main()
stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
const char* char_items = reinterpret_cast<const char*>(items);
size_t data_size = item_size * item_count;
buffer->write(char_items, data_size);
return data_size;
}
Input download(const string& address) {
stringstream buffer;
CURL* curl = curl_easy_init();
if (curl) {
CURLcode res;
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
res = curl_easy_perform(curl);
if (res != 0) {
cerr << curl_easy_strerror(res);
exit(1);
}
}
curl_easy_cleanup(curl);
return input_data(buffer, false);
}
int main(int argc, char* argv[])
{ {
Input input;
bool input_created = false;
if (argc == 2) {
input = download(argv[1]);
input_created = true;
}
if (argc > 2) {
for (int i = 0; i < argc; i++) {
if (strcmp(argv[i], "-fill") == 0) {
if (argc < 4) {
cerr << "-fill must be followed by a color name or hex code";
exit(1);
}
else if (i == 3) {
cerr << "-fill must be followed by a color name or hex code";
exit(1);
}
else {
if (i == 2) {
input = download(argv[1]);
}
else {
input = download(argv[3]);
}
input.fill = argv[i + 1];
input_created = true;
}
}
}
}
else {
input = input_data(cin, true);
}
if (!input_created) {
cerr << "invalid arguements";
exit(1);
}
curl_global_init(CURL_GLOBAL_ALL);
const size_t SCREEN_WIDTH = 80; const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
vector<double> numbers_data = input.numbers; auto in = input_data();
auto bins = make_histogram(input.numbers, input.bin_count); auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins, input.numbers, input.bin_count, input.fill); show_histogram_svg(bins);
return 0; return 0;
} }

4
range_border.h
Unescape Просмотреть файл

@ -1,4 +0,0 @@
#pragma once
#include<vector>
void find_range_border(const std::vector<double>& numbers, size_t bin_count, size_t bin_number, double& range_border);

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

@ -3,7 +3,7 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "svg.h" #include "svg.h"
#include "histogram.h" #include "text.h"
using namespace std; using namespace std;
void svg_begin(double width, double height) { void svg_begin(double width, double height) {
@ -27,7 +27,7 @@ void svg_rect(double x, double y, double width, double height, string stroke = "
cout << "<rect x = '" << x << "' y = '" << y << "' width = '" << width << "' height = '" << height << "' stroke = '" << stroke << "' fill = '" << fill << "' />"; cout << "<rect x = '" << x << "' y = '" << y << "' width = '" << width << "' height = '" << height << "' stroke = '" << stroke << "' fill = '" << fill << "' />";
} }
void show_histogram_svg(const vector<size_t>& bins, const vector<double>& numbers, size_t& bin_count, string& fill) { void show_histogram_svg(const vector<size_t>& bins) {
const auto IMAGE_WIDTH = 400; const auto IMAGE_WIDTH = 400;
const auto IMAGE_HEIGHT = 300; const auto IMAGE_HEIGHT = 300;
const auto TEXT_LEFT = 20; const auto TEXT_LEFT = 20;
@ -39,17 +39,10 @@ void show_histogram_svg(const vector<size_t>& bins, const vector<double>& number
double top = 0; double top = 0;
size_t max_bin_capacity{}; size_t max_bin_capacity{};
find_max_capacity(bins, max_bin_capacity); find_max_capacity(bins, max_bin_capacity);
double range_border = 0; for (size_t bin : bins) {
for (size_t i = 0; i < bins.size(); i++) { const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * (static_cast<double>(bin) / max_bin_capacity);
const double bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * (static_cast<double>(bins[i]) / max_bin_capacity); svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
if (i != 0) svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "purple", "#ffcc00");
{
find_range_border(numbers, bin_count, i, range_border);
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(range_border));
top += BIN_HEIGHT;
}
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bins[i]));
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "purple", fill);
top += BIN_HEIGHT; top += BIN_HEIGHT;
} }
svg_end(); svg_end();

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

@ -1,5 +1,4 @@
#pragma once #pragma once
#include<vector> #include<vector>
#include<string>
void show_histogram_svg(const std::vector<size_t>& bins, const std::vector<double>& numbers, std::size_t& bin_count, std::string& fill); void show_histogram_svg(const std::vector<size_t>& bins);

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

@ -4,6 +4,18 @@
#include "text.h" #include "text.h"
using namespace std; using namespace std;
void find_max_capacity(const vector<size_t>& bins, size_t& max_bin_capacity)
{
max_bin_capacity = bins[0];
for (size_t x : bins)
{
if (x > max_bin_capacity)
{
max_bin_capacity = x;
}
}
}
void show_histogram_text(const vector<size_t>& bins, size_t max_asterisk) void show_histogram_text(const vector<size_t>& bins, size_t max_asterisk)
{ {
size_t max_bin_capacity{}; size_t max_bin_capacity{};

18
unittest.cpp
Unescape Просмотреть файл

@ -2,7 +2,6 @@
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "doctest.h" #include "doctest.h"
#include "histogram_internal.h" #include "histogram_internal.h"
#include "range_border.h"
TEST_CASE("distinct positive numbers") { TEST_CASE("distinct positive numbers") {
double min = 0; double min = 0;
@ -15,9 +14,10 @@ TEST_CASE("distinct positive numbers") {
TEST_CASE("empty vector") { TEST_CASE("empty vector") {
double min = 0; double min = 0;
double max = 0; double max = 0;
CHECK(!find_minmax({}, min, max)); find_minmax({}, min, max);
CHECK(min == 0);
CHECK(max == 0);
} }
TEST_CASE("negative values") { TEST_CASE("negative values") {
double min = 0; double min = 0;
double max = 0; double max = 0;
@ -25,15 +25,3 @@ TEST_CASE("negative values") {
CHECK(min == -4); CHECK(min == -4);
CHECK(max == -2); CHECK(max == -2);
} }
TEST_CASE("negative borders") {
double range_border = 0;
find_range_border({-2, -4}, 2, 1, range_border);
CHECK(range_border == -3);
}
TEST_CASE("more bins than numbers") {
double range_border = 0;
find_range_border({3}, 2, 1, range_border);
CHECK(range_border == 3);
}

1
unittest.vcxproj
Unescape Просмотреть файл

@ -133,7 +133,6 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="doctest.h" /> <ClInclude Include="doctest.h" />
<ClInclude Include="histogram_internal.h" /> <ClInclude Include="histogram_internal.h" />
<ClInclude Include="range_border.h" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">

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