build: добавление файла реализации histogram.cpp

main
Ivan (BeloziorovIA) 3 недель назад
Родитель 2f9220ab7a
Сommit 81d46b5556

@ -0,0 +1,36 @@
#include "histogram.h"
#include <vector>
//Ôóíêöèÿ ïîèñêà ìèíèìóìà è ìàêñèììóìà
static void find_minmax(const std::vector<double>& numbers, double& Min, double& Max){
Min = numbers[0];
Max = numbers[0];
for (int i = 1; i < numbers.size(); i++) {
if (numbers[i] > Max)
Max = numbers[i];
if (numbers[i] < Min)
Min = numbers[i];
}
}
//Ôóíêöèÿ ðàñ÷¸òà ãèñòîãðàììû
std::vector<size_t> make_histogram(const std::vector<double>& Numbers, size_t bin_count){
//Îïðåäåëåíèå øàãà ìåæäó êîðçèíàìè
double Max, Min;
find_minmax(Numbers, Min, Max);
double bin_size = (Max-Min) / bin_count;
//Ìàññèâ êîðçèí
std::vector<size_t> bins(bin_count);
for (size_t i = 0; i < bin_count; i++) // îáíóëåíèå êîðçèí
bins[i] = 0;
for (size_t i = 0; i < bin_count; i++) {
double lo = Min + i * bin_size;
double hi = Min + (i + 1) * bin_size;
for (size_t j = 0; j < Numbers.size(); j++) {
if (lo <= Numbers[j] && Numbers[j] <= hi)
bins[i]++;
}
}
return bins;
}

@ -2,7 +2,6 @@
#define HISTOGRAM_H_INCLUDED
#include <vector>
std::vector<size_t>
vector<size_t> make_histogram(const std::vector<double>& Numbers, size_t bin_count)
std::vector<size_t> make_histogram(const std::vector<double>& Numbers, size_t bin_count);
#endif // HISTOGRAM_H_INCLUDED

@ -3,6 +3,7 @@
#include <iostream>
#include <vector>
#include <cmath>
#include "histogram.h"
using namespace std;
//!Ðàçäåëèòü ïðîãðàììó íà ôàéëû (3 ïóíêò)!
@ -35,40 +36,6 @@ Input input_data(){
return stct;
}
//Ôóíêöèÿ ïîèñêà ìèíèìóìà è ìàêñèììóìà
void find_minmax(const vector<double>& numbers, double& Min, double& Max){
Min = numbers[0];
Max = numbers[0];
for (int i = 1; i < numbers.size(); i++) {
if (numbers[i] > Max)
Max = numbers[i];
if (numbers[i] < Min)
Min = numbers[i];
}
}
//Ôóíêöèÿ ðàñ÷¸òà ãèñòîãðàììû
vector<size_t> make_histogram(const vector<double>& Numbers, size_t bin_count){
//Îïðåäåëåíèå øàãà ìåæäó êîðçèíàìè
double Max, Min;
find_minmax(Numbers, Min, Max);
double bin_size = (Max-Min) / bin_count;
//Ìàññèâ êîðçèí
vector<size_t> bins(bin_count);
for (size_t i = 0; i < bin_count; i++) // îáíóëåíèå êîðçèí
bins[i] = 0;
for (size_t i = 0; i < bin_count; i++) {
double lo = Min + i * bin_size;
double hi = Min + (i + 1) * bin_size;
for (size_t j = 0; j < Numbers.size(); j++) {
if (lo <= Numbers[j] && Numbers[j] <= hi)
bins[i]++;
}
}
return bins;
}
//Ôóíêöèÿ îòîáðàæåíèÿ è ìàñøòàáèðîâàíèÿ ãèñòîãðàììû
void show_histogram_text(const vector<size_t>& bins){
const size_t SCREEN_WIDTH = 80;
@ -125,10 +92,6 @@ int main() {
//Ââîä ìàññèâà è êîëè÷åñòâà êîðçèí
Input in = input_data();
//Îïðåäåëåíèå ìèíèìóìà è ìàêñèìóìà
double max, min;
find_minmax(in.Numbers, min, max);
//Ñîçäàíèå âåêòîðà bins äëÿ ãèñòîãðàììû
vector<size_t> bins = make_histogram(in.Numbers, in.bin_count);

Загрузка…
Отмена
Сохранить