Разбил программу по частям
Этот коммит содержится в:
62
histogram.cpp
Обычный файл
62
histogram.cpp
Обычный файл
@@ -0,0 +1,62 @@
|
||||
#include <vector>
|
||||
#include "histogram.h"
|
||||
using namespace std;
|
||||
|
||||
vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count) {
|
||||
|
||||
vector<size_t> bins(bin_count);
|
||||
vector<size_t> binss(bin_count);
|
||||
|
||||
double max, min;
|
||||
find_minmax(numbers, min, max);
|
||||
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]++;
|
||||
}
|
||||
}
|
||||
|
||||
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 find_minmax(const vector<double>& numbers, double& min, double& max) {
|
||||
min = numbers[0];
|
||||
for (auto i = 0; i < numbers.size(); i++) {
|
||||
if (numbers[i] < min) {
|
||||
min = numbers[i];
|
||||
}
|
||||
}
|
||||
|
||||
max = numbers[0];
|
||||
for (auto i = 0; i < numbers.size(); i++) {
|
||||
if (numbers[i] > max) {
|
||||
max = numbers[i];
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
7
histogram.h
Обычный файл
7
histogram.h
Обычный файл
@@ -0,0 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <vector>
|
||||
|
||||
std::vector<size_t>
|
||||
make_histogram(const std::vector<double>& numbers, size_t bin_count);
|
||||
void find_minmax(const std::vector<double>& numbers, double& min, double& max);
|
||||
100
lab1.cpp
100
lab1.cpp
@@ -4,6 +4,8 @@
|
||||
#include <iostream>
|
||||
#include <vector>
|
||||
#include <cmath>
|
||||
#include "histogram.h"
|
||||
#include "text.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
@@ -30,81 +32,7 @@ input_data() {
|
||||
return in;
|
||||
}
|
||||
|
||||
void find_minmax(const vector<double>& numbers, double& min, double& max) {
|
||||
min = numbers[0];
|
||||
for (auto i = 0; i < numbers.size(); i++) {
|
||||
if (numbers[i] < min) {
|
||||
min = numbers[i];
|
||||
}
|
||||
}
|
||||
|
||||
max = numbers[0];
|
||||
for (auto i = 0; i < numbers.size(); i++) {
|
||||
if (numbers[i] > max) {
|
||||
max = numbers[i];
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
vector<size_t> make_histogram(const vector<double>& numbers, size_t bin_count) {
|
||||
|
||||
vector<size_t> bins(bin_count);
|
||||
vector<size_t> binss(bin_count);
|
||||
|
||||
double max, min;
|
||||
find_minmax(numbers, min, max);
|
||||
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]++;
|
||||
}
|
||||
}
|
||||
|
||||
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_histogram_text(vector <size_t> bins, size_t bin_count ) {
|
||||
|
||||
for (size_t i = 0; i < bin_count; i++) {
|
||||
if (bins[i] < 100) {
|
||||
cout << " ";
|
||||
}
|
||||
if (bins[i] < 10) {
|
||||
cout << " ";
|
||||
}
|
||||
cout << bins[i] << "|";
|
||||
for (size_t j = 0; j < bins[i]; j++) {
|
||||
cout << "*";
|
||||
}
|
||||
cout << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -116,27 +44,3 @@ int main()
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -127,7 +127,13 @@
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="histogram.cpp" />
|
||||
<ClCompile Include="lab1.cpp" />
|
||||
<ClCompile Include="text.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="histogram.h" />
|
||||
<ClInclude Include="text.h" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
||||
@@ -18,5 +18,19 @@
|
||||
<ClCompile Include="lab1.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="histogram.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="text.cpp">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="histogram.h">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="text.h">
|
||||
<Filter>Исходные файлы</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
23
text.cpp
Обычный файл
23
text.cpp
Обычный файл
@@ -0,0 +1,23 @@
|
||||
#include <vector>
|
||||
#include "text.h"
|
||||
#include <iostream>
|
||||
|
||||
|
||||
using namespace std;
|
||||
|
||||
void show_histogram_text(vector <size_t> bins, size_t bin_count) {
|
||||
|
||||
for (size_t i = 0; i < bin_count; i++) {
|
||||
if (bins[i] < 100) {
|
||||
cout << " ";
|
||||
}
|
||||
if (bins[i] < 10) {
|
||||
cout << " ";
|
||||
}
|
||||
cout << bins[i] << "|";
|
||||
for (size_t j = 0; j < bins[i]; j++) {
|
||||
cout << "*";
|
||||
}
|
||||
cout << "\n";
|
||||
}
|
||||
}
|
||||
5
text.h
Обычный файл
5
text.h
Обычный файл
@@ -0,0 +1,5 @@
|
||||
#pragma once
|
||||
#include <vector>
|
||||
|
||||
|
||||
void show_histogram_text(std:: vector <size_t> bins, size_t bin_count);
|
||||
Ссылка в новой задаче
Block a user