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

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

Основа: NefedovMikA:bde9f5ec7d727495949188c4f3226e3bbe77aa63
Ветки Теги
NefedovMikA:main
..
сравнить: NefedovMikA:785eaaa0f72c80e8fa985702bd00a5f41669ef5f
Ветки Теги
NefedovMikA:main

Ничего общего в коммитах. 'bde9f5ec7d727495949188c4f3226e3bbe77aa63' и '785eaaa0f72c80e8fa985702bd00a5f41669ef5f' имеют совершенно разные истории.
bde9f5ec7d ... 785eaaa0f7

14 изменённых файлов: 57 добавлений и 213 удалений
Показать статистику

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

@ -1,2 +1,2 @@
/bin /bin/
/obj /obj/

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

@ -3,13 +3,8 @@
#include <vector> #include <vector>
using namespace std; using namespace std;
//std::vector<size_t> void find_minmax(const vector<double>& numbers, double& minN, double& maxN)
bool find_minmax(const vector<double>& numbers, double& minN, double& maxN)
{ {
if (numbers.empty()) {
minN = maxN = 0;
return false;
}
minN = numbers[0]; minN = numbers[0];
maxN = numbers[0]; maxN = numbers[0];
@ -24,7 +19,6 @@ bool find_minmax(const vector<double>& numbers, double& minN, double& maxN)
maxN = x; maxN = x;
} }
} }
return true;
} }
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)

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

@ -6,4 +6,4 @@
std::vector<size_t> std::vector<size_t>
make_histogram(const std::vector<double>& numbers, size_t bin_count); make_histogram(const std::vector<double>& numbers, size_t bin_count);
#endif // HISTOGRAM_H_INCLUDED #endif

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

@ -3,7 +3,7 @@
#include <vector> #include <vector>
//std::vector<size_t> std::vector<size_t>
bool find_minmax(const std::vector<double>& numbers, double& minN, double& maxN); find_minmax( const std::vector<double>& numbers, double& minN, double& maxN);
#endif // HISTOGRAM_INTERNAL_H_INCLUDED #endif // HISTOGRAM_INTERNAL_H_INCLUDED

14
lab01.cbp
Unescape Просмотреть файл

@ -40,13 +40,13 @@
</Unit> </Unit>
<Unit filename="main.cpp" /> <Unit filename="main.cpp" />
<Unit filename="svg.cpp" /> <Unit filename="svg.cpp" />
<Unit filename="svg.h"> <Unit filename="svg.h" />
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="text.cpp" /> <Unit filename="text.cpp" />
<Unit filename="text.h"> <Unit filename="text.h" />
<Option target="&lt;{~None~}&gt;" /> <Unit filename="unittest.cbp" />
</Unit> <Unit filename="unittest.cpp" />
<Extensions /> <Extensions>
<lib_finder disable_auto="1" />
</Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>

26
lab01.depend
Unescape Просмотреть файл

@ -1,32 +1,32 @@
# depslib dependency file v1.0 # depslib dependency file v1.0
1745706239 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\main.cpp 1746381610 source:c:\users\i\desktop\lab01\histogram.cpp
"histogram.h"
<iostream> <iostream>
<vector> <vector>
"histogram.h"
"text.h"
"svg.h"
1745844301 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.cpp 1746379115 c:\users\i\desktop\lab01\histogram.h
"histogram.h" <vector>
1746387234 source:c:\users\i\desktop\lab01\main.cpp
<iostream> <iostream>
<vector> <vector>
"histogram.h"
"text.h"
"svg.h"
1745703309 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.h 1746379236 c:\users\i\desktop\lab01\text.h
<vector> <vector>
1745703516 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\text.cpp 1746379236 source:c:\users\i\desktop\lab01\text.cpp
"text.h" "text.h"
<iostream> <iostream>
<vector> <vector>
1745703516 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\text.h 1746387234 c:\users\i\desktop\lab01\svg.h
<vector>
1745706239 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\svg.h
<iostream> <iostream>
<vector> <vector>
1745708042 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\svg.cpp 1746387234 source:c:\users\i\desktop\lab01\svg.cpp
"svg.h" "svg.h"
<string> <string>

33
lab01.layout
Unescape Просмотреть файл

@ -1,40 +1,45 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<FileVersion major="1" minor="0" /> <FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" /> <ActiveTarget name="Release" />
<File name="text.cpp" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="unittest.cbp" open="1" top="0" tabpos="8" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="373" topLine="0" /> <Cursor1 position="0" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="svg.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="histogram.cpp" open="1" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="1705" topLine="0" /> <Cursor1 position="1422" topLine="1" />
</Cursor> </Cursor>
</File> </File>
<File name="histogram.cpp" open="1" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="text.cpp" open="1" top="0" tabpos="6" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="0" topLine="0" /> <Cursor1 position="1169" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name=".gitignore" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name=".gitignore" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="10" topLine="0" /> <Cursor1 position="10" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="main.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="main.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="223" topLine="0" /> <Cursor1 position="64" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="histogram.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="histogram.h" open="1" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="102" topLine="0" /> <Cursor1 position="183" topLine="0" />
</Cursor> </Cursor>
</File> </File>
<File name="histogram_internal.h" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0"> <File name="unittest.cpp" open="1" top="0" tabpos="9" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor> <Cursor>
<Cursor1 position="0" topLine="0" /> <Cursor1 position="642" topLine="0" />
</Cursor>
</File>
<File name="text.h" open="1" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="175" topLine="0" />
</Cursor> </Cursor>
</File> </File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>

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

@ -13,37 +13,28 @@ struct Input
}; };
Input Input
input_data(istream& in, bool prompt) input_data()
{ {
Input cin; Input in;
string numbCntPrmt, numbsPrmt, binCntPrmt;
if (prompt == true) {
numbCntPrmt = "Enter number count: ";
numbsPrmt = "Enter numbers: ";
binCntPrmt = "Enter bin count: ";
}
size_t number_count; size_t number_count;
cerr << numbCntPrmt; cin >> number_count;
in >> number_count; in.numbers.resize(number_count);
cin.numbers.resize(number_count);
vector<double> numbers(number_count); vector<double> numbers(number_count);
cerr << numbsPrmt;
for (size_t i = 0; i < number_count; i++) for (size_t i = 0; i < number_count; i++)
{ {
in >> cin.numbers[i]; cin >> in.numbers[i];
} }
cerr << binCntPrmt; cin >> in.bin_count;
in >> cin.bin_count; return in;
return cin;
} }
int main() int main()
{ {
size_t max_count; size_t max_count;
auto in = input_data(cin, true); auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count); auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins); show_histogram_svg(bins);
} }

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

@ -2,7 +2,7 @@
#include <string> #include <string>
using namespace std; using namespace std;
void svg_begin(double width, double height) { svg_begin(double width, double height) {
cout << "<?xml version='1.0' encoding='UTF-8'?>\n"; cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
cout << "<svg "; cout << "<svg ";
cout << "width='" << width << "' "; cout << "width='" << width << "' ";
@ -19,53 +19,12 @@ void svg_text(double left, double baseline, string text) {
cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</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") 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 cout << "<rect x='" << x << "' y='" << y << "' width='" << width
<< "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << " '/>"; << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << " '/>";
} }
//Çàùèòà
/*
void svg_rect(double x, double y, double width, double height, string stroke = "black", string fill = "black", double fill_opacity = 1.0) {
cout << "<rect x='" << x << "' y='" << y << "' width='" << width
<< "' height='" << height << "' stroke='" << stroke
<< "' fill='" << fill << "' fill-opacity='" << fill_opacity << "'/>";
}
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;
size_t max_count = *max_element(bins.begin(), bins.end());
if (max_count == 0) max_count = 1;
svg_begin(IMAGE_WIDTH, IMAGE_HEIGHT);
double top = 0;
for (size_t bin : bins) {
const double bin_width = min(static_cast<double>(BLOCK_WIDTH * bin), static_cast<double>(IMAGE_WIDTH - TEXT_WIDTH));
double opacity = static_cast<double>(bin) / max_count;
svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT,
"blue", "green", opacity);
top += BIN_HEIGHT;
}
svg_end();
}
*/
void show_histogram_svg(const vector<size_t>& bins) { 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;
@ -87,6 +46,6 @@ void show_histogram_svg(const vector<size_t>& bins) {
svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "green"); svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "blue", "green");
top += BIN_HEIGHT; top += BIN_HEIGHT;
} }
svg_end(); svg_end();
} }

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

@ -1,6 +1,7 @@
#ifndef TEXT_H_INCLUDED #ifndef TEXT_H_INCLUDED
#define TEXT_H_INCLUDED #define TEXT_H_INCLUDED
#include <vector> #include <vector>
void show_histogram_text(const std::vector <size_t>& bins,size_t bin_count, size_t max_count); void show_histogram_text(const std::vector <size_t>& bins,size_t bin_count, size_t max_count);
#endif // TEXT_H_INCLUDED #endif

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

@ -31,10 +31,6 @@
<Compiler> <Compiler>
<Add option="-Wall" /> <Add option="-Wall" />
</Compiler> </Compiler>
<Unit filename="histogram.cpp" />
<Unit filename="histogram_internal.h" />
<Unit filename="unittest.cbp" />
<Unit filename="unittest.cpp" />
<Extensions> <Extensions>
<lib_finder disable_auto="1" /> <lib_finder disable_auto="1" />
</Extensions> </Extensions>

20
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 <vector>
TEST_CASE("distinct positive numbers") { TEST_CASE("distinct positive numbers") {
double min = 0; double min = 0;
@ -10,9 +9,7 @@ TEST_CASE("distinct positive numbers") {
find_minmax({1, 2}, min, max); find_minmax({1, 2}, min, max);
CHECK(min == 1); CHECK(min == 1);
CHECK(max == 2); CHECK(max == 2);
CHECK(find_minmax({1, 2}, min, max));
} }
TEST_CASE("distinct negative numbers") TEST_CASE("distinct negative numbers")
{ {
double min = 0; double min = 0;
@ -20,7 +17,6 @@ TEST_CASE("distinct negative numbers")
find_minmax({-1, -2}, min, max); find_minmax({-1, -2}, min, max);
CHECK(min == -2); CHECK(min == -2);
CHECK(max == -1); CHECK(max == -1);
CHECK(find_minmax({-1, -2}, min, max));
} }
TEST_CASE("vector 1 element") TEST_CASE("vector 1 element")
{ {
@ -29,20 +25,4 @@ TEST_CASE("vector 1 element")
find_minmax({1}, min, max); find_minmax({1}, min, max);
CHECK(min == 1); CHECK(min == 1);
CHECK(max == 1); CHECK(max == 1);
CHECK(find_minmax({1}, min, max));
}
TEST_CASE("distinct equals numbers")
{
double min = 0;
double max = 0;
find_minmax({1, 1}, min, max);
CHECK(min == 1);
CHECK(max == 1);
CHECK(find_minmax({1, 1}, min, max));
}
TEST_CASE("distinct empty vector")
{
double min = -1;
double max = -1;
CHECK(!find_minmax({}, min, max));
} }

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

@ -1,62 +0,0 @@
# depslib dependency file v1.0
1745848382 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.cpp
"histogram.h"
<iostream>
<vector>
1745845585 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram.h
<vector>
1745848628 source:c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\unittest.cpp
"doctest.h"
"histogram_internal.h"
<vector>
1745704427 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\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>
1745848412 c:\users\lenovo\documents\labsproga2sem\firstlaba\lab01\histogram_internal.h
<vector>

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

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<FileVersion major="1" minor="0" />
<ActiveTarget name="Debug" />
<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="250" 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="205" topLine="0" />
</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="623" topLine="6" />
</Cursor>
</File>
</CodeBlocks_layout_file>
Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить