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

...

3 Коммитов

Автор SHA1 Сообщение Дата
KriviAS 0f842ad12d code: изменение программы
1 год назад
KriviAS 37a21ea610 build: доб
1 год назад
KriviAS 68dd12a06f build: добавление файлов
1 год назад

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

@ -1,6 +1,10 @@
#include <iostream> #include <iostream>
#include <conio.h> #include <conio.h>
#include <vector> #include <vector>
#include "histogram.h"
#include "text.h"
#include "svg.h"
using namespace std; using namespace std;
struct Input { struct Input {
vector<double> numbers; vector<double> numbers;
@ -119,6 +123,6 @@ int main()
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1; const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
auto in = input_data(); auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count); auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_text(bins, MAX_ASTERISK); show_histogram_svg(bins);
return 0; return 0;
} }

@ -0,0 +1,24 @@
#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
show_histogram_svg(const vector <double>& bins) {
svg_begin(400, 300);
svg_end();
}

@ -0,0 +1,7 @@
#ifndef SVG_H_INCLUDED
#define SVG_H_INCLUDED
void
show_histogram_svg(const std::vector<double>& bins);
#endif // SVG_H_INCLUDED

@ -0,0 +1,38 @@
<?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>
<Extensions>
<lib_finder disable_auto="1" />
</Extensions>
</Project>
</CodeBlocks_project_file>

@ -0,0 +1,40 @@
#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;
find_minmax({1, 2}, min, max);
CHECK(min == 1);
CHECK(max == 2);
}
TEST_CASE("empty vector") {
double min = 0;
double max = 0;
find_minmax({NULL}, min, max);
CHECK(min == 0);
CHECK(max == 0);
}
TEST_CASE("one element") {
double min = 0;
double max = 0;
find_minmax({1}, min, max);
CHECK (min == 1);
CHECK (max == 1);
}
TEST_CASE("negative elements") {
double min = 0;
double max = 0;
find_minmax({-1, -2}, min, max);
CHECK (min == -2);
CHECK (max == -1);
}
TEST_CASE("same elements") {
double min = 0;
double max = 0;
find_minmax({1, 1, 1}, min, max);
CHECK (min == 1);
CHECK (max == 1);
}
Загрузка…
Отмена
Сохранить