Сравнить коммиты
Ничего общего в коммитах. 'main' и 'master' имеют совершенно разные истории.
@ -0,0 +1,3 @@
|
||||
curl/
|
||||
obj
|
||||
bin
|
||||
@ -1,2 +0,0 @@
|
||||
# cs-lab03
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
9|******
|
||||
33|*************************
|
||||
100|****************************************************************************
|
||||
@ -0,0 +1,5 @@
|
||||
142
|
||||
1 1 1 1 1 1 1 1 1
|
||||
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
|
||||
3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
|
||||
3
|
||||
@ -0,0 +1,6 @@
|
||||
142
|
||||
1 1 1 1 1 1 1 1 1
|
||||
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
|
||||
3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3
|
||||
3
|
||||
15
|
||||
@ -0,0 +1 @@
|
||||
enter amount of numberslet's introduse arrayenter amount of intervals
|
||||
Двоичный файл не отображается.
@ -0,0 +1,3 @@
|
||||
3|***
|
||||
5|**V^*
|
||||
2|**
|
||||
@ -0,0 +1,3 @@
|
||||
10
|
||||
3 3 3 4 4 4 4 4 5 5
|
||||
3
|
||||
@ -0,0 +1,2 @@
|
||||
devlab1.exe <03-scaling.input.txt >output.txt 2>NUL
|
||||
fc /N output.txt 03-scaling.expected.txt
|
||||
Двоичный файл не отображается.
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 448 B |
@ -0,0 +1,3 @@
|
||||
9|******
|
||||
33|******^******************
|
||||
100|*************************^**************************************************
|
||||
|
После Ширина: | Высота: | Размер: 457 B |
@ -0,0 +1,59 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_project_file>
|
||||
<FileVersion major="1" minor="6" />
|
||||
<Project>
|
||||
<Option title="devlab1" />
|
||||
<Option pch_mode="2" />
|
||||
<Option compiler="gcc" />
|
||||
<Build>
|
||||
<Target title="Debug">
|
||||
<Option output="bin/Debug/devlab1" prefix_auto="1" extension_auto="1" />
|
||||
<Option object_output="obj/Debug/" />
|
||||
<Option type="1" />
|
||||
<Option compiler="gcc" />
|
||||
<Compiler>
|
||||
<Add option="-g" />
|
||||
<Add option="-DCURL_STATICLIB" />
|
||||
<Add directory="curl/curl/include" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add library="libcurl.dll.a" />
|
||||
<Add directory="curl/curl/lib" />
|
||||
</Linker>
|
||||
</Target>
|
||||
<Target title="Release">
|
||||
<Option output="bin/Release/devlab1" 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" />
|
||||
<Add option="-fexceptions" />
|
||||
<Add directory="curl/include" />
|
||||
</Compiler>
|
||||
<Linker>
|
||||
<Add option="-static-libstdc++" />
|
||||
<Add library="libcurl.dll.a" />
|
||||
<Add directory="curl/lib" />
|
||||
</Linker>
|
||||
<Unit filename="doctest.h" />
|
||||
<Unit filename="histogram.cpp" />
|
||||
<Unit filename="histogram.h" />
|
||||
<Unit filename="histogram_internal.h" />
|
||||
<Unit filename="main.cpp" />
|
||||
<Unit filename="marks.svg" />
|
||||
<Unit filename="svg.cpp" />
|
||||
<Unit filename="svg.h" />
|
||||
<Unit filename="text.cpp" />
|
||||
<Unit filename="text.h" />
|
||||
<Extensions />
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
@ -0,0 +1,133 @@
|
||||
# depslib dependency file v1.0
|
||||
1685368116 source:c:\program files\codeblocks\devlab1\main.cpp
|
||||
<sstream>
|
||||
<string>
|
||||
<curl/curl.h>
|
||||
"text.h"
|
||||
"histogram.h"
|
||||
"svg.h"
|
||||
"histogram_internal.h"
|
||||
<iostream>
|
||||
<vector>
|
||||
|
||||
1681733870 c:\program files\codeblocks\devlab1\histogram.h
|
||||
<vector>
|
||||
|
||||
1685554919 source:c:\program files\codeblocks\devlab1\histogram.cpp
|
||||
"histogram.h"
|
||||
<vector>
|
||||
<iostream>
|
||||
|
||||
1680530385 c:\program files\codeblocks\devlab1\text.h
|
||||
<vector>
|
||||
<iostream>
|
||||
|
||||
1680530410 source:c:\program files\codeblocks\devlab1\text.cpp
|
||||
"text.h"
|
||||
|
||||
1682337558 c:\program files\codeblocks\devlab1\svg.h
|
||||
<vector>
|
||||
|
||||
1685369210 source:c:\program files\codeblocks\devlab1\svg.cpp
|
||||
"svg.h"
|
||||
<iostream>
|
||||
<vector>
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\include\curl\curl.h
|
||||
"curlver.h"
|
||||
"system.h"
|
||||
<stdio.h>
|
||||
<limits.h>
|
||||
<osreldate.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"
|
||||
"typecheck-gcc.h"
|
||||
|
||||
1684811606 c:\program files\codeblocks\devlab1\curl\include\curl\curlver.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\include\curl\system.h
|
||||
<ConditionalMacros.h>
|
||||
<winsock2.h>
|
||||
<windows.h>
|
||||
<ws2tcpip.h>
|
||||
<sys/types.h>
|
||||
<sys/socket.h>
|
||||
<sys/poll.h>
|
||||
|
||||
1684736752 c:\program files\codeblocks\devlab1\curl\include\curl\easy.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\include\curl\multi.h
|
||||
"curl.h"
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\include\curl\urlapi.h
|
||||
"curl.h"
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\include\curl\options.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\include\curl\header.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\include\curl\websockets.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\include\curl\typecheck-gcc.h
|
||||
|
||||
1685551862 c:\program files\codeblocks\devlab1\histogram_internal.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\curl\include\curl\curl.h
|
||||
"curlver.h"
|
||||
"system.h"
|
||||
<stdio.h>
|
||||
<limits.h>
|
||||
<osreldate.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"
|
||||
"typecheck-gcc.h"
|
||||
|
||||
1684811606 c:\program files\codeblocks\devlab1\curl\curl\include\curl\curlver.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\curl\include\curl\system.h
|
||||
<ConditionalMacros.h>
|
||||
<winsock2.h>
|
||||
<windows.h>
|
||||
<ws2tcpip.h>
|
||||
<sys/types.h>
|
||||
<sys/socket.h>
|
||||
<sys/poll.h>
|
||||
|
||||
1684736752 c:\program files\codeblocks\devlab1\curl\curl\include\curl\easy.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\curl\include\curl\multi.h
|
||||
"curl.h"
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\curl\include\curl\urlapi.h
|
||||
"curl.h"
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\curl\include\curl\options.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\curl\include\curl\header.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\curl\include\curl\websockets.h
|
||||
|
||||
1684137360 c:\program files\codeblocks\devlab1\curl\curl\include\curl\typecheck-gcc.h
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_layout_file>
|
||||
<FileVersion major="1" minor="0" />
|
||||
<ActiveTarget name="Debug" />
|
||||
<File name="histogram.cpp" open="1" top="1" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="565" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="text.h" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="69" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="histogram_internal.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="160" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1580" topLine="62" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="histogram.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="145" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="text.cpp" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="342" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="svg.h" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="139" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="svg.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="1" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="1598" topLine="57" />
|
||||
</Cursor>
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
@ -0,0 +1,52 @@
|
||||
#include "histogram.h"
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
using namespace std;
|
||||
bool
|
||||
find_minmax(const vector<double>& numbers, double& min1, double& max1)
|
||||
{
|
||||
for (size_t i = 0; i < numbers.size(); i++)
|
||||
|
||||
{
|
||||
cerr<<numbers[i]<<endl;
|
||||
}
|
||||
if(numbers.empty())
|
||||
return false;
|
||||
|
||||
min1 = numbers[0];
|
||||
max1 = numbers[0];
|
||||
for ( size_t i=0; i < numbers.size(); i++)
|
||||
{
|
||||
if (numbers[i] > max1) max1=numbers[i];
|
||||
if (numbers[i] < min1) min1=numbers[i];
|
||||
}
|
||||
return true;
|
||||
|
||||
};
|
||||
std::vector<long long unsigned int>
|
||||
make_histogram(const vector<double> &numbers,size_t bin_count)
|
||||
{
|
||||
float lo,hi,dif;
|
||||
double min1, max1;
|
||||
find_minmax(numbers,min1, max1);
|
||||
// if(!find_minmax(numbers, min, max))
|
||||
// return 1;
|
||||
vector <size_t> bins(bin_count);
|
||||
dif=(max1 - min1)/bin_count;
|
||||
for (size_t i = 0; i < numbers.size(); i++) {
|
||||
bool found = false;
|
||||
for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
|
||||
auto lo = min1 + j * dif;
|
||||
auto hi = min1 + (j + 1) * dif;
|
||||
if ((lo <= numbers[i]) && (numbers[i] < hi)) {
|
||||
bins[j]++;
|
||||
found = true;
|
||||
}
|
||||
}
|
||||
if (found == false)
|
||||
{
|
||||
bins[bin_count - 1]++;
|
||||
}
|
||||
}
|
||||
return bins;
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
#pragma once
|
||||
#include <vector>
|
||||
|
||||
std::vector<long long unsigned int>
|
||||
make_histogram(const std::vector<double>& numbers, size_t bin_count);
|
||||
|
||||
void
|
||||
show_histogram_text(std::vector<double> bins, const std::vector<double>& numbers, size_t bin_count);
|
||||
@ -0,0 +1,6 @@
|
||||
#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
|
||||
#define HISTOGRAM_INTERNAL_H_INCLUDED
|
||||
bool
|
||||
find_minmax(const std::vector<double>& numbers, double& min1, double& max1);
|
||||
|
||||
#endif // HISTOGRAM_INTERNAL_H_INCLUDED
|
||||
@ -0,0 +1,3 @@
|
||||
10
|
||||
3 3 3 4 4 4 4 4 5 5
|
||||
3
|
||||
@ -0,0 +1,103 @@
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <curl/curl.h>
|
||||
#include "text.h"
|
||||
#include "histogram.h"
|
||||
#include "svg.h"
|
||||
#include "histogram_internal.h"
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
using namespace std;
|
||||
|
||||
struct Input
|
||||
{
|
||||
vector<double> numbers;
|
||||
int bin_count;
|
||||
};
|
||||
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
|
||||
|
||||
input_data(istream& in, bool prompt)
|
||||
{
|
||||
size_t number_count;
|
||||
in >> number_count;
|
||||
|
||||
Input inp;
|
||||
inp.numbers.resize(number_count);
|
||||
|
||||
if (prompt)
|
||||
{
|
||||
std::cerr << "enter bin_count";
|
||||
}
|
||||
inp.numbers.resize(number_count);
|
||||
for (size_t i = 0; i < number_count; i++)
|
||||
{
|
||||
in >> inp.numbers[i];
|
||||
|
||||
}
|
||||
|
||||
in >> inp.bin_count;
|
||||
|
||||
return inp;
|
||||
}
|
||||
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) &&
|
||||
!curl_easy_getinfo(curl, CURLINFO_PRIMARY_IP, &ip) && ip) {
|
||||
cerr<<("IP: %s\n", ip);
|
||||
}
|
||||
|
||||
if (res != 0)
|
||||
{
|
||||
cout << curl_easy_strerror(res);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
curl_easy_cleanup(curl);
|
||||
return input_data(buffer, false);
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char* argv[])
|
||||
{
|
||||
Input in;
|
||||
if (argc > 1)
|
||||
{
|
||||
in = download(argv[1]);
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
in = input_data(cin, true);
|
||||
}
|
||||
|
||||
|
||||
auto bins = make_histogram(in.numbers, in.bin_count);
|
||||
show_histogram_svg(bins);
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -0,0 +1,80 @@
|
||||
#include "svg.h"
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
using namespace std;
|
||||
|
||||
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
|
||||
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 << fill << fill << "' />";
|
||||
}
|
||||
|
||||
void
|
||||
show_histogram_svg(vector<long long unsigned int> & bins, int BLOCK_WIDTH)
|
||||
{
|
||||
|
||||
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;
|
||||
|
||||
|
||||
|
||||
svg_begin(400, 300);
|
||||
|
||||
double top = 0;
|
||||
const size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH;
|
||||
auto maxb = bins[0];
|
||||
|
||||
for (size_t j = 1; j < bins.size(); j++)
|
||||
{
|
||||
if (bins[j] > maxb) maxb = bins[j];
|
||||
}
|
||||
|
||||
auto maxb1 = maxb * BLOCK_WIDTH;
|
||||
|
||||
for (size_t bin : bins)
|
||||
{
|
||||
|
||||
double bin_width;
|
||||
|
||||
int color = (10 - (bin * 9) / maxb);
|
||||
|
||||
if (maxb1 > MAX_ASTERISK)
|
||||
{
|
||||
bin_width = BLOCK_WIDTH * MAX_ASTERISK * (bin / maxb1);
|
||||
}
|
||||
else bin_width = BLOCK_WIDTH * bin;
|
||||
|
||||
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
|
||||
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "violet", to_string(color));
|
||||
top += BIN_HEIGHT;
|
||||
}
|
||||
|
||||
svg_end();
|
||||
}
|
||||
@ -0,0 +1,3 @@
|
||||
10
|
||||
3 3 4 4 4 4 4 5 5 5
|
||||
3
|
||||
@ -0,0 +1,96 @@
|
||||
#include "svg.h"
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
||||
|
||||
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
|
||||
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 << fill << fill << "' />"<<endl;
|
||||
}
|
||||
|
||||
void
|
||||
show_histogram_svg(vector<long long unsigned int> & bins)
|
||||
{
|
||||
|
||||
const auto IMAGE_WIDTH = 400;
|
||||
const auto IMAGE_HEIGHT = 300;
|
||||
const auto TEXT_LEFT = 20;
|
||||
const auto TEXT_BASELINE = 20;
|
||||
const auto BLOCK_WIDTH = 20;
|
||||
const auto TEXT_WIDTH = 50;
|
||||
const auto BIN_HEIGHT = 30;
|
||||
const auto MAX_ASTERISK1 = 30;
|
||||
|
||||
double top = 0;
|
||||
const size_t MAX_ASTERISK = IMAGE_WIDTH - TEXT_WIDTH;
|
||||
auto maxb = bins[0];
|
||||
|
||||
for (size_t j = 1; j < bins.size(); j++)
|
||||
{
|
||||
if (bins[j] > maxb) maxb = bins[j];
|
||||
}
|
||||
|
||||
|
||||
int i = 0;
|
||||
|
||||
|
||||
|
||||
auto maxb1 = maxb * BLOCK_WIDTH;
|
||||
|
||||
svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
|
||||
|
||||
for (size_t bin : bins)
|
||||
{
|
||||
|
||||
double bin_width;
|
||||
|
||||
int color = 10;
|
||||
|
||||
if (maxb1 > MAX_ASTERISK)
|
||||
{
|
||||
bin_width = MAX_ASTERISK * (static_cast<double>(bin) / maxb);
|
||||
}
|
||||
else
|
||||
bin_width = BLOCK_WIDTH * bin;
|
||||
//cerr << "\n" << bin << "\n";
|
||||
// cerr << "\n" << bin_width << "\n";
|
||||
|
||||
|
||||
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
|
||||
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "violet", to_string(color));
|
||||
top += BIN_HEIGHT;
|
||||
if (i == 4)
|
||||
break;
|
||||
else
|
||||
i++;
|
||||
}
|
||||
|
||||
svg_end();
|
||||
}
|
||||
|
||||
@ -0,0 +1,6 @@
|
||||
#pragma once
|
||||
#include <vector>
|
||||
|
||||
void
|
||||
show_histogram_svg(std::vector<long long unsigned int>& bins);
|
||||
bool inbl(const int& BLOCK_WIDTH);
|
||||
@ -0,0 +1,16 @@
|
||||
#include "text.h"
|
||||
void show_histogram_text(vector <size_t> &bins)
|
||||
{
|
||||
for (size_t i=0; i<bins.size(); i++)
|
||||
{
|
||||
if (bins[i]!=0)
|
||||
{
|
||||
cout<<bins[i]<<" | " ;
|
||||
for (size_t j=0; j<bins[i]; j++)
|
||||
{
|
||||
cout<<"*";
|
||||
}
|
||||
cout<<endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
|
||||
#include "text.h"
|
||||
void show_histogram_text(std::vector <size_t> &bins)
|
||||
{
|
||||
for (size_t i=0; i<bins.size(); i++)
|
||||
{
|
||||
if (bins[i]!=0)
|
||||
{
|
||||
std::cout<<bins[i]<<" | " ;
|
||||
for (size_t j=0; j<bins[i]; j++)
|
||||
{
|
||||
std::cout<<"*";
|
||||
}
|
||||
std::cout<<std::endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
#ifndef TEXT_H_INCLUDED
|
||||
#define TEXT_H_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
#include <iostream>
|
||||
|
||||
void show_histogram_text(std::vector <size_t> &bins);
|
||||
|
||||
|
||||
#endif // TEXT_H_INCLUDED
|
||||
@ -0,0 +1,42 @@
|
||||
<?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="doctest.h" />
|
||||
<Unit filename="histogram.cpp" />
|
||||
<Unit filename="histogram_internal.h" />
|
||||
<Unit filename="svg.cpp" />
|
||||
<Unit filename="svg.h" />
|
||||
<Unit filename="unittest.cpp" />
|
||||
<Extensions />
|
||||
</Project>
|
||||
</CodeBlocks_project_file>
|
||||
@ -0,0 +1,59 @@
|
||||
#define DOCTEST_CONFIG_NO_MULTITHREADING
|
||||
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
|
||||
#include "doctest.h"
|
||||
#include "histogram_internal.h"
|
||||
#include "svg.h"
|
||||
|
||||
TEST_CASE("Too big") {
|
||||
int BLOCKWIDTH =40;
|
||||
CHECK(inbl(BLOCKWIDTH) == false);
|
||||
}
|
||||
TEST_CASE("Too small") {
|
||||
int BLOCKWIDTH =1;
|
||||
CHECK(inbl(BLOCKWIDTH) == false);
|
||||
}
|
||||
TEST_CASE("ok ") {
|
||||
int BLOCKWIDTH =12;
|
||||
CHECK(inbl(BLOCKWIDTH) == true);
|
||||
}
|
||||
TEST_CASE("distinct positive numbers") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
find_minmax({1, 2}, min, max);
|
||||
CHECK(min == 1);
|
||||
CHECK(max == 2);
|
||||
}
|
||||
|
||||
TEST_CASE("distinct identical numbers") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
find_minmax({5, 5}, min, max);
|
||||
CHECK(min == 5);
|
||||
CHECK(max == 5);
|
||||
}
|
||||
|
||||
TEST_CASE("distinct one number") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
find_minmax({3}, min, max);
|
||||
CHECK(min == 3);
|
||||
CHECK(max == 3);
|
||||
}
|
||||
|
||||
TEST_CASE("distinct negative numbers") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
find_minmax({-3, -1}, min, max);
|
||||
CHECK(min == -3);
|
||||
CHECK(max == -1);
|
||||
}
|
||||
TEST_CASE("empty arr") {
|
||||
double min = 0;
|
||||
double max = 0;
|
||||
|
||||
CHECK(find_minmax({}, min, max) == false);
|
||||
CHECK(find_minmax({3,4}, min, max) == true);
|
||||
|
||||
;
|
||||
}
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
# depslib dependency file v1.0
|
||||
1682343064 source:c:\program files\codeblocks\devlab1\histogram.cpp
|
||||
"histogram.h"
|
||||
<vector>
|
||||
<iostream>
|
||||
|
||||
1681733870 c:\program files\codeblocks\devlab1\histogram.h
|
||||
<vector>
|
||||
|
||||
1682343068 source:c:\program files\codeblocks\devlab1\unittest.cpp
|
||||
"doctest.h"
|
||||
"histogram_internal.h"
|
||||
"svg.h"
|
||||
|
||||
1681707623 c:\program files\codeblocks\devlab1\doctest.h
|
||||
<signal.h>
|
||||
<ciso646>
|
||||
<cstddef>
|
||||
<ostream>
|
||||
<istream>
|
||||
<type_traits>
|
||||
"doctest_fwd.h"
|
||||
<ctime>
|
||||
<cmath>
|
||||
<climits>
|
||||
<math.h>
|
||||
<new>
|
||||
<cstdio>
|
||||
<cstdlib>
|
||||
<cstring>
|
||||
<limits>
|
||||
<utility>
|
||||
<fstream>
|
||||
<sstream>
|
||||
<iostream>
|
||||
<algorithm>
|
||||
<iomanip>
|
||||
<vector>
|
||||
<atomic>
|
||||
<mutex>
|
||||
<set>
|
||||
<map>
|
||||
<unordered_set>
|
||||
<exception>
|
||||
<stdexcept>
|
||||
<csignal>
|
||||
<cfloat>
|
||||
<cctype>
|
||||
<cstdint>
|
||||
<string>
|
||||
<sys/types.h>
|
||||
<unistd.h>
|
||||
<sys/sysctl.h>
|
||||
<AfxWin.h>
|
||||
<windows.h>
|
||||
<io.h>
|
||||
<sys/time.h>
|
||||
<unistd.h>
|
||||
|
||||
1682343113 c:\program files\codeblocks\devlab1\histogram_internal.h
|
||||
|
||||
1682339123 source:c:\program files\codeblocks\devlab1\svg.cpp
|
||||
"svg.h"
|
||||
<iostream>
|
||||
<vector>
|
||||
|
||||
1682337558 c:\program files\codeblocks\devlab1\svg.h
|
||||
<vector>
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<CodeBlocks_layout_file>
|
||||
<FileVersion major="1" minor="0" />
|
||||
<ActiveTarget name="Debug" />
|
||||
<File name="doctest.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="110023" topLine="2360" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="unittest.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="824" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="histogram_internal.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="160" topLine="0" />
|
||||
</Cursor>
|
||||
</File>
|
||||
<File name="histogram.cpp" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
|
||||
<Cursor>
|
||||
<Cursor1 position="86" topLine="20" />
|
||||
</Cursor>
|
||||
</File>
|
||||
</CodeBlocks_layout_file>
|
||||
Загрузка…
Ссылка в новой задаче