code: изменение кода до пункта 5

master
MakhnovGA 2 лет назад
Родитель e4b70dc7fb
Сommit 54c9db59e2

@ -0,0 +1,51 @@
#include <math.h>
#include <iostream>
#include <conio.h>
#include <vector>
#include "histogram.h"
using namespace std;
static
find_minmax(vector<double> numbers, double &min, double &max) {
min = numbers[0];
max = numbers[0];
for (size_t i = 1; i < numbers.size(); i++) {
if (min > numbers[i])
min = numbers[i];
if (max < numbers[i])
max = numbers[i];
}
}
vector <size_t> make_histogramm(vector<double>numbers, size_t bin_count){
double min, max;
find_minmax(numbers, min, max);
double binSize = (max - min) / bin_count;
vector<size_t> bins(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 * binSize;
auto hi = min + (j + 1) * binSize;
if ((numbers[i] >= lo) && (numbers[i] < hi)) {
bins[j]++;
found = true;
}
}
if (!found)
bins[bin_count - 1]++;
}
int max_count = bins[0];
for (size_t i = 0; i < bin_count; i++) {
if (bins[i] > max_count)
max_count = bins[i];
}
if (max_count > 76) {
for (size_t i = 0; i < bin_count; i++) {
int count = bins[i];
size_t height = 76 * (static_cast<double>(count) / max_count);
bins[i] = height;
}
}
return bins;
}

@ -0,0 +1,10 @@
#ifndef HISTOGRAM_H_INCLUDED
#define HISTOGRAM_H_INCLUDED
#include <vector>
std::vector<size_t>
make_histogramm(std::vector<double> numbers, size_t bin_count);
#endif // HISTOGRAM_H_INCLUDED

@ -2,6 +2,8 @@
#include <iostream>
#include <conio.h>
#include <vector>
#include "histogram.h"
#include "text.h"
using namespace std;
struct Input {
@ -25,61 +27,6 @@ input_data(){
return in;
}
void
find_minmax(vector<double> numbers, double &min, double &max) {
min = numbers[0];
max = numbers[0];
for (size_t i = 1; i < numbers.size(); i++) {
if (min > numbers[i])
min = numbers[i];
if (max < numbers[i])
max = numbers[i];
}
return;
}
vector <size_t> make_histogramm(vector<double>numbers, size_t bin_count){
double min, max;
find_minmax(numbers, min, max);
double binSize = (max - min) / bin_count;
vector<size_t> bins(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 * binSize;
auto hi = min + (j + 1) * binSize;
if ((numbers[i] >= lo) && (numbers[i] < hi)) {
bins[j]++;
found = true;
}
}
if (!found)
bins[bin_count - 1]++;
}
int max_count = bins[0];
for (size_t i = 0; i < bin_count; i++) {
if (bins[i] > max_count)
max_count = bins[i];
}
if (max_count > 76) {
for (size_t i = 0; i < bin_count; i++) {
int count = bins[i];
size_t height = 76 * (static_cast<double>(count) / max_count);
bins[i] = height;
}
}
return bins;
}
void show_histogramm(vector<size_t>bins){
for (size_t i = 0; i < bins.size(); i++) {
cout << bins[i] << "|";
for (size_t j = 0; j < bins[i]; j++)
cout << "*";
cout << endl;
}
return;
}
int main() {
Input in = input_data();

@ -0,0 +1,16 @@
#include <math.h>
#include <iostream>
#include <conio.h>
#include <vector>
#include "text.h"
using namespace std;
void show_histogramm(vector<size_t>bins){
for (size_t i = 0; i < bins.size(); i++) {
cout << bins[i] << "|";
for (size_t j = 0; j < bins[i]; j++)
cout << "*";
cout << endl;
}
return;
}

@ -0,0 +1,8 @@
#ifndef TEXT_H_INCLUDED
#define TEXT_H_INCLUDED
#include <vector>
void show_histogramm(std::vector<size_t>bins);
#endif // TEXT_H_INCLUDED
Загрузка…
Отмена
Сохранить