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

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

Основа: BaranovEK:bfb3f8cf9c551ea117fc90ba7e32358332b63b8c
Ветки Теги
BaranovEK:main
..
сравнить: BaranovEK:61a244479c32ffb938e6be37bce364203e82b9f6
Ветки Теги
BaranovEK:main

Ничего общего в коммитах. 'bfb3f8cf9c551ea117fc90ba7e32358332b63b8c' и '61a244479c32ffb938e6be37bce364203e82b9f6' имеют совершенно разные истории.
bfb3f8cf9c ... 61a244479c

16 изменённых файлов: 25 добавлений и 7694 удалений
Показать статистику

7106
doctest.h
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

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

@ -1,52 +0,0 @@
#include "histogram.h"
#include <vector>
#include <iostream>
using namespace std;
void
find_minmax(const vector<double>& numbers, double& min, double& max)
{
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;
find_minmax(numbers, min, max);
auto bin_size = (max - min)/bin_count;
vector<size_t> bins(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
Unescape Просмотреть файл

@ -1,9 +0,0 @@
#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
Unescape Просмотреть файл

@ -1,9 +0,0 @@
#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
#define HISTOGRAM_INTERNAL_H_INCLUDED
#include <vector>
void
find_minmax(const std::vector<double>& numbers, double& min, double& max);
#endif // HISTOGRAM_INTERNAL_H_INCLUDED

7
lab03.cbp
Unescape Просмотреть файл

@ -32,14 +32,7 @@
<Add option="-Wall" /> <Add option="-Wall" />
<Add option="-fexceptions" /> <Add option="-fexceptions" />
</Compiler> </Compiler>
<Unit filename="histogram.cpp" />
<Unit filename="histogram.h" />
<Unit filename="histogram_internal.h" />
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h" />
<Unit filename="text.cpp" />
<Unit filename="text.h" />
<Extensions /> <Extensions />
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>

33
lab03.depend
Unescape Просмотреть файл

@ -1,33 +0,0 @@
# depslib dependency file v1.0
1716799438 source:c:\users\lenov\desktop\lab03\histogram.cpp
"histogram.h"
<vector>
<iostream>
1716797551 c:\users\lenov\desktop\lab03\histogram.h
<vector>
1717268069 source:c:\users\lenov\desktop\lab03\main.cpp
<iostream>
<vector>
"histogram.h"
"text.h"
"svg.h"
1716798974 c:\users\lenov\desktop\lab03\text.h
<vector>
1717261318 source:c:\users\lenov\desktop\lab03\text.cpp
<iostream>
"text.h"
<vector>
1716819918 c:\users\lenov\desktop\lab03\svg.h
<vector>
1716819750 source:c:\users\lenov\desktop\lab03\svg.cpp
<iostream>
<vector>
<string>
"svg.h"

160
main.cpp
Unescape Просмотреть файл

@ -1,155 +1,45 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "histogram.h"
#include "text.h"
#include "svg.h"
using namespace std; using namespace std;
struct Input { int main()
vector<double> numbers; {
size_t bin_count{}; const size_t SCREEN_WIDTH = 80;
double COLUMN_HIGHT; const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
}; size_t max_count = 0;
Input size_t max_count_bin;
input_data() {
size_t number_count; size_t number_count;
cerr << "Enter number count: "; cerr << "Enter number count: ";
cin >> number_count; cin >> number_count;
Input in; vector<double> numbers(number_count);
in.numbers.resize(number_count);
cerr << "Enter numbers: "; cerr << "Enter numbers: ";
for (size_t i = 0; i < number_count; i++) { for (int i = 0; i < number_count; i++)
cin >> in.numbers[i]; {
cin >> numbers[i];
} }
size_t bin_count;
cerr << "Enter bin count: "; cerr << "Enter bin count: ";
cin>> in.bin_count; cin >> bin_count;
cerr << "Enter column hight: "; vector<size_t > bins(bin_count);
cin >> in.COLUMN_HIGHT; double max = numbers[0];
while (in.COLUMN_HIGHT <=0 ){ double min = numbers[0];
cerr << "The height of the column can only be positive, try again: ";
cin >> in.COLUMN_HIGHT;
}
return in;
}
/*void
find_minmax(const vector<double>& numbers, double& min, double& max)
{
min = numbers[0];
max = numbers[0];
for (double x : numbers) for (double x : numbers)
{ {
if (x > max ) if (x > max)
{
max = x; max = x;
}
if (x < min) if (x < min)
{
min = x; min = x;
}
}
}
vector<size_t>
make_histogram(const vector<double>& numbers, size_t& bin_count)
{
double min = 0;
double max = 0;
find_minmax(numbers, min, max);
auto bin_size = (max - min)/bin_count;
vector<size_t> bins(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;
}*/
/*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];
}
}
auto kof = static_cast<double>(MAX_ASTERISK) / max_count;
if (kof > 1)
{
kof = 1;
}
for (size_t bin : bins)
{
if (bin <100)
{
cout << " ";
}
if (bin <10)
{
cout << " ";
}
cout << bin << "|";
size_t weight = bin * kof;
for (size_t t = 0; t < weight; t++)
{
cout << "*";
}
cout << endl;
}
}*/
int
main() {
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
// show_histogram_svg(bins);
COLUMN_hight_function(in.COLUMN_HIGHT,in.bin_count,bins);
/*int main()
{
Input in = input_data(); }
double min, max; for (size_t i = 0; i < number_count; i++) {
find_minmax(in.numbers, min, max); if (numbers[i] < min)
cout<< min << " " << max; min = numbers[i];
if (numbers[i] > max)
max = numbers[i];
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
size_t max_count = 0;
size_t max_count_bin;
size_t number_count;
//cerr << "Enter number count: ";
//cin >> number_count;
//vector<double> numbers(number_count);
//cerr << "Enter numbers: ";
//for (int i = 0; i < number_count; i++)
// {
// cin >> numbers[i];
// }
//size_t bin_count;
// cerr << "Enter bin count: ";
// cin >> bin_count;
// vector<size_t > bins(bin_count);
}
double bin_size = ((max - min) / bin_count); double bin_size = ((max - min) / bin_count);
for (size_t i = 0; i < number_count; i++) for (size_t i = 0; i < number_count; i++)
@ -244,6 +134,6 @@ main() {
{ {
cout << "Histogram height is too small"; cout << "Histogram height is too small";
} }
*/
return 0; return 0;
} }

3
marks.txt
Unescape Просмотреть файл

@ -1,3 +0,0 @@
10
3 3 4 4 4 4 4 5 5 5
3

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

@ -1,104 +0,0 @@
#include <iostream>
#include <vector>
#include <string>
#include "svg.h"
using namespace std;
const auto IMAGE_WIDTH = 400;
const auto IMAGE_HEIGHT = 700;
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;
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 = "aaaaaa") {
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 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(400, 300);
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();
}
void
svg_rect_hight(double x, double y, double width, double height, string stroke = "black", string fill = "hfhfh") {
cout << "<rect x='" << x<< "' y='" << y<< "' width='" << width<< "' height='" << height<< "' stroke='" << stroke<< "' fill='" << fill << "' />\n";
}
void
COLUMN_hight_function( double &COLUMN_height ,size_t bin_count,const vector<size_t>& bins){
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 );
if ((bin_count*COLUMN_height) > IMAGE_HEIGHT ){
COLUMN_height= static_cast<double>(IMAGE_HEIGHT) / bin_count;
}
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, COLUMN_height);
top += COLUMN_height;
}
svg_end();
}

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

@ -1,10 +0,0 @@
#ifndef SVG_H_INCLUDED
#define SVG_H_INCLUDED
#include <vector>
void
show_histogram_svg(const std::vector<size_t>& bins);
void
COLUMN_hight_function( double &COLUMN_height ,size_t bin_count,const std::vector<size_t>& bins);
#endif // SVG_H_INCLUDED

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

@ -1,43 +0,0 @@
#include <iostream>
#include "text.h"
#include <vector>
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];
}
}
auto kof = static_cast<double>(MAX_ASTERISK) / max_count;
if (kof > 1)
{
kof = 1;
}
for (size_t bin : bins)
{
if (bin <100)
{
cout << " ";
}
if (bin <10)
{
cout << " ";
}
cout << bin << "|";
size_t weight = bin * kof;
for (size_t t = 0; t < weight; t++)
{
cout << "*";
}
cout << endl;
}
}

9
text.h
Unescape Просмотреть файл

@ -1,9 +0,0 @@
#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

45
unittest.cbp
Unescape Просмотреть файл

@ -1,45 +0,0 @@
<?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.h" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h" />
<Unit filename="unittest.cbp" />
<Unit filename="unittest.cpp" />
<Extensions>
<lib_finder disable_auto="1" />
</Extensions>
</Project>
</CodeBlocks_project_file>

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

@ -1,53 +0,0 @@
#define DOCTEST_CONFIG_NO_MULTITHREADING
#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
#include "doctest.h"
#include "histogram_internal.h"
#include "svg.h"
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 negative numbers") {
double min = -1;
double max = -1;
find_minmax({-1, -2}, min, max);
CHECK(min == -2);
CHECK(max == -1);
}
TEST_CASE("one number") {
double min = 0;
double max = 0;
find_minmax({1}, min, max);
CHECK(min == 1);
CHECK(max == 1);
}
TEST_CASE("same numbers") {
double min = 0;
double max = 0;
find_minmax({2, 2}, min, max);
CHECK(min == 2);
CHECK(max == 2);
}
TEST_CASE("Image height < column height") {
double COLUMN_height = 220000;
COLUMN_hight_function(COLUMN_height ,5,{23,5,54,6,7});
CHECK(COLUMN_height == 140 );
}
TEST_CASE("Image height > column height ") {
double COLUMN_height = 100;
COLUMN_hight_function(COLUMN_height ,5,{23,5,54,6,7});
CHECK(COLUMN_height == 100 );
}

71
unittest.depend
Unescape Просмотреть файл

@ -1,71 +0,0 @@
# depslib dependency file v1.0
1716799438 source:c:\users\lenov\desktop\lab03\histogram.cpp
"histogram.h"
<vector>
<iostream>
1716797551 c:\users\lenov\desktop\lab03\histogram.h
<vector>
1716828332 source:c:\users\lenov\desktop\lab03\unittest.cpp
"doctest.h"
"histogram_internal.h"
"svg.h"
1716800315 c:\users\lenov\desktop\lab03\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>
1716799551 c:\users\lenov\desktop\lab03\histogram_internal.h
<vector>
1716819750 source:c:\users\lenov\desktop\lab03\svg.cpp
<iostream>
<vector>
<string>
"svg.h"
1716819918 c:\users\lenov\desktop\lab03\svg.h
<vector>

5
unittest.layout
Unescape Просмотреть файл

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" />
</CodeBlocks_layout_file>
Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить