Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Бражников Е.А ЛР№1 Умножение плотных матриц. Элементы типа double. Блочная схема, алгоритм Фокса. #156

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/Debug/SeqAlgFox.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
 Source.cpp
D:\App\CProjects\SeqAlgFox\Source.cpp(59,6): warning C4101: rank: неиспользованная локальная переменная
D:\App\CProjects\SeqAlgFox\Source.cpp(58,6): warning C4101: procNum: неиспользованная локальная переменная
D:\App\CProjects\SeqAlgFox\Source.cpp(74,6): warning C4101: rank: неиспользованная локальная переменная
D:\App\CProjects\SeqAlgFox\Source.cpp(74,12): warning C4101: procNum: неиспользованная локальная переменная
SeqAlgFox.vcxproj -> D:\App\CProjects\SeqAlgFox\Debug\SeqAlgFox.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
Debug|Win32|D:\App\CProjects\SeqAlgFox\|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
31 changes: 31 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/SeqAlgFox.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SeqAlgFox", "SeqAlgFox.vcxproj", "{633A160D-96F2-4DD2-8654-E4731DC771DC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Debug|x64.ActiveCfg = Debug|x64
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Debug|x64.Build.0 = Debug|x64
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Debug|x86.ActiveCfg = Debug|Win32
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Debug|x86.Build.0 = Debug|Win32
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Release|x64.ActiveCfg = Release|x64
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Release|x64.Build.0 = Release|x64
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Release|x86.ActiveCfg = Release|Win32
{633A160D-96F2-4DD2-8654-E4731DC771DC}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AEB3D1B8-09CA-423E-9F17-809549113563}
EndGlobalSection
EndGlobal
146 changes: 146 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/SeqAlgFox.vcxproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{633A160D-96F2-4DD2-8654-E4731DC771DC}</ProjectGuid>
<RootNamespace>SeqAlgFox</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<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>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Source.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
22 changes: 22 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/SeqAlgFox.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Исходные файлы">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Файлы заголовков">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
</Filter>
<Filter Include="Файлы ресурсов">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Source.cpp">
<Filter>Файлы ресурсов</Filter>
</ClCompile>
</ItemGroup>
</Project>
4 changes: 4 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/SeqAlgFox.vcxproj.user
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
83 changes: 83 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/Source.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
#include <stdio.h>
#include <stdlib.h>
#include <conio.h>
#include <iostream>
#include <cmath>
#include <ctime>
#include <random>
#include <stdexcept>


using namespace std;

void PrintMatrix(double* matrix, int N) {

int M = N;
for (int i = 0; i < N; i++) {
for (int j = 0; j < M; j++)
{
cout << matrix[i * M + j] << " ";
for (int k = 0; k < (5 - log10((double)(matrix[i * M + j]))); k++)
cout << " ";

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Странный способ выравнивания при выводе, cout имеет набор стандартных свойств (width, precision и другие), с помощью которых можно выравнивать вывод.

}
cout << endl;
}
cout << endl;
}

void MatrixCreate(double* A, double* B, int size) {
for (int i = 0; i < size * size; ++i) {
A[i] = rand() % 10 + 1;
B[i] = rand() % 10 + 1;
}
}

void Multiplication(double* Ablock, double* Bblock, double* Cblock, int _blockSize)
{
double temp;
for (int i = 0; i < _blockSize; i++)
for (int j = 0; j < _blockSize; j++) {
temp = 0;
for (int k = 0; k < _blockSize; k++)
temp += Ablock[i * _blockSize + k] * Bblock[k * _blockSize + j];
Cblock[i * _blockSize + j] += static_cast<int>(temp * 100) / 100;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не понятно, зачем вам здесь такая странная конструкция static_cast<int>(temp * 100) / 100. Ничего подобного здесь не должно быть.

}
}

void SequentialAlgorithm(double* A, double* B, double* C, int size) {
for (int i = 0; i < size * size; ++i)
C[i] = 0;
Multiplication(A, B, C, size);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Anorak52, у вас в задании явно написано, что необходимо реализовать блочную схему алгоритма умножения, а это классическая схема.

}

int main()
{
int size = 10;
double tmp;
double* A = &tmp;
double* B = &tmp;
double* CSeq = &tmp;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нет смысла в такой инициализации.


A = new double[size * size];
B = new double[size * size];
CSeq = new double[size * size];

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Нигде не освобождается память из-под массивов.


MatrixCreate(A, B, size);

if (size < 30) {
cout << "Matrix A" << endl;
cout << endl;
PrintMatrix(A, size);
cout << "Matrix B" << endl;
cout << endl;
PrintMatrix(B, size);
cout << "---------------------" << endl;
cout << endl;
}

SequentialAlgorithm(A, B, CSeq, size);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Отсутствуют замеры времени.

PrintMatrix(CSeq, size);

}


Binary file not shown.
Binary file not shown.
10 changes: 10 additions & 0 deletions 1706-4/brazhnikov_ea/SequentialFoxAlg/x64/Release/SeqAlgFox.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
 Source.cpp
D:\App\CProjects\SeqAlgFox\Source.cpp(55,6): warning C4101: x: неиспользованная локальная переменная
D:\App\CProjects\SeqAlgFox\Source.cpp(62,6): warning C4101: rank: неиспользованная локальная переменная
D:\App\CProjects\SeqAlgFox\Source.cpp(62,12): warning C4101: procNum: неиспользованная локальная переменная
Создание кода
0 of 15 functions ( 0.0%) were compiled, the rest were copied from previous compilation.
0 functions were new in current compilation
0 functions had inline decision re-evaluated but remain unchanged
Создание кода завершено
SeqAlgFox.vcxproj -> D:\App\CProjects\SeqAlgFox\x64\Release\SeqAlgFox.exe
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
Release|x64|D:\App\CProjects\SeqAlgFox\|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.