Compare commits
3 Commits
ostrovskay
...
ostrovskay
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f75432d5f7 | ||
|
|
6dc434cbf3 | ||
|
|
267ba3b73c |
@@ -1,87 +0,0 @@
|
||||
# Отчет по лабораторной работе №3
|
||||
|
||||
Выполнила студентка гр. ИСЭбд-41 Островская С. Ф.
|
||||
|
||||
## REST API, Gateway и синхронный обмен между микросервисами
|
||||
|
||||
## Создание микросервисов
|
||||
|
||||
1. Создала первый микросервис - `dotnet new web -n worker-1`
|
||||
2. Добавила решение - `dotnet new sln`
|
||||
3. Связала решение и проект - `dotnet sln worker-1.sln add worker-1.csproj`
|
||||
4. Для второго микросервиса выполнила пункты 1-3
|
||||
5. Добавила библиотеку Swagger и OpenAi - `dotnet add worker-1.csproj package Swashbuckle.AspNetCore` , `dotnet add worker-1.csproj package Microsoft.AspNetCore.OpenApi`
|
||||
6. Запустила - `dotnet run`
|
||||
|
||||
Скриншоты протестированных микросервисов:
|
||||

|
||||

|
||||
|
||||
## Реализация синхронного обмена
|
||||
|
||||
Код реализации синхронного обмена:
|
||||
|
||||
```cs
|
||||
//Файд Program.cs проекта worker-2
|
||||
app.MapGet("/Requests/", async () =>
|
||||
{
|
||||
var httpClient = new HttpClient();
|
||||
var secondWorkerResponse = await httpClient.GetStringAsync("http://worker-1:8080/");
|
||||
|
||||
return secondWorkerResponse.ToArray();
|
||||
})
|
||||
.WithName("GetRequests")
|
||||
.WithOpenApi();
|
||||
```
|
||||
|
||||
## Реализация gateway при помощи nginx
|
||||
|
||||
Добавила nginx.conf:
|
||||
|
||||
```conf
|
||||
server {
|
||||
listen 8080;
|
||||
listen [::]:8080;
|
||||
server_name localhost;
|
||||
|
||||
location / {
|
||||
root /usr/share/nginx/html;
|
||||
index index.html index.htm;
|
||||
}
|
||||
|
||||
location /worker-1/ {
|
||||
proxy_pass http://worker-1:8080/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Prefix /worker-1;
|
||||
}
|
||||
|
||||
location /worker-2/ {
|
||||
proxy_pass http://worker-2:8080/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Prefix /worker-2;
|
||||
}
|
||||
}
|
||||
|
||||
```
|
||||
|
||||
Результат, после выполнения команды `docker compose up`:
|
||||
|
||||
Docker:
|
||||
|
||||

|
||||
|
||||
index.html на gateway-1:
|
||||
|
||||

|
||||
|
||||
worker-1:
|
||||
|
||||

|
||||
|
||||
worker-2:
|
||||
|
||||

|
||||
@@ -1,15 +0,0 @@
|
||||
version: "3.1"
|
||||
services:
|
||||
worker-1:
|
||||
build: ./worker-1
|
||||
worker-2:
|
||||
build: ./worker-2
|
||||
depends_on:
|
||||
- worker-1
|
||||
gateway:
|
||||
image: nginx:latest
|
||||
ports:
|
||||
- 8080:8080
|
||||
volumes:
|
||||
- ./static:/usr/share/nginx/html:ro
|
||||
- ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
|
||||
@@ -1,26 +0,0 @@
|
||||
server {
|
||||
listen 8080;
|
||||
listen [::]:8080;
|
||||
server_name localhost;
|
||||
|
||||
location / {
|
||||
root /usr/share/nginx/html;
|
||||
index index.html index.htm;
|
||||
}
|
||||
|
||||
location /worker-1/ {
|
||||
proxy_pass http://worker-1:8080/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Prefix /worker-1;
|
||||
}
|
||||
|
||||
location /worker-2/ {
|
||||
proxy_pass http://worker-2:8080/;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_set_header X-Forwarded-Prefix /worker-2;
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 86 KiB |
|
Before Width: | Height: | Size: 84 KiB |
|
Before Width: | Height: | Size: 69 KiB |
|
Before Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 41 KiB |
@@ -1,13 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ru">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>Тестовое приложение для л/р 3</title>
|
||||
</head>
|
||||
<body>
|
||||
<p>Островская Софья Федоровна, группа ИСЭбд-41.</p>
|
||||
<p><a href="/worker-1/">Отправить запрос к worker-1</a></p>
|
||||
<p><a href="/worker-2/">Отправить запрос к worker-2</a></p>
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,11 +0,0 @@
|
||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
|
||||
WORKDIR /app
|
||||
|
||||
COPY . ./
|
||||
RUN dotnet restore
|
||||
RUN dotnet publish -c Release -o out
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0
|
||||
WORKDIR /app
|
||||
COPY --from=build-env /app/out .
|
||||
ENTRYPOINT ["dotnet", "worker-1.dll"]
|
||||
@@ -1,124 +0,0 @@
|
||||
List<Request> requests = new()
|
||||
{
|
||||
new Request() { Uuid= Guid.Parse("a1b5c571-a859-4bb8-9fd2-7431ddd6c464"), Title = "Дополнительное соглашение на расценку", Student = "Иванов Иван Иванович", DateAgreement = new DateTime(2023, 7, 01), AgreementValid = true },
|
||||
new Request() { Uuid= Guid.Parse("53d08f8c-19f5-4028-8e92-520470c8f747"), Title = "Дополнительное соглашение на продление срока проживания", Student = "Петров Петр Петрович", DateAgreement = new DateTime(2023, 5, 01), AgreementValid = false },
|
||||
};
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
app.MapGet("/", () =>
|
||||
{
|
||||
return requests.Select(r => new RequestEntityDto()
|
||||
{
|
||||
Uuid = r.Uuid,
|
||||
Title = r.Title,
|
||||
DateAgreement = r.DateAgreement,
|
||||
Student = r.Student,
|
||||
AgreementValid = r.AgreementValid,
|
||||
});
|
||||
})
|
||||
.WithName("GetRequests")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapGet("/{uuid}", (Guid uuid) =>
|
||||
{
|
||||
var request = requests.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (request == null)
|
||||
return Results.NotFound();
|
||||
return Results.Json(new RequestEntityDto()
|
||||
{
|
||||
Uuid = request.Uuid,
|
||||
Title = request.Title,
|
||||
DateAgreement = request.DateAgreement,
|
||||
Student = request.Student,
|
||||
AgreementValid = request.AgreementValid,
|
||||
});
|
||||
})
|
||||
.WithName("GetRequestByGUID")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapPost("/{title}/{Student}/{DateAgreement}/{AgreementValid}", (string title, string Student, DateTime DateAgreement, bool AgreementValid) =>
|
||||
{
|
||||
Guid NewGuid = Guid.NewGuid();
|
||||
requests.Add(new Request() { Uuid = NewGuid, Title = (string)title, Student = (string)Student, DateAgreement = (DateTime)DateAgreement, AgreementValid = (bool)AgreementValid });
|
||||
|
||||
var request = requests.FirstOrDefault(r => r.Uuid == NewGuid);
|
||||
if (request == null)
|
||||
return Results.NotFound();
|
||||
return Results.Json(new RequestEntityDto()
|
||||
{
|
||||
Uuid = request.Uuid,
|
||||
Title = request.Title,
|
||||
DateAgreement = request.DateAgreement,
|
||||
Student = request.Student,
|
||||
AgreementValid = request.AgreementValid,
|
||||
});
|
||||
})
|
||||
.WithName("PostRequest")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapPatch("/{uuid}/{title}/{Student}/{DateAgreement}/{AgreementValid}", (Guid uuid, string? title, string? Student, DateTime DateAgreement, bool AgreementValid) =>
|
||||
{
|
||||
var request = requests.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (request == null)
|
||||
return Results.NotFound();
|
||||
if (title != null) request.Title = title;
|
||||
if (Student != ",") request.Student = Student;
|
||||
if (DateAgreement != request.DateAgreement) request.DateAgreement = DateAgreement;
|
||||
if (AgreementValid != request.AgreementValid) request.AgreementValid = AgreementValid;
|
||||
|
||||
return Results.Json(new RequestEntityDto()
|
||||
{
|
||||
Uuid = request.Uuid,
|
||||
Title = request.Title,
|
||||
DateAgreement = request.DateAgreement,
|
||||
Student = request.Student,
|
||||
AgreementValid = request.AgreementValid,
|
||||
});
|
||||
})
|
||||
.WithName("UpdateRequest")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapDelete("/{uuid}", (Guid uuid) =>
|
||||
{
|
||||
var request = requests.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (request == null)
|
||||
return Results.NotFound();
|
||||
requests.Remove(request);
|
||||
return Results.Json(new RequestEntityDto()
|
||||
{
|
||||
Uuid = request.Uuid,
|
||||
Title = request.Title,
|
||||
DateAgreement = request.DateAgreement,
|
||||
Student = request.Student,
|
||||
AgreementValid = request.AgreementValid,
|
||||
});
|
||||
})
|
||||
.WithName("DeleteRequestByGUID")
|
||||
.WithOpenApi();
|
||||
|
||||
app.Run();
|
||||
|
||||
public class Request
|
||||
{
|
||||
public Guid Uuid { get; set; }
|
||||
public string Title { get; set; } = string.Empty;
|
||||
public string Student { get; set; } = string.Empty;
|
||||
public DateTime DateAgreement { get; set; }
|
||||
public bool AgreementValid { get; set; }
|
||||
}
|
||||
|
||||
public class RequestEntityDto : Request { }
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:19149",
|
||||
"sslPort": 44373
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"http": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"applicationUrl": "http://localhost:5193",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"https": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"applicationUrl": "https://localhost:7248;http://localhost:5193",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>worker_1</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,22 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.0.31903.59
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-1", "worker-1.csproj", "{025ED07B-DD93-4AEF-81BA-60F1FF536EA3}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{025ED07B-DD93-4AEF-81BA-60F1FF536EA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{025ED07B-DD93-4AEF-81BA-60F1FF536EA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{025ED07B-DD93-4AEF-81BA-60F1FF536EA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{025ED07B-DD93-4AEF-81BA-60F1FF536EA3}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -1,11 +0,0 @@
|
||||
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
|
||||
WORKDIR /app
|
||||
|
||||
COPY . ./
|
||||
RUN dotnet restore
|
||||
RUN dotnet publish -c Release -o out
|
||||
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:8.0
|
||||
WORKDIR /app
|
||||
COPY --from=build-env /app/out .
|
||||
ENTRYPOINT ["dotnet", "worker-2.dll"]
|
||||
@@ -1,133 +0,0 @@
|
||||
|
||||
using System.Diagnostics.Contracts;
|
||||
|
||||
List<Contract> agrs = new()
|
||||
{
|
||||
new Contract() { Uuid= Guid.NewGuid(), Number = "Договор №655/55 от 01.07.2023", IdRequest = Guid.Parse("a1b5c571-a859-4bb8-9fd2-7431ddd6c464") }
|
||||
};
|
||||
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
if (app.Environment.IsDevelopment())
|
||||
{
|
||||
app.UseSwagger();
|
||||
app.UseSwaggerUI();
|
||||
}
|
||||
|
||||
app.UseHttpsRedirection();
|
||||
|
||||
app.MapGet("/", () =>
|
||||
{
|
||||
return agrs.Select(r => new ContractEntityDto()
|
||||
{
|
||||
Uuid = r.Uuid,
|
||||
Number = r.Number,
|
||||
IdRequest = r.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("GetAgreements")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapGet("/{uuid}", (Guid uuid) =>
|
||||
{
|
||||
var agr = agrs.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (agr == null)
|
||||
return Results.NotFound();
|
||||
return Results.Json(new ContractEntityDto()
|
||||
{
|
||||
Uuid = agr.Uuid,
|
||||
Number = agr.Number,
|
||||
IdRequest = agr.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("GetAgreementByGUID")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapPost("/{number}/{idRequest}", (string? number, Guid idRequest) =>
|
||||
{
|
||||
Guid NewGuid = Guid.NewGuid();
|
||||
agrs.Add(new Contract() { Uuid = NewGuid, Number = (string)number, IdRequest = (Guid)idRequest });
|
||||
|
||||
var agr = agrs.FirstOrDefault(r => r.Uuid == NewGuid);
|
||||
if (agr == null)
|
||||
return Results.NotFound();
|
||||
return Results.Json(new ContractEntityDto()
|
||||
{
|
||||
Uuid = agr.Uuid,
|
||||
Number = agr.Number,
|
||||
IdRequest = agr.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("PostAgreement")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapPatch("/{uuid}/{number}/{idRequest}", (Guid uuid, string? number, Guid idRequest) =>
|
||||
{
|
||||
var agr = agrs.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (agr == null)
|
||||
return Results.NotFound();
|
||||
if (number != ",") agr.Number = number;
|
||||
if (idRequest != agr.IdRequest) agr.IdRequest = idRequest;
|
||||
|
||||
return Results.Json(new ContractEntityDto()
|
||||
{
|
||||
Uuid = agr.Uuid,
|
||||
Number = agr.Number,
|
||||
IdRequest = agr.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("UpdateAgreement")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapDelete("/{uuid}", (Guid uuid) =>
|
||||
{
|
||||
var agr = agrs.FirstOrDefault(r => r.Uuid == uuid);
|
||||
if (agr == null)
|
||||
return Results.NotFound();
|
||||
agrs.Remove(agr);
|
||||
return Results.Json(new ContractEntityDto()
|
||||
{
|
||||
Uuid = agr.Uuid,
|
||||
Number = agr.Number,
|
||||
IdRequest = agr.IdRequest,
|
||||
});
|
||||
})
|
||||
.WithName("DeleteAgreement")
|
||||
.WithOpenApi();
|
||||
|
||||
app.MapGet("/Requests/", async () =>
|
||||
{
|
||||
var httpClient = new HttpClient();
|
||||
var secondWorkerResponse = await httpClient.GetStringAsync("http://worker-1:8080/");
|
||||
|
||||
return secondWorkerResponse.ToArray();
|
||||
})
|
||||
.WithName("GetRequests")
|
||||
.WithOpenApi();
|
||||
|
||||
app.Run();
|
||||
|
||||
public class Contract
|
||||
{
|
||||
public Guid Uuid { get; set; }
|
||||
public string Number { get; set; } = string.Empty;
|
||||
public Guid IdRequest { get; set; }
|
||||
}
|
||||
|
||||
public class ContractEntityDto : Contract { }
|
||||
|
||||
public class Request
|
||||
{
|
||||
public Guid Uuid { get; set; }
|
||||
public string Title { get; set; } = string.Empty;
|
||||
public string Student { get; set; } = string.Empty;
|
||||
public DateTime DateAgreement { get; set; }
|
||||
public bool AgreementValid { get; set; }
|
||||
}
|
||||
|
||||
public class RequestEntityDto : Request { }
|
||||
@@ -1,38 +0,0 @@
|
||||
{
|
||||
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:4895",
|
||||
"sslPort": 44369
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"http": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"applicationUrl": "http://localhost:5229",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"https": {
|
||||
"commandName": "Project",
|
||||
"dotnetRunMessages": true,
|
||||
"launchBrowser": true,
|
||||
"applicationUrl": "https://localhost:7256;http://localhost:5229",
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
},
|
||||
"IIS Express": {
|
||||
"commandName": "IISExpress",
|
||||
"launchBrowser": true,
|
||||
"environmentVariables": {
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"Logging": {
|
||||
"LogLevel": {
|
||||
"Default": "Information",
|
||||
"Microsoft.AspNetCore": "Warning"
|
||||
}
|
||||
},
|
||||
"AllowedHosts": "*"
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<RootNamespace>worker_2</RootNamespace>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
@@ -1,22 +0,0 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.0.31903.59
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-2", "worker-2.csproj", "{B1A3FA28-4BDF-4928-98BD-2B103E12C437}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{B1A3FA28-4BDF-4928-98BD-2B103E12C437}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{B1A3FA28-4BDF-4928-98BD-2B103E12C437}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{B1A3FA28-4BDF-4928-98BD-2B103E12C437}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{B1A3FA28-4BDF-4928-98BD-2B103E12C437}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
66
tasks/ostrovskaya-sf/lab_6/README.md
Normal file
@@ -0,0 +1,66 @@
|
||||
# Отчет по лабораторной работе №6
|
||||
|
||||
Выполнила студентка гр. ИСЭбд-41 Островская С. Ф.
|
||||
|
||||
## Создание приложения
|
||||
|
||||
Было выбрано консольное приложение, язык программирования - c#.
|
||||
|
||||
Обычный алгоритм:
|
||||
|
||||
```cs
|
||||
static void SequentialDeterminantCalculation(int matrixSize, int lowerLimit, int upperLimit)
|
||||
{
|
||||
int[][] randomMatrix = GenerateRandomMatrix(matrixSize, lowerLimit, upperLimit);
|
||||
|
||||
Stopwatch stopwatch = new Stopwatch();
|
||||
stopwatch.Start();
|
||||
int result = Determinant(randomMatrix);
|
||||
stopwatch.Stop();
|
||||
TimeSpan elapsedTime = stopwatch.Elapsed;
|
||||
Console.WriteLine($"Последовательный детерминант: {result}");
|
||||
Console.WriteLine($"Последовательное время: {elapsedTime.TotalSeconds:F7} секунд");
|
||||
}
|
||||
```
|
||||
Параллельный алгоритм:
|
||||
|
||||
```cs
|
||||
static void ParallelDeterminantCalculation(int matrixSize, int lowerLimit, int upperLimit, int numProcesses)
|
||||
{
|
||||
int[][] randomMatrix = GenerateRandomMatrix(matrixSize, lowerLimit, upperLimit);
|
||||
|
||||
int[][] matricesToProcess = new int[matrixSize][];
|
||||
for (int col = 0; col < matrixSize; col++)
|
||||
{
|
||||
matricesToProcess[col] = Submatrix(randomMatrix, 0, col)[0];
|
||||
}
|
||||
|
||||
Stopwatch stopwatch = new Stopwatch();
|
||||
stopwatch.Start();
|
||||
int[] determinants = new int[matrixSize];
|
||||
Parallel.For(0, matrixSize, new ParallelOptions { MaxDegreeOfParallelism = numProcesses }, col =>
|
||||
{
|
||||
determinants[col] = Determinant(new int[][] { matricesToProcess[col] });
|
||||
});
|
||||
|
||||
int result = 0;
|
||||
for (int col = 0; col < matrixSize; col++)
|
||||
{
|
||||
result += ((-1) * col) * randomMatrix[0][col] * determinants[col];
|
||||
}
|
||||
stopwatch.Stop();
|
||||
TimeSpan elapsedTime = stopwatch.Elapsed;
|
||||
Console.WriteLine($"Параллельный детерминант: {result}");
|
||||
Console.WriteLine($"Параллельное время: {elapsedTime.TotalSeconds:F7} секунд");
|
||||
}
|
||||
```
|
||||
|
||||
## Бенчмарки
|
||||
|
||||
Для примера была взята матрица размерностью 10х10, поскольку для матриц больших размеров детерминант вычисляется слишком долго.
|
||||
|
||||
|
||||

|
||||
|
||||
|
||||
``Вывод``: Обыный алгоритм работает быстрее, если количество элементов не слишком много. Параллельный же алгоритм работает быстрее только при наличии большого количества операций и данных.
|
||||
25
tasks/ostrovskaya-sf/lab_6/lab_6_matrix/lab_6_matrix.sln
Normal file
@@ -0,0 +1,25 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.8.34330.188
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "lab_6_matrix", "lab_6_matrix\lab_6_matrix.csproj", "{50F84649-668E-464D-94A9-7C36E1FCB2FF}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{50F84649-668E-464D-94A9-7C36E1FCB2FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{50F84649-668E-464D-94A9-7C36E1FCB2FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{50F84649-668E-464D-94A9-7C36E1FCB2FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{50F84649-668E-464D-94A9-7C36E1FCB2FF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {45DFA84B-6962-4667-98B3-13BD962CF727}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
135
tasks/ostrovskaya-sf/lab_6/lab_6_matrix/lab_6_matrix/Program.cs
Normal file
@@ -0,0 +1,135 @@
|
||||
using System;
|
||||
using System.Diagnostics;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
class Program
|
||||
{
|
||||
static void SequentialDeterminantCalculation(int matrixSize, int lowerLimit, int upperLimit)
|
||||
{
|
||||
int[][] randomMatrix = GenerateRandomMatrix(matrixSize, lowerLimit, upperLimit);
|
||||
|
||||
Stopwatch stopwatch = new Stopwatch();
|
||||
stopwatch.Start();
|
||||
int result = Determinant(randomMatrix);
|
||||
stopwatch.Stop();
|
||||
TimeSpan elapsedTime = stopwatch.Elapsed;
|
||||
Console.WriteLine($"Последовательный детерминант: {result}");
|
||||
Console.WriteLine($"Последовательное время: {elapsedTime.TotalSeconds:F7} секунд");
|
||||
}
|
||||
|
||||
static void ParallelDeterminantCalculation(int matrixSize, int lowerLimit, int upperLimit, int numProcesses)
|
||||
{
|
||||
int[][] randomMatrix = GenerateRandomMatrix(matrixSize, lowerLimit, upperLimit);
|
||||
|
||||
int[][] matricesToProcess = new int[matrixSize][];
|
||||
for (int col = 0; col < matrixSize; col++)
|
||||
{
|
||||
matricesToProcess[col] = Submatrix(randomMatrix, 0, col)[0];
|
||||
}
|
||||
|
||||
Stopwatch stopwatch = new Stopwatch();
|
||||
stopwatch.Start();
|
||||
int[] determinants = new int[matrixSize];
|
||||
Parallel.For(0, matrixSize, new ParallelOptions { MaxDegreeOfParallelism = numProcesses }, col =>
|
||||
{
|
||||
determinants[col] = Determinant(new int[][] { matricesToProcess[col] });
|
||||
});
|
||||
|
||||
int result = 0;
|
||||
for (int col = 0; col < matrixSize; col++)
|
||||
{
|
||||
result += ((-1) * col) * randomMatrix[0][col] * determinants[col];
|
||||
}
|
||||
stopwatch.Stop();
|
||||
TimeSpan elapsedTime = stopwatch.Elapsed;
|
||||
Console.WriteLine($"Параллельный детерминант: {result}");
|
||||
Console.WriteLine($"Параллельное время: {elapsedTime.TotalSeconds:F7} секунд");
|
||||
}
|
||||
|
||||
static int[][] GenerateRandomMatrix(int matrixSize, int lowerLimit, int upperLimit)
|
||||
{
|
||||
Random random = new Random();
|
||||
int[][] matrix = new int[matrixSize][];
|
||||
|
||||
for (int i = 0; i < matrixSize; i++)
|
||||
{
|
||||
matrix[i] = new int[matrixSize];
|
||||
for (int j = 0; j < matrixSize; j++)
|
||||
{
|
||||
matrix[i][j] = random.Next(lowerLimit, upperLimit);
|
||||
}
|
||||
}
|
||||
|
||||
return matrix;
|
||||
}
|
||||
|
||||
static int[][] Submatrix(int[][] matrix, int rowToDelete, int colToDelete)
|
||||
{
|
||||
int size = matrix.Length - 1;
|
||||
int[][] submatrix = new int[size][];
|
||||
|
||||
int rowIndex = 0;
|
||||
|
||||
for (int i = 0; i < matrix.Length; i++)
|
||||
{
|
||||
if (i == rowToDelete)
|
||||
continue;
|
||||
|
||||
submatrix[rowIndex] = new int[size];
|
||||
|
||||
int colIndex = 0;
|
||||
for (int j = 0; j < matrix.Length; j++)
|
||||
{
|
||||
if (j == colToDelete)
|
||||
continue;
|
||||
|
||||
submatrix[rowIndex][colIndex] = matrix[i][j];
|
||||
colIndex++;
|
||||
}
|
||||
|
||||
rowIndex++;
|
||||
}
|
||||
|
||||
return submatrix;
|
||||
}
|
||||
|
||||
static int Determinant(int[][] matrix)
|
||||
{
|
||||
int n = matrix.Length;
|
||||
if (n == 1)
|
||||
{
|
||||
return matrix[0][0];
|
||||
}
|
||||
else if (n == 2)
|
||||
{
|
||||
return matrix[0][0] * matrix[1][1] - matrix[0][1] * matrix[1][0];
|
||||
}
|
||||
else
|
||||
{
|
||||
int determinant = 0;
|
||||
|
||||
for (int j = 0; j < n; j++)
|
||||
{
|
||||
int[][] submatrix = Submatrix(matrix, 0, j);
|
||||
int subDeterminant = Determinant(submatrix);
|
||||
determinant += ((-1) * j) * matrix[0][j] * subDeterminant;
|
||||
}
|
||||
|
||||
return determinant;
|
||||
}
|
||||
}
|
||||
|
||||
static void Main(string[] args)
|
||||
{
|
||||
SequentialDeterminantCalculation(10, 0, 10);
|
||||
Console.WriteLine();
|
||||
|
||||
int[] numThreads = { 1, 2, 4, 6, 8, 12, 16, 32 };
|
||||
|
||||
for (int i = 0; i < 8; i++)
|
||||
{
|
||||
Console.WriteLine($"Количество потоков: {numThreads[i]}");
|
||||
ParallelDeterminantCalculation(10, 0, 10, numThreads[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk">
|
||||
|
||||
<PropertyGroup>
|
||||
<OutputType>Exe</OutputType>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
</PropertyGroup>
|
||||
|
||||
</Project>
|
||||
BIN
tasks/ostrovskaya-sf/lab_6/pic/pic1.jpg
Normal file
|
After Width: | Height: | Size: 82 KiB |