пунк 5.1 коммит забытых файлов

master
Dmitriy (BerezhkovDA) 1 год назад
Родитель 111595c47e
Сommit 4300a78aad

@ -5,6 +5,8 @@ VisualStudioVersion = 17.7.34031.279
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sem2_lab1", "sem2_lab1\sem2_lab1.vcxproj", "{618D0355-4122-45FF-B970-B71C7755CBA7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unittest", "unittest\unittest.vcxproj", "{5B3F651C-066D-4AF0-8939-4D8E5EB02872}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@ -21,6 +23,14 @@ Global
{618D0355-4122-45FF-B970-B71C7755CBA7}.Release|x64.Build.0 = Release|x64
{618D0355-4122-45FF-B970-B71C7755CBA7}.Release|x86.ActiveCfg = Release|Win32
{618D0355-4122-45FF-B970-B71C7755CBA7}.Release|x86.Build.0 = Release|Win32
{5B3F651C-066D-4AF0-8939-4D8E5EB02872}.Debug|x64.ActiveCfg = Debug|x64
{5B3F651C-066D-4AF0-8939-4D8E5EB02872}.Debug|x64.Build.0 = Debug|x64
{5B3F651C-066D-4AF0-8939-4D8E5EB02872}.Debug|x86.ActiveCfg = Debug|Win32
{5B3F651C-066D-4AF0-8939-4D8E5EB02872}.Debug|x86.Build.0 = Debug|Win32
{5B3F651C-066D-4AF0-8939-4D8E5EB02872}.Release|x64.ActiveCfg = Release|x64
{5B3F651C-066D-4AF0-8939-4D8E5EB02872}.Release|x64.Build.0 = Release|x64
{5B3F651C-066D-4AF0-8939-4D8E5EB02872}.Release|x86.ActiveCfg = Release|Win32
{5B3F651C-066D-4AF0-8939-4D8E5EB02872}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

3
sem2_lab1/.gitignore поставляемый

@ -2,4 +2,5 @@
/.vs
/_sem2_lab1_02
/sem2_lab1/x64
/x64
/x64
/unittest/x64

@ -3,8 +3,8 @@
#include <iostream>
#include <vector>
#define MAX_STR_LNG 80
#define PREFIX 4
#include "histogram.h"
#include "show_histogram.h"
using namespace std;
struct Input {
@ -25,92 +25,6 @@ Input input_data()
}
return in;
}
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;
}
}
}
vector<double> make_histogram(const vector<double>& numbers, size_t bin_count)
{
vector <double> bins;
double min, max;
find_minmax(numbers, min, max);
int number_count = numbers.size();
bins.resize(bin_count);
double bin_size = (max - min) / bin_count;
for (int i = 0; i < number_count; 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;
}
void show_histogram_text(const vector<double>& bins)
{
//Находим максимум значений корзин
int max_count = bins[0];
for (int x : bins)
{
if (x > max_count) max_count = x;
}
//Определяем надо ли масштабировать данные
int K;
if (max_count <= (MAX_STR_LNG - PREFIX))
{
K = 0;
}
else
{
K = 1;
}
//Строим гистограмму
int cnt;
int bin_sz = bins.size();
for (int i = 0; i < bin_sz; i++)
{
cout.width(3);
cout.fill(' ');
cout << bins[i] << "|";
if (K == 0)
cnt = bins[i];
else
cnt = bins[i] * (MAX_STR_LNG - PREFIX) / max_count;
for (double j = 0; j < cnt; j++) {
cout << "*";
}
cout << endl;
}
}
int main()
{
auto in = input_data();

@ -127,11 +127,18 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="histogram.cpp" />
<ClCompile Include="sem2_lab1.cpp" />
<ClCompile Include="show_histogram.cpp" />
</ItemGroup>
<ItemGroup>
<None Include=".gitignore" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="histogram.h" />
<ClInclude Include="histogram_internal.h" />
<ClInclude Include="show_histogram.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

@ -18,8 +18,25 @@
<ClCompile Include="sem2_lab1.cpp">
<Filter>Исходные файлы</Filter>
</ClCompile>
<ClCompile Include="histogram.cpp">
<Filter>Исходные файлы</Filter>
</ClCompile>
<ClCompile Include="show_histogram.cpp">
<Filter>Исходные файлы</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include=".gitignore" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="histogram.h">
<Filter>Файлы заголовков</Filter>
</ClInclude>
<ClInclude Include="show_histogram.h">
<Filter>Файлы заголовков</Filter>
</ClInclude>
<ClInclude Include="histogram_internal.h">
<Filter>Файлы заголовков</Filter>
</ClInclude>
</ItemGroup>
</Project>
Загрузка…
Отмена
Сохранить