Сравнить коммиты
20 Коммитов
61a696c8c7
...
main
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
90eca7b315 | ||
|
|
d799078416 | ||
|
|
58059fb68e | ||
|
|
87b36b3fff | ||
|
|
6a5f77f201 | ||
|
|
b817e966c5 | ||
|
|
ce0a6677e3 | ||
|
|
5209da476a | ||
|
|
0b29726755 | ||
|
|
906641a74f | ||
|
|
ce8474826d | ||
|
|
77f57fe873 | ||
|
|
4af56ed93a | ||
|
|
761fb65839 | ||
|
|
1656d4d5bb | ||
|
|
2069aaecb7 | ||
|
|
c079f176b9 | ||
|
|
8f349e7614 | ||
|
|
d6265ab68e | ||
|
|
d575c70356 |
3
.gitignore
поставляемый
3
.gitignore
поставляемый
@@ -1,4 +1,7 @@
|
||||
/bin
|
||||
/obj
|
||||
/curl
|
||||
/lab01.depend
|
||||
/lab01.layout
|
||||
/unittest.depend
|
||||
/unittest.layout
|
||||
7106
doctest.h
Обычный файл
7106
doctest.h
Обычный файл
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
68
histogram.cpp
Обычный файл
68
histogram.cpp
Обычный файл
@@ -0,0 +1,68 @@
|
||||
#include "histogram.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
void
|
||||
find_minmax(const vector<double>& numbers, double& min, double& max, bool& empty_vector)
|
||||
{
|
||||
if (numbers.empty())
|
||||
{
|
||||
empty_vector = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
min = numbers[0];
|
||||
max = numbers[0];
|
||||
for (double x : numbers)
|
||||
{
|
||||
if (x > max )
|
||||
{
|
||||
max = x;
|
||||
}
|
||||
if (x < min)
|
||||
{
|
||||
min = x;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
vector<size_t>
|
||||
make_histogram(const vector<double>& numbers, size_t& bin_count)
|
||||
{
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax(numbers, min, max, empty_vector);
|
||||
vector<size_t> bins(bin_count);
|
||||
if (empty_vector)
|
||||
{
|
||||
for (size_t y : bins)
|
||||
{
|
||||
y = 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
auto bin_size = (max - min)/bin_count;
|
||||
for (double number : numbers)
|
||||
{
|
||||
bool found = false;
|
||||
for (size_t j = 0; (j < bin_count - 1) && !found; j++)
|
||||
{
|
||||
auto lo = min + j * bin_size;
|
||||
auto hi = min + (j + 1) * bin_size;
|
||||
if ((lo <= number) && (number < hi))
|
||||
{
|
||||
bins[j]++;
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
if (!found)
|
||||
{
|
||||
bins[bin_count - 1]++;
|
||||
}
|
||||
}
|
||||
}
|
||||
return bins;
|
||||
}
|
||||
9
histogram.h
Обычный файл
9
histogram.h
Обычный файл
@@ -0,0 +1,9 @@
|
||||
#ifndef HISTOGRAM_H_INCLUDED
|
||||
#define HISTOGRAM_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
std::vector<size_t>
|
||||
make_histogram(const std::vector<double>& numbers, size_t& bin_count);
|
||||
|
||||
#endif // HISTOGRAM_H_INCLUDED
|
||||
9
histogram_internal.h
Обычный файл
9
histogram_internal.h
Обычный файл
@@ -0,0 +1,9 @@
|
||||
#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
|
||||
#define HISTOGRAM_INTERNAL_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
void
|
||||
find_minmax(const std::vector<double>& numbers, double& min, double& max, bool& empty_vector);
|
||||
|
||||
#endif // HISTOGRAM_INTERNAL_H_INCLUDED
|
||||
20
lab01.cbp
20
lab01.cbp
@@ -31,8 +31,28 @@
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
<Add option="-fexceptions" />
|
||||
<Add directory="curl/include" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add library="C:/Users/ASUS X507UF/Desktop/РПОСУ/lab01/curl/lib/libcurl.dll.a" />
|
||||
<Add directory="curl/lib" />
|
||||
</Linker>
|
||||
<Unit filename="histogram.cpp" />
|
||||
<Unit filename="histogram.h">
|
||||
<Option target="<{~None~}>" />
|
||||
</Unit>
|
||||
<Unit filename="histogram_internal.h">
|
||||
<Option target="<{~None~}>" />
|
||||
</Unit>
|
||||
<Unit filename="main.cpp" />
|
||||
<Unit filename="svg.cpp" />
|
||||
<Unit filename="svg.h">
|
||||
<Option target="<{~None~}>" />
|
||||
</Unit>
|
||||
<Unit filename="text.cpp" />
|
||||
<Unit filename="text.h">
|
||||
<Option target="<{~None~}>" />
|
||||
</Unit>
|
||||
<Extensions>
|
||||
<lib_finder disable_auto="1" />
|
||||
</Extensions>
|
||||
|
||||
143
main.cpp
143
main.cpp
@@ -1,85 +1,80 @@
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <curl/curl.h>
|
||||
#include "histogram.h"
|
||||
#include "svg.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
int main()
|
||||
struct Input
|
||||
{
|
||||
const size_t SCREEN_WIDTH = 80;
|
||||
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
|
||||
size_t number_count, bin_count;
|
||||
cerr << "Enter number count: ";
|
||||
cin >> number_count;
|
||||
vector<double> numbers(number_count);
|
||||
vector<double> numbers;
|
||||
size_t bin_count{};
|
||||
};
|
||||
|
||||
Input
|
||||
input_data(istream& stream, bool prompt)
|
||||
{
|
||||
size_t number_count;
|
||||
if (prompt) {
|
||||
cerr << "Enter number count: ";
|
||||
}
|
||||
stream >> number_count;
|
||||
Input in;
|
||||
in.numbers.resize(number_count);
|
||||
for (size_t i = 0; i < number_count; i++)
|
||||
{
|
||||
cin >> numbers[i];
|
||||
stream >> in.numbers[i];
|
||||
}
|
||||
cerr << "Enter bin count: ";
|
||||
cin >> bin_count;
|
||||
vector<size_t> bins(bin_count);
|
||||
double min = numbers[0];
|
||||
double max = numbers[0];
|
||||
for (double x : numbers)
|
||||
{
|
||||
if (x < min)
|
||||
{
|
||||
min = x;
|
||||
}
|
||||
else if (x > max)
|
||||
{
|
||||
max = x;
|
||||
}
|
||||
}
|
||||
auto bin_size = (max - min)/bin_count;
|
||||
for (size_t i = 0; i < number_count; i++)
|
||||
{
|
||||
bool found = false;
|
||||
for (size_t j = 0; (j < bin_count - 1) && !found; j++)
|
||||
{
|
||||
auto lo = min + j * bin_size;
|
||||
auto hi = min + (j + 1) * bin_size;
|
||||
if ((lo <= numbers[i]) && (numbers[i] < hi))
|
||||
{
|
||||
bins[j]++;
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
if (!found)
|
||||
{
|
||||
bins[bin_count - 1]++;
|
||||
}
|
||||
}
|
||||
size_t max_count = 0;
|
||||
for (size_t s = 0; s < bin_count; s++) {
|
||||
if (bins[s] > max_count)
|
||||
{
|
||||
max_count = bins[s];
|
||||
}
|
||||
}
|
||||
for (size_t bin : bins)
|
||||
{
|
||||
if (bin <100)
|
||||
{
|
||||
cout << " ";
|
||||
}
|
||||
if (bin <10)
|
||||
{
|
||||
cout << " ";
|
||||
}
|
||||
cout << bin << "|";
|
||||
if (max_count > MAX_ASTERISK) {
|
||||
size_t count = bin;
|
||||
size_t height = MAX_ASTERISK * (static_cast<double>(count) / max_count);
|
||||
for (size_t t = 0; t < height; t++)
|
||||
{
|
||||
cout << "*";
|
||||
}
|
||||
}
|
||||
else for (size_t k = 0; k < bin; k++)
|
||||
{
|
||||
cout << "*";
|
||||
}
|
||||
cout << endl;
|
||||
if (prompt) {
|
||||
cerr << "Enter bin count: ";
|
||||
}
|
||||
stream >> in.bin_count;
|
||||
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;
|
||||
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(int argc, char* argv[]) {
|
||||
Input input;
|
||||
if (argc > 1) {
|
||||
input = download(argv[1]);
|
||||
}
|
||||
else {
|
||||
input = input_data(cin, true);
|
||||
}
|
||||
if (curl_version_info(CURLVERSION_NOW) != nullptr) {
|
||||
auto curl_ver = curl_version_info(CURLVERSION_NOW)->version;
|
||||
cerr << "cURL version " << curl_ver << "\n";
|
||||
auto ssl_ver = curl_version_info(CURLVERSION_NOW)->ssl_version;
|
||||
cerr << "SSL version " << ssl_ver << "\n";
|
||||
} else{ cerr<<"curl_version_info() failed \n"; }
|
||||
vector<size_t> bins = make_histogram(input.numbers, input.bin_count);
|
||||
show_histogram_svg(bins);
|
||||
}
|
||||
|
||||
74
svg.cpp
Обычный файл
74
svg.cpp
Обычный файл
@@ -0,0 +1,74 @@
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include "svg.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
void
|
||||
svg_text(double left, double baseline, string text) {
|
||||
cout << "<text x='" << left
|
||||
<< "' y='"
|
||||
<< baseline
|
||||
<< "'>" << text << "</text>";
|
||||
}
|
||||
|
||||
void
|
||||
svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black") {
|
||||
cout << "<rect x='" << x
|
||||
<< "' y='" << y
|
||||
<< "' width='" << width
|
||||
<< "' height='" << height
|
||||
<< "' stroke='" << stroke
|
||||
<< "' fill='" << fill
|
||||
<< "' />\n";
|
||||
}
|
||||
|
||||
void
|
||||
svg_begin(double width, double height) {
|
||||
cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
|
||||
cout << "<svg ";
|
||||
cout << "width='" << width << "' ";
|
||||
cout << "height='" << height << "' ";
|
||||
cout << "viewBox='0 0 " << width << " " << height << "' ";
|
||||
cout << "xmlns='http://www.w3.org/2000/svg'>\n";
|
||||
}
|
||||
|
||||
void
|
||||
svg_end() {
|
||||
cout << "</svg>\n";
|
||||
}
|
||||
|
||||
void
|
||||
show_histogram_svg(const 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;
|
||||
const auto MAX_WIDTH = IMAGE_WIDTH - TEXT_WIDTH;
|
||||
size_t max_count = 0;
|
||||
for (size_t x : bins) {
|
||||
if (x > max_count) {
|
||||
max_count = x;
|
||||
}
|
||||
}
|
||||
if (max_count == 0) {
|
||||
max_count = 1;
|
||||
}
|
||||
auto scale_factor = static_cast<double>(MAX_WIDTH) / (max_count * BLOCK_WIDTH);
|
||||
if (scale_factor > 1) {
|
||||
scale_factor = 1;
|
||||
}
|
||||
svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
|
||||
double top = 0;
|
||||
for (size_t bin : bins) {
|
||||
double bin_width = BLOCK_WIDTH * bin * scale_factor;
|
||||
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
|
||||
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT);
|
||||
top += BIN_HEIGHT;
|
||||
}
|
||||
svg_end();
|
||||
}
|
||||
9
svg.h
Обычный файл
9
svg.h
Обычный файл
@@ -0,0 +1,9 @@
|
||||
#ifndef SVG_H_INCLUDED
|
||||
#define SVG_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
void
|
||||
show_histogram_svg(const std::vector<size_t>& bins);
|
||||
|
||||
#endif // SVG_H_INCLUDED
|
||||
7
svg_internal.h
Обычный файл
7
svg_internal.h
Обычный файл
@@ -0,0 +1,7 @@
|
||||
#ifndef SVG_INTERNAL_H_INCLUDED
|
||||
#define SVG_INTERNAL_H_INCLUDED
|
||||
|
||||
bool
|
||||
check_width(double width);
|
||||
|
||||
#endif // SVG_INTERNAL_H_INCLUDED
|
||||
46
text.cpp
Обычный файл
46
text.cpp
Обычный файл
@@ -0,0 +1,46 @@
|
||||
#include <iostream>
|
||||
#include "text.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
void
|
||||
show_histogram_text(const vector<size_t>& bins, size_t& bin_count)
|
||||
{
|
||||
const size_t SCREEN_WIDTH = 80;
|
||||
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
|
||||
size_t max_count = 0;
|
||||
for (size_t s = 0; s < bin_count; s++)
|
||||
{
|
||||
if (bins[s] > max_count)
|
||||
{
|
||||
max_count = bins[s];
|
||||
}
|
||||
}
|
||||
if (max_count == 0)
|
||||
{
|
||||
max_count = 1;
|
||||
}
|
||||
auto scale_factor = static_cast<double>(MAX_ASTERISK) / max_count;
|
||||
if (scale_factor > 1)
|
||||
{
|
||||
scale_factor = 1;
|
||||
}
|
||||
for (size_t bin : bins)
|
||||
{
|
||||
if (bin <100)
|
||||
{
|
||||
cout << " ";
|
||||
}
|
||||
if (bin <10)
|
||||
{
|
||||
cout << " ";
|
||||
}
|
||||
cout << bin << "|";
|
||||
size_t height = bin * scale_factor;
|
||||
for (size_t t = 0; t < height; t++)
|
||||
{
|
||||
cout << "*";
|
||||
}
|
||||
cout << endl;
|
||||
}
|
||||
}
|
||||
9
text.h
Обычный файл
9
text.h
Обычный файл
@@ -0,0 +1,9 @@
|
||||
#ifndef TEXT_H_INCLUDED
|
||||
#define TEXT_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
void
|
||||
show_histogram_text(const std::vector<size_t>& bins, size_t& bin_count);
|
||||
|
||||
#endif // TEXT_H_INCLUDED
|
||||
41
unittest.cbp
Обычный файл
41
unittest.cbp
Обычный файл
@@ -0,0 +1,41 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_project_file>
|
||||
<FileVersion major="1" minor="6" />
|
||||
<Project>
|
||||
<Option title="unittest" />
|
||||
<Option pch_mode="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Build>
|
||||
<Target title="Debug">
|
||||
<Option output="bin/Debug/unittest" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj/Debug/" />
|
||||
<Option type="1" />
|
||||
<Option compiler="gcc" />
|
||||
<Compiler>
|
||||
<Add option="-g" />
|
||||
</Compiler>
|
||||
</Target>
|
||||
<Target title="Release">
|
||||
<Option output="bin/Release/unittest" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj/Release/" />
|
||||
<Option type="1" />
|
||||
<Option compiler="gcc" />
|
||||
<Compiler>
|
||||
<Add option="-O2" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-s" />
|
||||
</Linker>
|
||||
</Target>
|
||||
</Build>
|
||||
<Compiler>
|
||||
<Add option="-Wall" />
|
||||
</Compiler>
|
||||
<Unit filename="histogram.cpp" />
|
||||
<Unit filename="histogram_internal.h" />
|
||||
<Unit filename="unittest.cpp" />
|
||||
<Extensions>
|
||||
<lib_finder disable_auto="1" />
|
||||
</Extensions>
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
54
unittest.cpp
Обычный файл
54
unittest.cpp
Обычный файл
@@ -0,0 +1,54 @@
|
||||
#define DOCTEST_CONFIG_NO_MULTITHREADING
|
||||
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
|
||||
#include "doctest.h"
|
||||
#include "histogram_internal.h"
|
||||
|
||||
TEST_CASE("distinct positive numbers") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({1, 2}, min, max, empty_vector);
|
||||
CHECK(empty_vector == false);
|
||||
CHECK(min == 1);
|
||||
CHECK(max == 2);
|
||||
}
|
||||
|
||||
TEST_CASE("the only number") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({1}, min, max, empty_vector);
|
||||
CHECK(empty_vector == false);
|
||||
CHECK(min == 1);
|
||||
CHECK(max == 1);
|
||||
}
|
||||
|
||||
TEST_CASE("negative numbers") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({-1, -2}, min, max, empty_vector);
|
||||
CHECK(empty_vector == false);
|
||||
CHECK(min == -2);
|
||||
CHECK(max == -1);
|
||||
}
|
||||
|
||||
TEST_CASE("identical numbers") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({2, 2}, min, max, empty_vector);
|
||||
CHECK(empty_vector == false);
|
||||
CHECK(min == 2);
|
||||
CHECK(max == 2);
|
||||
}
|
||||
|
||||
TEST_CASE("empty vector") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
bool empty_vector = false;
|
||||
find_minmax({}, min, max, empty_vector);
|
||||
CHECK(empty_vector == true);
|
||||
CHECK(min == 0);
|
||||
CHECK(max == 0);
|
||||
}
|
||||
Ссылка в новой задаче
Block a user