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

...

8 Коммитов

Автор SHA1 Сообщение Дата
GladkyMS 0b7d923bba code:personal variant L4 8 месяцев назад
GladkyMS b147613156 curl:personal variant 8 месяцев назад
GladkyMS 2ca91129dc curl:mistakes 8 месяцев назад
GladkyMS c187c7613c curl:curl_easy 8 месяцев назад
GladkyMS 7557fa6dc4 curl:libcurl dll 8 месяцев назад
GladkyMS 7b11215171 personal variant finalпgi 8 месяцев назад
GladkyMS f5635e45bc code:input bool parametr 8 месяцев назад
GladkyMS 8803317954 code:new in flow 8 месяцев назад

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

@ -1,2 +1,3 @@
/x64
vector.vcxproj.user
vector.vcxproj.user
/curl

@ -4,6 +4,9 @@
#include "histogram.h"
#include "text.h"
#include "svg.h"
#include <curl/curl.h>
#include <sstream>
#include <string>
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
using namespace std;
@ -13,7 +16,7 @@ struct Input {
};
Input input_data()
Input input_data()
{
size_t number_count;
cin >> number_count;
@ -30,10 +33,114 @@ Input input_data()
return in;
}
//Input input_data(istream& in,bool prompt) {
//
// if (prompt == true) cerr << "Enter number_count: ";
//
// size_t number_count;
// in >> number_count;
//
// Input data;
// data.numbers.resize(number_count);
//
// if (prompt == true) cerr << "Enter numbers: ";
//
// for (size_t i = 0; i < number_count; i++) {
// in >> data.numbers[i];
// }
//
// if (prompt == true) cerr << "Enter bin count: ";
//
// in >> data.bin_count;
// return data;
//}
//size_t
//write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
// size_t data_size = item_size * item_count;
// stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
// buffer->write(reinterpret_cast<const 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_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) {
// fprintf(stderr, "curl_easy_perform() failed: %s\n",
// curl_easy_strerror(res));
// exit(1);
// }
// curl_easy_cleanup(curl);
// }
//
// return input_data(buffer, false);
//}
int main()
{
Input in = input_data();
vector <size_t> bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins, in.bin_count);
auto in = input_data();
vector <size_t> bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins, in.bin_count);
}
//void usage() {
// cout << "Usage: lab34.exe [-format {text|svg}] URL\n";
// exit(1);
//}
//
//int main(int argc, char* argv[]) {
// curl_global_init(CURL_GLOBAL_ALL);
//
// if (argc > 1) {
// string format_option;
// for (int i = 1; i < argc; i++) {
// if (argv[i][0] == '-') {
//
// if ( strcmp(argv[i], "-format") == 0) {
// format_option = argv[i++];
// break;
// }
// }
// }
//
// if (!format_option.empty()) {
// if (format_option != "text" && format_option != "svg") {
// usage();
// }
// }
//
// Input input;
// if (argc > 2) {
// input = download(argv[2]);
// }
// else {
// input = input_data(cin, true);
// }
//
// vector<size_t> bins = make_histogram(input.numbers, input.bin_count);
//
// if (!format_option.empty()) {
// if (format_option == "text") {
// show_histogram_text(bins, input.bin_count);
// }
// else {
// show_histogram_svg(bins, input.bin_count);
// }
// }
// else {
// show_histogram_svg(bins, input.bin_count);
// }
// }
// else {
// cerr << "No arguments provided." << endl;
// usage();
// }
//
// return 0;
//}

@ -74,12 +74,14 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);CURL_STATICLIB</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\include;C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\lib\libcurl.dll.a</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\lib\libcurl.dll.a</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@ -88,26 +90,30 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);CURL_STATICLIB</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\include;C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\lib\libcurl.dll.a</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\lib\libcurl.dll.a</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);CURL_STATICLIB</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\include;C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\lib\libcurl.dll.a</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\lib\libcurl.dll.a</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@ -116,14 +122,16 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);CURL_STATICLIB</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\include;C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\lib\libcurl.dll.a</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>$(CoreLibraryDependencies);%(AdditionalDependencies);C:\Users\gladm\Desktop\с++\laboratornaya 1\vector\curl\lib\libcurl.dll.a</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>

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