Senya (YershovArA) 2 лет назад
Родитель 279ed6d725
Сommit e1879070ee

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

@ -0,0 +1,41 @@
#include <iostream>
#include <vector>
#include "histogram.h"
using namespace std;
void
find_minmax(vector<double> numbers, double& min, double& max) {
min = numbers[0];
max = numbers[0];
for (double x : numbers) {
if (x < min) {
min = x;
}
else if (x > max) {
max = x;
}
}
}
vector<size_t> make_histogram(vector<double> numbers, size_t bin_count) {
vector <size_t> bins(bin_count);
double min, max;
find_minmax(numbers, min, max);
size_t countt;
double bin_size = (max - min) / 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 = 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]++;
}
}
return bins;
}

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

@ -32,16 +32,13 @@
<Add option="-Wall" />
<Add option="-fexceptions" />
</Compiler>
<Unit filename=",r,t,t,,t r.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename=".gitignore" />
<Unit filename="111.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="histogram.cpp" />
<Unit filename="histogram.h" />
<Unit filename="histogram_internal.h" />
<Unit filename="main.cpp" />
<Unit filename="svg.cpp" />
<Unit filename="svg.h" />
<Unit filename="text.cpp" />
<Unit filename="text.h" />
<Extensions>

@ -1,40 +1,35 @@
#include <iostream>
#include <vector>
#include <math.h>
#include "histogram.h"
#include "text.h"
#include "svg.h"
using namespace std;
struct Input {
vector <double> numbers;
size_t bin_count{}, number_count{};
vector<double> numbers;
size_t bin_count{};
};
Input input_data(){
size_t number_count, bin_count;
Input
input_data(){
size_t number_count;
cerr << "Enter number count: ";
cin >> number_count;
Input in;
in.numbers.resize(number_count);
for (size_t i = 0; i < number_count; i++) {
for(int i;i<number_count;i++)
{
cin >> in.numbers[i];
}
cerr << "Enter bin count: ";
cin >> in.bin_count;
return in;
}
int main()
{
auto in = input_data();
{ Input in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_svg(bins);
return 0;
}

@ -0,0 +1,42 @@
#include <iostream>
#include <vector>
#include "text.h"
#include "histogram.h"
using namespace std;
void
show_histogram_text(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 i = 0; i < bin_count; i++){
if(bins[i]>max_count)
max_count = bins[i];
}
size_t height;
for (size_t i = 0; i < bin_count; i++)
{
if (bins[i] < 100)
cout << " ";
if (bins[i] < 10)
cout << " ";
cout<<bins[i]<<"|";
if(max_count>MAX_ASTERISK){
for (size_t j = 0; j <(height = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count)) ; j++)
{
cout<<"*";
}
cout<<endl;
}
else
{
for (size_t j = 0; j <bins[i] ; j++)
{
cout<<"*";
}
cout<<endl;
}
}
return;
}

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

@ -0,0 +1,13 @@
#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);
}
Загрузка…
Отмена
Сохранить