code: добавлено разделение файлов

main
SavinSA 1 год назад
Родитель cfc1477ada
Сommit c0ff1c37a2

@ -17,7 +17,6 @@
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>17.0</VCProjectVersion>
@ -53,27 +52,24 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared" >
<ImportGroup Label="Shared">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@ -130,8 +126,11 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup></ItemGroup>
<ItemGroup>
<ClCompile Include="histogram.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="text.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

@ -0,0 +1,43 @@
#include "histogram.h"
#include <vector>
#include <iostream>
using namespace std;
void
find_minmax(const 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;
}
}
}
std::vector<double>
make_histogram(const std::vector<double>& numbers, size_t bin_count) {
vector<double> bins(bin_count);
double min = 0, max = 0;
find_minmax(numbers, min, max);
double bin_size = (max - min) / bin_count;
for (int i = 0; i < numbers.size(); i++) {
bool found = false;
for (int 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,5 @@
#pragma once
#include <vector>
std::vector<double>
make_histogram(const std::vector<double>& numbers, size_t bin_count);

@ -1,86 +1,40 @@
#include <iostream>
#include <vector>
#include <math.h>
#include <iostream>
#include <string>
#include "histogram.h"
#include "text.h"
using namespace std;
int main() {
const size_t WIDTH = 80;
const size_t MAX_ASTERISK = WIDTH - 3 - 1;
size_t i, j;
size_t number_count;
cerr << "insert number count: \n";
cin >> number_count;
vector <double> numbers(number_count);
cerr << "insert numbers: \n";
for (i = 0; i < number_count; i++) {
cin >> numbers[i];
}
size_t bin_count;
cerr << "insert bin count: \n";
cin >> bin_count;
struct Input {
vector<double> numbers;
size_t bin_count{};
};
Input
input_data() {
size_t number_count;
cerr << "Enter number count: ";
cin >> number_count;
vector<size_t> bins(bin_count);
double min, max;
min = numbers[0];
max = numbers[0];
for (double x : numbers) {
if (x < min) {
min = x;
}
else if (x > max) {
max = x;
}
}
for (i = 0; i < number_count; i++) {
for (j = number_count - 1; j > i; j--) {
if (numbers[i] == numbers[j]) {
numbers.erase(numbers.begin() + j);
number_count = number_count - 1;
}
}
}
for (i = 0; i < number_count; i++) {
cout << numbers[i];
}
cout << "\n";
double bin_size = (max - min) / bin_count;
for (i = 0; i < number_count; i++) {
bool found = false;
for (j = 0; (j < bin_count && !found); j++) {
auto lo = min + j * bin_size;
auto hi = min + (j + 1) * bin_size;
if ((lo <= numbers[i]) && (hi > numbers[i])) {
bins[j]++;
found = true;
}
}
if (!found) {
bins[bin_count - 1]++;
}
}
Input in;
in.numbers.resize(number_count);
cerr << "Enter numbers: ";
for (size_t i = 0; i < number_count; i++) {
cin >> in.numbers[i];
}
cerr << "Enter bin count: ";
cin >> in.bin_count;
return in;
}
size_t maxcount = bins[0];
for (size_t x : bins) {
if (x > maxcount) {
maxcount = x;
}
}
int main()
{
const size_t SCREEN_WIDTH = 80;
const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
size_t height = 0;
for (i = 0; i < bin_count; i++) {
if (bins[i] < 100) {
cout << " ";
}
if (bins[i] < 10) {
cout << " ";
}
cout << bins[i] << "|";
if (maxcount > 76) {
height = MAX_ASTERISK * (static_cast<double>(bins[i]) / maxcount);
}
for (j = 0; j < height; j++) {
cout << "*";
}
cout << "\n";
}
return 0;
auto in = input_data();
auto bins = make_histogram(in.numbers, in.bin_count);
show_histogram_text(bins, MAX_ASTERISK, in.bin_count);
return 0;
}

@ -0,0 +1,29 @@
#include "text.h"
#include <string>
#include <iostream>
using namespace std;
void
show_histogram_text(const vector<double>& bins, size_t MAX_ASTERISK, size_t bin_count) {
double max_count = bins[0];
for (double x : bins) {
if (x > max_count) {
max_count = x;
}
}
for (int i = 0; i < bin_count; i++) {
double count = bins[i];
size_t height = MAX_ASTERISK * (static_cast<double>(count) / max_count);
string line(height, '*');
if (bins[i] < 100)
{
cout << ' ';
}
if (bins[i] < 10)
{
cout << ' ';
}
cout << bins[i] << "|" << line << endl;
}
}

@ -0,0 +1,5 @@
#pragma once
#include <vector>
void
show_histogram_text(const std::vector<double>& bins, size_t MAX_ASTERISK, size_t bin_count);
Загрузка…
Отмена
Сохранить