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

..

Ничего общего в коммитах. 'f67263f06336e05a04d3e375039301256e17868a' и 'a264f738e0cf076378376c90e602ff806c6d1994' имеют совершенно разные истории.

@ -1,34 +1,92 @@
#include <iostream>
#include <vector>
#include "histogram.h"
#include "text.h"
using namespace std;
struct Input {
vector<double> numbers;
size_t bin_count{};
};
Input
input_data(){
Input in;
size_t number_count;
cin >> number_count;
in.numbers.resize(number_count);
vector<double> numbers(number_count);
for (size_t i = 0; i < number_count; i++) {
cin >> in.numbers[i];
int main(){
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 6 - 1;
size_t bin_count, counts;
cerr << "Enter counts:";
cin >> counts;
vector <double> numbers(counts);
for (size_t i = 0; i < counts; i++){
cerr << "Enter array "<< i <<" number:";
cin >> numbers[i];
}
cin >> in.bin_count;
return in;
}
cerr << "Enter bin_count:";
cin >> bin_count;
int main(){
size_t max_count;
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_text(bins,in.bin_count, max_count);
return 0;
double minN = numbers[0], maxN = numbers[0];
for (double x: numbers){
if (minN > x){
minN = x;
}
if (maxN < x){
maxN = x;
}
}
double diff = (maxN - minN) / bin_count;
vector <size_t> bins(bin_count);
size_t max_count = 0;
for (size_t i = 0; i < counts; i++){
bool found = false;
for (size_t j = 0;(j < bin_count - 1) && !found; j++){
auto lo = minN + j * diff;
auto hi = minN + (j + 1) * diff;
if ((lo <= numbers[i]) && (hi > numbers[i])){
bins[j]++;
if (bins[j] > max_count){
max_count = bins[j];
}
found = true;
}
}
if(!found){
bins[bin_count - 1]++;
if (bins[bin_count - 1] > max_count){
max_count = bins[bin_count - 1];
}
}
}
bool scaling = false;
if (max_count > MAX_ASTERISK){
scaling = true;
}
for (size_t i = 0; i < bin_count; i++){
cout << " ";
if (bins[i] < 100){
cout << ' ';
}
if (bins[i] < 10){
cout << ' ';
}
cout << bins[i] << '|';
size_t number_of_stars = bins[i];
if (scaling){
if (bins[i] == max_count){
number_of_stars = MAX_ASTERISK * 1.0;
}
else {
number_of_stars = MAX_ASTERISK * (static_cast<double>(bins[i]) / max_count);
}
}
for (size_t j = 0; j < number_of_stars; j++){
cout << '*';
}
cout << endl;
}
}

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