forked from v.moiseev/distributed-computing
Compare commits
4 Commits
dunaev-oi-
...
dunaev-oi-
| Author | SHA1 | Date | |
|---|---|---|---|
| a0adf05443 | |||
| fc694e32d5 | |||
| 57ba19a35a | |||
| 3fdbc64151 |
@@ -481,4 +481,4 @@ $RECYCLE.BIN/
|
|||||||
*.lnk
|
*.lnk
|
||||||
|
|
||||||
# Vim temporary swap files
|
# Vim temporary swap files
|
||||||
*.swp
|
*.swp
|
||||||
80
tasks/dunaev-oi/lab3/README.md
Normal file
80
tasks/dunaev-oi/lab3/README.md
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
# Отчет по лабораторной работе №3
|
||||||
|
|
||||||
|
Выполнил студент гр. ИСЭбд-41 Дунаев О.И.
|
||||||
|
|
||||||
|
## REST API, Gateway и синхронный обмен между микросервисами
|
||||||
|
|
||||||
|
## Создание микросервисов
|
||||||
|
|
||||||
|
1. С помощью команды `dotnet new web -n worker-2` в терминале создал первый микросервис.
|
||||||
|
2. Добавил решение командой `dotnet new sln`
|
||||||
|
3. Связал решение и проект командой `dotnet sln worker-2.sln add worker-2.csproj`
|
||||||
|
4. Повторил действие для второго микросервиса
|
||||||
|
5. Добавил библиотеку Swagger и OpenAi в проекты и запустил с помощью команды `dotnet run`
|
||||||
|
|
||||||
|
Скриншоты протестированных микросервисов:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## Реализация синхронного обмена
|
||||||
|
|
||||||
|
Реализовал код, который вызывает сихронно данные из соседнего микросервиса.
|
||||||
|
|
||||||
|
```cs
|
||||||
|
//worker-2
|
||||||
|
app.MapGet("/Locations/", async () =>
|
||||||
|
{
|
||||||
|
var httpClient = new HttpClient();
|
||||||
|
var secondWorkerResponse = await httpClient.GetStringAsync("http://worker-1:8080/");
|
||||||
|
|
||||||
|
return secondWorkerResponse.ToArray();
|
||||||
|
})
|
||||||
|
.WithName("GetBreeds")
|
||||||
|
.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:
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
15
tasks/dunaev-oi/lab3/docker-compose.yml
Normal file
15
tasks/dunaev-oi/lab3/docker-compose.yml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
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
|
||||||
26
tasks/dunaev-oi/lab3/nginx.conf
Normal file
26
tasks/dunaev-oi/lab3/nginx.conf
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
tasks/dunaev-oi/lab3/pic/1.png
Normal file
BIN
tasks/dunaev-oi/lab3/pic/1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
BIN
tasks/dunaev-oi/lab3/pic/2.png
Normal file
BIN
tasks/dunaev-oi/lab3/pic/2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 46 KiB |
BIN
tasks/dunaev-oi/lab3/pic/3.png
Normal file
BIN
tasks/dunaev-oi/lab3/pic/3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
BIN
tasks/dunaev-oi/lab3/pic/4.png
Normal file
BIN
tasks/dunaev-oi/lab3/pic/4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
BIN
tasks/dunaev-oi/lab3/pic/5.png
Normal file
BIN
tasks/dunaev-oi/lab3/pic/5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
13
tasks/dunaev-oi/lab3/static/index.html
Normal file
13
tasks/dunaev-oi/lab3/static/index.html
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
<!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>
|
||||||
11
tasks/dunaev-oi/lab3/worker-1/Dockerfile
Normal file
11
tasks/dunaev-oi/lab3/worker-1/Dockerfile
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY . ./
|
||||||
|
RUN dotnet restore
|
||||||
|
RUN dotnet publish -c Release -o out
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/aspnet:7.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build-env /app/out .
|
||||||
|
ENTRYPOINT ["dotnet", "worker-1.dll"]
|
||||||
112
tasks/dunaev-oi/lab3/worker-1/Program.cs
Normal file
112
tasks/dunaev-oi/lab3/worker-1/Program.cs
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
|
||||||
|
List<Pets> pets = new()
|
||||||
|
{
|
||||||
|
new Pets() { Uuid= Guid.Parse("6a1b4a72-5669-41fe-8d5b-106dc86f58bd"), Animals = "Кот", Breed = "Бигль"},
|
||||||
|
new Pets() { Uuid= Guid.Parse("464bbdb8-39c0-4644-b9c0-3df1c484ea7e"), Animals = "Собака", Breed = "Мейн-Кун"},
|
||||||
|
new Pets() { Uuid= Guid.Parse("f8692bea-b7e6-4164-b564-a921f16c35c9"), Animals = "Хомяк", Breed = "Лемминг"},
|
||||||
|
};
|
||||||
|
|
||||||
|
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 pets.Select(r => new PetEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = r.Uuid,
|
||||||
|
Animals = r.Animals,
|
||||||
|
Breed = r.Breed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("GetPets")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapGet("/{uuid}", (Guid uuid) =>
|
||||||
|
{
|
||||||
|
var pet = pets.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (pet == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
return Results.Json(new PetEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = pet.Uuid,
|
||||||
|
Animals = pet.Animals,
|
||||||
|
Breed = pet.Breed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("GetPetByGUID")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPost("/{animals}/{breed}", (string Animals, string Breed) =>
|
||||||
|
{
|
||||||
|
Guid NewGuid = Guid.NewGuid();
|
||||||
|
pets.Add(new Pets() { Uuid = NewGuid, Animals = (string)Animals, Breed = (string)Breed});
|
||||||
|
|
||||||
|
var pet = pets.FirstOrDefault(r => r.Uuid == NewGuid);
|
||||||
|
if (pet == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
return Results.Json(new PetEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = pet.Uuid,
|
||||||
|
Animals = pet.Animals,
|
||||||
|
Breed = pet.Breed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("PostPet")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPatch("/{uuid}/{animals}/{breed}", (Guid uuid, string ?animals, string ?breed) =>
|
||||||
|
{
|
||||||
|
var pet = pets.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (pet == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
if (animals != null) pet.Animals = animals;
|
||||||
|
if (breed != null) pet.Breed = breed;
|
||||||
|
|
||||||
|
return Results.Json(new PetEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = pet.Uuid,
|
||||||
|
Animals = pet.Animals,
|
||||||
|
Breed = pet.Breed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("UpdatePet")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapDelete("/{uuid}", (Guid uuid) =>
|
||||||
|
{
|
||||||
|
var pet = pets.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (pet == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
pets.Remove(pet);
|
||||||
|
return Results.Json(new PetEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = pet.Uuid,
|
||||||
|
Animals = pet.Animals,
|
||||||
|
Breed = pet.Breed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("DeletePetByGUID")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.Run();
|
||||||
|
|
||||||
|
public class Pets
|
||||||
|
{
|
||||||
|
public Guid Uuid { get; set; }
|
||||||
|
public string Animals { get; set; } = string.Empty;
|
||||||
|
public string Breed { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class PetEntityDto : Pets { }
|
||||||
38
tasks/dunaev-oi/lab3/worker-1/Properties/launchSettings.json
Normal file
38
tasks/dunaev-oi/lab3/worker-1/Properties/launchSettings.json
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
{
|
||||||
|
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||||
|
"iisSettings": {
|
||||||
|
"windowsAuthentication": false,
|
||||||
|
"anonymousAuthentication": true,
|
||||||
|
"iisExpress": {
|
||||||
|
"applicationUrl": "http://localhost:51956",
|
||||||
|
"sslPort": 44303
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"profiles": {
|
||||||
|
"http": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"applicationUrl": "http://localhost:5197",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"https": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"applicationUrl": "https://localhost:7027;http://localhost:5197",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"IIS Express": {
|
||||||
|
"commandName": "IISExpress",
|
||||||
|
"launchBrowser": true,
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
9
tasks/dunaev-oi/lab3/worker-1/appsettings.json
Normal file
9
tasks/dunaev-oi/lab3/worker-1/appsettings.json
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
||||||
15
tasks/dunaev-oi/lab3/worker-1/worker-1.csproj
Normal file
15
tasks/dunaev-oi/lab3/worker-1/worker-1.csproj
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<RootNamespace>worker_1</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -1,25 +1,22 @@
|
|||||||
|
|
||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 17.3.32811.315
|
VisualStudioVersion = 17.0.31903.59
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RVIP_Lab5", "RVIP_Lab5.csproj", "{1DB0461C-8F6E-4BE5-B697-09C4F10570BF}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "worker-1", "worker-1.csproj", "{90F6C7BD-78E2-47C8-A702-DD47E74D3865}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
Release|Any CPU = Release|Any CPU
|
Release|Any CPU = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
|
||||||
{1DB0461C-8F6E-4BE5-B697-09C4F10570BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{1DB0461C-8F6E-4BE5-B697-09C4F10570BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{1DB0461C-8F6E-4BE5-B697-09C4F10570BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{1DB0461C-8F6E-4BE5-B697-09C4F10570BF}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
SolutionGuid = {7B6008C5-2210-4BAA-B61A-F6C7D82930FA}
|
{90F6C7BD-78E2-47C8-A702-DD47E74D3865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{90F6C7BD-78E2-47C8-A702-DD47E74D3865}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{90F6C7BD-78E2-47C8-A702-DD47E74D3865}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{90F6C7BD-78E2-47C8-A702-DD47E74D3865}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
EndGlobal
|
EndGlobal
|
||||||
11
tasks/dunaev-oi/lab3/worker-2/Dockerfile
Normal file
11
tasks/dunaev-oi/lab3/worker-2/Dockerfile
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build-env
|
||||||
|
WORKDIR /app
|
||||||
|
|
||||||
|
COPY . ./
|
||||||
|
RUN dotnet restore
|
||||||
|
RUN dotnet publish -c Release -o out
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/aspnet:7.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build-env /app/out .
|
||||||
|
ENTRYPOINT ["dotnet", "worker-2.dll"]
|
||||||
139
tasks/dunaev-oi/lab3/worker-2/Program.cs
Normal file
139
tasks/dunaev-oi/lab3/worker-2/Program.cs
Normal file
@@ -0,0 +1,139 @@
|
|||||||
|
|
||||||
|
List<Location> locations = new()
|
||||||
|
{
|
||||||
|
new Location() { Uuid= Guid.NewGuid(), Habitat = "Америка", IsSingleLocation = true, IdBreed = Guid.Parse("6a1b4a72-5669-41fe-8d5b-106dc86f58bd") },
|
||||||
|
new Location() { Uuid= Guid.NewGuid(), Habitat = "Россия", IsSingleLocation = false, IdBreed = Guid.Parse("f8692bea-b7e6-4164-b564-a921f16c35c9") },
|
||||||
|
new Location() { Uuid= Guid.NewGuid(), Habitat = "Китай", IsSingleLocation = false, IdBreed = Guid.Parse("464bbdb8-39c0-4644-b9c0-3df1c484ea7e") },
|
||||||
|
new Location() { Uuid= Guid.NewGuid(), Habitat = "Хорватия", IsSingleLocation = true, IdBreed = Guid.Parse("464bbdb8-39c0-4644-b9c0-3df1c484ea7e") },
|
||||||
|
};
|
||||||
|
|
||||||
|
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 locations.Select(r => new LocationEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = r.Uuid,
|
||||||
|
Habitat = r.Habitat,
|
||||||
|
IsSingleLocation = r.IsSingleLocation,
|
||||||
|
IdBreed = r.IdBreed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("GetLocations")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapGet("/{uuid}", (Guid uuid) =>
|
||||||
|
{
|
||||||
|
var location = locations.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (location == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
return Results.Json(new LocationEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = location.Uuid,
|
||||||
|
Habitat = location.Habitat,
|
||||||
|
IsSingleLocation = location.IsSingleLocation,
|
||||||
|
IdBreed = location.IdBreed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("GetLocationByGUID")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPost("/{habitat}/{isSingleLocation}/{idBreed}", (string? Habitat, bool IsSingleLocation, Guid IdBreed) =>
|
||||||
|
{
|
||||||
|
Guid NewGuid = Guid.NewGuid();
|
||||||
|
locations.Add(new Location() { Uuid = NewGuid, Habitat = (string)Habitat, IsSingleLocation = (bool)IsSingleLocation, IdBreed = (Guid)IdBreed });
|
||||||
|
|
||||||
|
var location = locations.FirstOrDefault(r => r.Uuid == NewGuid);
|
||||||
|
if (location == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
return Results.Json(new LocationEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = location.Uuid,
|
||||||
|
Habitat = location.Habitat,
|
||||||
|
IsSingleLocation = location.IsSingleLocation,
|
||||||
|
IdBreed = location.IdBreed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("PostLocation")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapPatch("/{uuid}/{habitat}/{isSingleLocation}/{idBreed}", (Guid uuid, string ?habitat, bool isSingleLocation, Guid idBreed) =>
|
||||||
|
{
|
||||||
|
var location = locations.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (location == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
if (habitat != ",") location.Habitat = habitat;
|
||||||
|
if (isSingleLocation != location.IsSingleLocation) location.IsSingleLocation = isSingleLocation;
|
||||||
|
if (idBreed != location.IdBreed) location.IdBreed = idBreed;
|
||||||
|
|
||||||
|
return Results.Json(new LocationEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = location.Uuid,
|
||||||
|
Habitat = location.Habitat,
|
||||||
|
IsSingleLocation = location.IsSingleLocation,
|
||||||
|
IdBreed = location.IdBreed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("UpdateLocation")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapDelete("/{uuid}", (Guid uuid) =>
|
||||||
|
{
|
||||||
|
var location = locations.FirstOrDefault(r => r.Uuid == uuid);
|
||||||
|
if (location == null)
|
||||||
|
return Results.NotFound();
|
||||||
|
locations.Remove(location);
|
||||||
|
return Results.Json(new LocationEntityDto()
|
||||||
|
{
|
||||||
|
Uuid = location.Uuid,
|
||||||
|
Habitat = location.Habitat,
|
||||||
|
IsSingleLocation = location.IsSingleLocation,
|
||||||
|
IdBreed = location.IdBreed,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.WithName("DeleteLocation")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.MapGet("/Locations/", async () =>
|
||||||
|
{
|
||||||
|
var httpClient = new HttpClient();
|
||||||
|
var secondWorkerResponse = await httpClient.GetStringAsync("http://worker-1:8080/");
|
||||||
|
|
||||||
|
return secondWorkerResponse.ToArray();
|
||||||
|
})
|
||||||
|
.WithName("GetBreeds")
|
||||||
|
.WithOpenApi();
|
||||||
|
|
||||||
|
app.Run();
|
||||||
|
|
||||||
|
public class Location
|
||||||
|
{
|
||||||
|
public Guid Uuid { get; set; }
|
||||||
|
public string Habitat { get; set; } = string.Empty;
|
||||||
|
public bool IsSingleLocation { get; set; }
|
||||||
|
public Guid IdBreed { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class LocationEntityDto : Location { }
|
||||||
|
|
||||||
|
public class Breeds
|
||||||
|
{
|
||||||
|
public Guid Uuid { get; set; }
|
||||||
|
public string Animals { get; set; } = string.Empty;
|
||||||
|
public string Breed { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BreedEntityDto : Breeds { }
|
||||||
38
tasks/dunaev-oi/lab3/worker-2/Properties/launchSettings.json
Normal file
38
tasks/dunaev-oi/lab3/worker-2/Properties/launchSettings.json
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
{
|
||||||
|
"$schema": "http://json.schemastore.org/launchsettings.json",
|
||||||
|
"iisSettings": {
|
||||||
|
"windowsAuthentication": false,
|
||||||
|
"anonymousAuthentication": true,
|
||||||
|
"iisExpress": {
|
||||||
|
"applicationUrl": "http://localhost:36404",
|
||||||
|
"sslPort": 44384
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"profiles": {
|
||||||
|
"http": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"applicationUrl": "http://localhost:5101",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"https": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"applicationUrl": "https://localhost:7125;http://localhost:5101",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"IIS Express": {
|
||||||
|
"commandName": "IISExpress",
|
||||||
|
"launchBrowser": true,
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
9
tasks/dunaev-oi/lab3/worker-2/appsettings.json
Normal file
9
tasks/dunaev-oi/lab3/worker-2/appsettings.json
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
||||||
15
tasks/dunaev-oi/lab3/worker-2/worker-2.csproj
Normal file
15
tasks/dunaev-oi/lab3/worker-2/worker-2.csproj
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<RootNamespace>worker_2</RootNamespace>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
|
||||||
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
22
tasks/dunaev-oi/lab3/worker-2/worker-2.sln
Normal file
22
tasks/dunaev-oi/lab3/worker-2/worker-2.sln
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
|
||||||
|
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", "{C9D63524-2C63-4E86-91B6-D86955CFA5F8}"
|
||||||
|
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
|
||||||
|
{C9D63524-2C63-4E86-91B6-D86955CFA5F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{C9D63524-2C63-4E86-91B6-D86955CFA5F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{C9D63524-2C63-4E86-91B6-D86955CFA5F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{C9D63524-2C63-4E86-91B6-D86955CFA5F8}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
# Отчет по лабораторной работе №5
|
|
||||||
|
|
||||||
Выполнил студент гр. ИСЭбд-41 Дунаев О.И.
|
|
||||||
|
|
||||||
## Создание приложения
|
|
||||||
|
|
||||||
Выбрал язык C#, Windows Forms.
|
|
||||||
|
|
||||||
Приложение имеет три текстовых поля, в которых можно через пробел вносить элементы матрицы. В матрицы-множители значения можно сгенерировать внутри программы. Размерность можно регулировать от 2 до 1000 в специальном поле. При необходимости можно очистить все матрицы. Также есть флажок выключения вывода значений матриц в текстовые поля, т.к. это занимает слишком много времени. Количество потоков в параллельном алгоритме регулируется в соответствующем поле.
|
|
||||||
|
|
||||||
Попробуем запустить обычный и паралелльный алгоритмы на матрицах 10х10 и зафиксировать результат выполнения по времени.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
## Бенчмарки
|
|
||||||
|
|
||||||
Протестируем обычный и параллельный алгоритм матрицах 100х100, 300х300 и 500х500.
|
|
||||||
Сверху отображен результат обычного алгоритма, снизу паралелльного.
|
|
||||||
|
|
||||||
Матрицы 100х100
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Матрицы 300х300
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Матрицы 500х500
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Вывод: Параллельный алгоритм работает быстрее только при наличии большого количества операций и данных. Если элементов не так много, то обычный алгоритм справляется быстрее. Также была обнаружено оптимальное количество потоков для лучшей работы обработки матриц 500х500 - 4 потока.
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
namespace RVIP_Lab5
|
|
||||||
{
|
|
||||||
public class Alg1
|
|
||||||
{
|
|
||||||
static int[,] MultiplyMatrices(int[,] matrix1, int[,] matrix2)
|
|
||||||
{
|
|
||||||
int rows1 = matrix1.GetLength(0);
|
|
||||||
int cols1 = matrix1.GetLength(1);
|
|
||||||
int cols2 = matrix2.GetLength(1);
|
|
||||||
|
|
||||||
int[,] result = new int[rows1, cols2];
|
|
||||||
|
|
||||||
for (int i = 0; i < rows1; i++)
|
|
||||||
{
|
|
||||||
for (int j = 0; j < cols2; j++)
|
|
||||||
{
|
|
||||||
for (int k = 0; k < cols1; k++)
|
|
||||||
{
|
|
||||||
result[i, j] += matrix1[i, k] * matrix2[k, j];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int[,] Begin(int[,] matrix1, int[,] matrix2)
|
|
||||||
{
|
|
||||||
int[,] result = MultiplyMatrices(matrix1, matrix2);
|
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
namespace RVIP_Lab5
|
|
||||||
{
|
|
||||||
public class Alg2
|
|
||||||
{
|
|
||||||
public int[,] Begin(int[,] matrix1, int[,] matrix2, int numThreads)
|
|
||||||
{
|
|
||||||
int rowsA = matrix1.GetLength(0);
|
|
||||||
int columnsA = matrix1.GetLength(1);
|
|
||||||
int rowsB = matrix2.GetLength(0);
|
|
||||||
int columnsB = matrix2.GetLength(1);
|
|
||||||
|
|
||||||
int[,] resultMatrix = new int[rowsA, columnsB];
|
|
||||||
|
|
||||||
int rowsPerThread = rowsA / numThreads;
|
|
||||||
|
|
||||||
Thread[] threads = new Thread[numThreads];
|
|
||||||
|
|
||||||
for (int i = 0; i < numThreads; i++)
|
|
||||||
{
|
|
||||||
int startRow = i * rowsPerThread;
|
|
||||||
int endRow = (i == numThreads - 1) ? rowsA : startRow + rowsPerThread;
|
|
||||||
threads[i] = new Thread(() => MultiplyRows(startRow, endRow, matrix1, matrix2, resultMatrix));
|
|
||||||
threads[i].Start();
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (Thread thread in threads)
|
|
||||||
{
|
|
||||||
thread.Join();
|
|
||||||
}
|
|
||||||
|
|
||||||
return resultMatrix;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void MultiplyRows(int startRow, int endRow, int[,] matrixA, int[,] matrixB, int[,] resultMatrix)
|
|
||||||
{
|
|
||||||
for (int i = startRow; i < endRow; i++)
|
|
||||||
{
|
|
||||||
for (int j = 0; j < matrixB.GetLength(1); j++)
|
|
||||||
{
|
|
||||||
int sum = 0;
|
|
||||||
for (int k = 0; k < matrixA.GetLength(1); k++)
|
|
||||||
{
|
|
||||||
sum += matrixA[i, k] * matrixB[k, j];
|
|
||||||
}
|
|
||||||
resultMatrix[i, j] = sum;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
using System.Drawing;
|
|
||||||
|
|
||||||
namespace RVIP_Lab5
|
|
||||||
{
|
|
||||||
public class Controller
|
|
||||||
{
|
|
||||||
public string PrintResultMatrix(int[,] result)
|
|
||||||
{
|
|
||||||
string resultString = "";
|
|
||||||
|
|
||||||
for (int i = 0; i < result.GetLength(0); i++)
|
|
||||||
{
|
|
||||||
for (int j = 0; j < result.GetLength(1); j++)
|
|
||||||
{
|
|
||||||
resultString += result[i, j];
|
|
||||||
if (j != result.GetLength(1) - 1)
|
|
||||||
{
|
|
||||||
resultString += " ";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
resultString += Environment.NewLine;
|
|
||||||
}
|
|
||||||
|
|
||||||
return resultString;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int[,] GetMatrixFromTextbox(string inputText)
|
|
||||||
{
|
|
||||||
string[] lines = inputText.Split(Environment.NewLine);
|
|
||||||
|
|
||||||
int numRows = lines.Length;
|
|
||||||
int numCol = lines[0].Split(' ').Length;
|
|
||||||
|
|
||||||
int[,] matrix = new int[numRows, numCol];
|
|
||||||
|
|
||||||
for (int i = 0; i < numRows; i++)
|
|
||||||
{
|
|
||||||
string[] elements = lines[i].Split(' ');
|
|
||||||
|
|
||||||
for (int j = 0; j < numCol; j++)
|
|
||||||
{
|
|
||||||
matrix[i, j] = int.Parse(elements[j]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return matrix;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetTextFromFile(string filePath)
|
|
||||||
{
|
|
||||||
string text = "";
|
|
||||||
|
|
||||||
using (StreamReader sr = new StreamReader(filePath))
|
|
||||||
{
|
|
||||||
text = sr.ReadToEnd();
|
|
||||||
}
|
|
||||||
|
|
||||||
return text;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int[,] GenerateNewMatrix(int count)
|
|
||||||
{
|
|
||||||
Random random = new Random();
|
|
||||||
|
|
||||||
int[,] matrix = new int[count, count];
|
|
||||||
|
|
||||||
for (int i = 0; i < count; i++)
|
|
||||||
{
|
|
||||||
for (int j = 0; j < count; j++)
|
|
||||||
{
|
|
||||||
matrix[i, j] = random.Next(1, 26);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return matrix;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
262
tasks/dunaev-oi/lab_5/RVIP_Lab5/Form1.Designer.cs
generated
262
tasks/dunaev-oi/lab_5/RVIP_Lab5/Form1.Designer.cs
generated
@@ -1,262 +0,0 @@
|
|||||||
namespace RVIP_Lab5
|
|
||||||
{
|
|
||||||
partial class Form1
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Required designer variable.
|
|
||||||
/// </summary>
|
|
||||||
private System.ComponentModel.IContainer components = null;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Clean up any resources being used.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
|
||||||
protected override void Dispose(bool disposing)
|
|
||||||
{
|
|
||||||
if (disposing && (components != null))
|
|
||||||
{
|
|
||||||
components.Dispose();
|
|
||||||
}
|
|
||||||
base.Dispose(disposing);
|
|
||||||
}
|
|
||||||
|
|
||||||
#region Windows Form Designer generated code
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Required method for Designer support - do not modify
|
|
||||||
/// the contents of this method with the code editor.
|
|
||||||
/// </summary>
|
|
||||||
private void InitializeComponent()
|
|
||||||
{
|
|
||||||
textBoxMatrix1 = new TextBox();
|
|
||||||
textBoxResult = new TextBox();
|
|
||||||
buttonAlg1 = new Button();
|
|
||||||
label1 = new Label();
|
|
||||||
textBoxMatrix2 = new TextBox();
|
|
||||||
label2 = new Label();
|
|
||||||
buttonAlg2 = new Button();
|
|
||||||
openFileDialog1 = new OpenFileDialog();
|
|
||||||
label3 = new Label();
|
|
||||||
labelResultTime = new Label();
|
|
||||||
label4 = new Label();
|
|
||||||
countStream = new NumericUpDown();
|
|
||||||
label5 = new Label();
|
|
||||||
genCountRowCol = new NumericUpDown();
|
|
||||||
button1 = new Button();
|
|
||||||
buttonGenerateMatrix2 = new Button();
|
|
||||||
buttonGenerateMatrix1 = new Button();
|
|
||||||
((System.ComponentModel.ISupportInitialize)countStream).BeginInit();
|
|
||||||
((System.ComponentModel.ISupportInitialize)genCountRowCol).BeginInit();
|
|
||||||
SuspendLayout();
|
|
||||||
//
|
|
||||||
// textBoxMatrix1
|
|
||||||
//
|
|
||||||
textBoxMatrix1.Location = new Point(12, 50);
|
|
||||||
textBoxMatrix1.Multiline = true;
|
|
||||||
textBoxMatrix1.Name = "textBoxMatrix1";
|
|
||||||
textBoxMatrix1.Size = new Size(258, 258);
|
|
||||||
textBoxMatrix1.TabIndex = 0;
|
|
||||||
//
|
|
||||||
// textBoxResult
|
|
||||||
//
|
|
||||||
textBoxResult.Location = new Point(768, 50);
|
|
||||||
textBoxResult.Multiline = true;
|
|
||||||
textBoxResult.Name = "textBoxResult";
|
|
||||||
textBoxResult.Size = new Size(258, 258);
|
|
||||||
textBoxResult.TabIndex = 1;
|
|
||||||
//
|
|
||||||
// buttonAlg1
|
|
||||||
//
|
|
||||||
buttonAlg1.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
|
|
||||||
buttonAlg1.Location = new Point(1080, 60);
|
|
||||||
buttonAlg1.Name = "buttonAlg1";
|
|
||||||
buttonAlg1.Size = new Size(258, 40);
|
|
||||||
buttonAlg1.TabIndex = 2;
|
|
||||||
buttonAlg1.Text = "Обычный алгоритм";
|
|
||||||
buttonAlg1.UseVisualStyleBackColor = true;
|
|
||||||
buttonAlg1.Click += buttonAlg1_Click;
|
|
||||||
//
|
|
||||||
// label1
|
|
||||||
//
|
|
||||||
label1.AutoSize = true;
|
|
||||||
label1.BackColor = Color.Transparent;
|
|
||||||
label1.Font = new Font("Segoe UI", 72F, FontStyle.Regular, GraphicsUnit.Point);
|
|
||||||
label1.Location = new Point(276, 117);
|
|
||||||
label1.Name = "label1";
|
|
||||||
label1.Size = new Size(111, 128);
|
|
||||||
label1.TabIndex = 3;
|
|
||||||
label1.Text = "X";
|
|
||||||
//
|
|
||||||
// textBoxMatrix2
|
|
||||||
//
|
|
||||||
textBoxMatrix2.Location = new Point(378, 50);
|
|
||||||
textBoxMatrix2.Multiline = true;
|
|
||||||
textBoxMatrix2.Name = "textBoxMatrix2";
|
|
||||||
textBoxMatrix2.Size = new Size(258, 258);
|
|
||||||
textBoxMatrix2.TabIndex = 4;
|
|
||||||
//
|
|
||||||
// label2
|
|
||||||
//
|
|
||||||
label2.AutoSize = true;
|
|
||||||
label2.BackColor = Color.Transparent;
|
|
||||||
label2.Font = new Font("Segoe UI", 72F, FontStyle.Regular, GraphicsUnit.Point);
|
|
||||||
label2.Location = new Point(642, 117);
|
|
||||||
label2.Name = "label2";
|
|
||||||
label2.Size = new Size(120, 128);
|
|
||||||
label2.TabIndex = 5;
|
|
||||||
label2.Text = "=";
|
|
||||||
//
|
|
||||||
// buttonAlg2
|
|
||||||
//
|
|
||||||
buttonAlg2.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
|
|
||||||
buttonAlg2.Location = new Point(1080, 117);
|
|
||||||
buttonAlg2.Name = "buttonAlg2";
|
|
||||||
buttonAlg2.Size = new Size(258, 39);
|
|
||||||
buttonAlg2.TabIndex = 8;
|
|
||||||
buttonAlg2.Text = "Паралелльный алгоритм";
|
|
||||||
buttonAlg2.UseVisualStyleBackColor = true;
|
|
||||||
buttonAlg2.Click += buttonAlg2_Click;
|
|
||||||
//
|
|
||||||
// openFileDialog1
|
|
||||||
//
|
|
||||||
openFileDialog1.FileName = "openFileDialog1";
|
|
||||||
//
|
|
||||||
// label3
|
|
||||||
//
|
|
||||||
label3.AutoSize = true;
|
|
||||||
label3.Font = new Font("Segoe UI", 15.75F, FontStyle.Regular, GraphicsUnit.Point);
|
|
||||||
label3.Location = new Point(574, 349);
|
|
||||||
label3.Name = "label3";
|
|
||||||
label3.Size = new Size(111, 30);
|
|
||||||
label3.TabIndex = 9;
|
|
||||||
label3.Text = "Результат:";
|
|
||||||
//
|
|
||||||
// labelResultTime
|
|
||||||
//
|
|
||||||
labelResultTime.AutoSize = true;
|
|
||||||
labelResultTime.Font = new Font("Segoe UI", 15.75F, FontStyle.Regular, GraphicsUnit.Point);
|
|
||||||
labelResultTime.Location = new Point(719, 349);
|
|
||||||
labelResultTime.Name = "labelResultTime";
|
|
||||||
labelResultTime.Size = new Size(0, 30);
|
|
||||||
labelResultTime.TabIndex = 10;
|
|
||||||
//
|
|
||||||
// label4
|
|
||||||
//
|
|
||||||
label4.AutoSize = true;
|
|
||||||
label4.Location = new Point(15, 394);
|
|
||||||
label4.Name = "label4";
|
|
||||||
label4.Size = new Size(123, 15);
|
|
||||||
label4.TabIndex = 12;
|
|
||||||
label4.Text = "Количество потоков:";
|
|
||||||
//
|
|
||||||
// countStream
|
|
||||||
//
|
|
||||||
countStream.Location = new Point(144, 392);
|
|
||||||
countStream.Maximum = new decimal(new int[] { 10, 0, 0, 0 });
|
|
||||||
countStream.Minimum = new decimal(new int[] { 1, 0, 0, 0 });
|
|
||||||
countStream.Name = "countStream";
|
|
||||||
countStream.Size = new Size(66, 23);
|
|
||||||
countStream.TabIndex = 13;
|
|
||||||
countStream.Value = new decimal(new int[] { 4, 0, 0, 0 });
|
|
||||||
//
|
|
||||||
// label5
|
|
||||||
//
|
|
||||||
label5.AutoSize = true;
|
|
||||||
label5.Location = new Point(15, 349);
|
|
||||||
label5.Name = "label5";
|
|
||||||
label5.Size = new Size(166, 15);
|
|
||||||
label5.TabIndex = 16;
|
|
||||||
label5.Text = "Размерность при генерации:";
|
|
||||||
//
|
|
||||||
// genCountRowCol
|
|
||||||
//
|
|
||||||
genCountRowCol.Location = new Point(187, 347);
|
|
||||||
genCountRowCol.Maximum = new decimal(new int[] { 1000, 0, 0, 0 });
|
|
||||||
genCountRowCol.Minimum = new decimal(new int[] { 2, 0, 0, 0 });
|
|
||||||
genCountRowCol.Name = "genCountRowCol";
|
|
||||||
genCountRowCol.Size = new Size(66, 23);
|
|
||||||
genCountRowCol.TabIndex = 17;
|
|
||||||
genCountRowCol.Value = new decimal(new int[] { 10, 0, 0, 0 });
|
|
||||||
//
|
|
||||||
// button1
|
|
||||||
//
|
|
||||||
button1.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point);
|
|
||||||
button1.Location = new Point(1080, 171);
|
|
||||||
button1.Name = "button1";
|
|
||||||
button1.Size = new Size(258, 46);
|
|
||||||
button1.TabIndex = 22;
|
|
||||||
button1.Text = "Очистить матрицы";
|
|
||||||
button1.UseVisualStyleBackColor = true;
|
|
||||||
button1.Click += button1_Click;
|
|
||||||
//
|
|
||||||
// buttonGenerateMatrix2
|
|
||||||
//
|
|
||||||
buttonGenerateMatrix2.Location = new Point(447, 12);
|
|
||||||
buttonGenerateMatrix2.Name = "buttonGenerateMatrix2";
|
|
||||||
buttonGenerateMatrix2.Size = new Size(122, 32);
|
|
||||||
buttonGenerateMatrix2.TabIndex = 15;
|
|
||||||
buttonGenerateMatrix2.Text = "Сгенерировать";
|
|
||||||
buttonGenerateMatrix2.UseVisualStyleBackColor = true;
|
|
||||||
buttonGenerateMatrix2.Click += buttonGenerateMatrix2_Click;
|
|
||||||
//
|
|
||||||
// buttonGenerateMatrix1
|
|
||||||
//
|
|
||||||
buttonGenerateMatrix1.Location = new Point(75, 12);
|
|
||||||
buttonGenerateMatrix1.Name = "buttonGenerateMatrix1";
|
|
||||||
buttonGenerateMatrix1.Size = new Size(122, 32);
|
|
||||||
buttonGenerateMatrix1.TabIndex = 14;
|
|
||||||
buttonGenerateMatrix1.Text = "Сгенерировать";
|
|
||||||
buttonGenerateMatrix1.UseVisualStyleBackColor = true;
|
|
||||||
buttonGenerateMatrix1.Click += buttonGenerateMatrix1_Click;
|
|
||||||
//
|
|
||||||
// Form1
|
|
||||||
//
|
|
||||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
|
||||||
AutoScaleMode = AutoScaleMode.Font;
|
|
||||||
ClientSize = new Size(1507, 446);
|
|
||||||
Controls.Add(button1);
|
|
||||||
Controls.Add(genCountRowCol);
|
|
||||||
Controls.Add(label5);
|
|
||||||
Controls.Add(buttonGenerateMatrix2);
|
|
||||||
Controls.Add(buttonGenerateMatrix1);
|
|
||||||
Controls.Add(countStream);
|
|
||||||
Controls.Add(label4);
|
|
||||||
Controls.Add(labelResultTime);
|
|
||||||
Controls.Add(label3);
|
|
||||||
Controls.Add(buttonAlg2);
|
|
||||||
Controls.Add(label2);
|
|
||||||
Controls.Add(textBoxMatrix2);
|
|
||||||
Controls.Add(label1);
|
|
||||||
Controls.Add(buttonAlg1);
|
|
||||||
Controls.Add(textBoxResult);
|
|
||||||
Controls.Add(textBoxMatrix1);
|
|
||||||
Name = "Form1";
|
|
||||||
Text = "Перемножение матриц: Дунаев О.И. ИСЭбд-41";
|
|
||||||
|
|
||||||
((System.ComponentModel.ISupportInitialize)countStream).EndInit();
|
|
||||||
((System.ComponentModel.ISupportInitialize)genCountRowCol).EndInit();
|
|
||||||
ResumeLayout(false);
|
|
||||||
PerformLayout();
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
private TextBox textBoxMatrix1;
|
|
||||||
private TextBox textBoxResult;
|
|
||||||
private Button buttonAlg1;
|
|
||||||
private Label label1;
|
|
||||||
private TextBox textBoxMatrix2;
|
|
||||||
private Label label2;
|
|
||||||
private Button buttonAlg2;
|
|
||||||
private OpenFileDialog openFileDialog1;
|
|
||||||
private Label label3;
|
|
||||||
private Label labelResultTime;
|
|
||||||
private Label label4;
|
|
||||||
private NumericUpDown countStream;
|
|
||||||
private Label label5;
|
|
||||||
private NumericUpDown genCountRowCol;
|
|
||||||
private Button button1;
|
|
||||||
private Button buttonGenerateMatrix2;
|
|
||||||
private Button buttonGenerateMatrix1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,121 +0,0 @@
|
|||||||
using System.Diagnostics;
|
|
||||||
|
|
||||||
namespace RVIP_Lab5
|
|
||||||
{
|
|
||||||
public partial class Form1 : Form
|
|
||||||
{
|
|
||||||
public Controller service;
|
|
||||||
public Alg1 Alg1;
|
|
||||||
public Alg2 Alg2;
|
|
||||||
public Stopwatch stopwatch;
|
|
||||||
public int[,] matrixA;
|
|
||||||
public int[,] matrixB;
|
|
||||||
|
|
||||||
public Form1()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
this.service = new Controller();
|
|
||||||
this.Alg1 = new Alg1();
|
|
||||||
this.Alg2 = new Alg2();
|
|
||||||
this.stopwatch = new Stopwatch();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void buttonAlg1_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
stopwatch.Start();
|
|
||||||
int[,] matrixResult = Alg1.Begin(matrixA, matrixB);
|
|
||||||
stopwatch.Stop();
|
|
||||||
|
|
||||||
labelResultTime.Text = "" + stopwatch.Elapsed;
|
|
||||||
|
|
||||||
|
|
||||||
textBoxResult.Text = service.PrintResultMatrix(matrixResult);
|
|
||||||
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
MessageBox.Show(ex.Message, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
||||||
}
|
|
||||||
stopwatch.Reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void buttonAlg2_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
stopwatch.Start();
|
|
||||||
int[,] matrixResult = Alg2.Begin(matrixA, matrixB, (int)countStream.Value);
|
|
||||||
stopwatch.Stop();
|
|
||||||
|
|
||||||
labelResultTime.Text = "" + stopwatch.Elapsed;
|
|
||||||
|
|
||||||
|
|
||||||
textBoxResult.Text = service.PrintResultMatrix(matrixResult);
|
|
||||||
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
MessageBox.Show(ex.Message, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
|
||||||
}
|
|
||||||
stopwatch.Reset();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void buttonLoadMatrix1_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
openFileDialog1.ShowDialog();
|
|
||||||
string filePath = openFileDialog1.FileName;
|
|
||||||
string result = service.GetTextFromFile(filePath);
|
|
||||||
|
|
||||||
|
|
||||||
textBoxMatrix1.Text = result;
|
|
||||||
|
|
||||||
matrixA = service.GetMatrixFromTextbox(result);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void buttonLoadMatrix2_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
openFileDialog1.ShowDialog();
|
|
||||||
string filePath = openFileDialog1.FileName;
|
|
||||||
string result = service.GetTextFromFile(filePath);
|
|
||||||
|
|
||||||
textBoxMatrix2.Text = result;
|
|
||||||
|
|
||||||
matrixB = service.GetMatrixFromTextbox(result);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void buttonGenerateMatrix1_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
matrixA = service.GenerateNewMatrix((int)genCountRowCol.Value);
|
|
||||||
|
|
||||||
|
|
||||||
textBoxMatrix1.Text = service.PrintResultMatrix(matrixA);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void buttonGenerateMatrix2_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
matrixB = service.GenerateNewMatrix((int)genCountRowCol.Value);
|
|
||||||
|
|
||||||
|
|
||||||
textBoxMatrix2.Text = service.PrintResultMatrix(matrixB);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void button1_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
textBoxMatrix1.Text = "";
|
|
||||||
textBoxMatrix2.Text = "";
|
|
||||||
textBoxResult.Text = "";
|
|
||||||
matrixA = null;
|
|
||||||
matrixB = null;
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,123 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<root>
|
|
||||||
<!--
|
|
||||||
Microsoft ResX Schema
|
|
||||||
|
|
||||||
Version 2.0
|
|
||||||
|
|
||||||
The primary goals of this format is to allow a simple XML format
|
|
||||||
that is mostly human readable. The generation and parsing of the
|
|
||||||
various data types are done through the TypeConverter classes
|
|
||||||
associated with the data types.
|
|
||||||
|
|
||||||
Example:
|
|
||||||
|
|
||||||
... ado.net/XML headers & schema ...
|
|
||||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
|
||||||
<resheader name="version">2.0</resheader>
|
|
||||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
|
||||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
|
||||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
|
||||||
<data name="Color1" type="System.Drawing.Color, System.Drawing"">Blue</data>
|
|
||||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
|
||||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
|
||||||
</data>
|
|
||||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
|
||||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
|
||||||
<comment>This is a comment</comment>
|
|
||||||
</data>
|
|
||||||
|
|
||||||
There are any number of "resheader" rows that contain simple
|
|
||||||
name/value pairs.
|
|
||||||
|
|
||||||
Each data row contains a name, and value. The row also contains a
|
|
||||||
type or mimetype. Type corresponds to a .NET class that support
|
|
||||||
text/value conversion through the TypeConverter architecture.
|
|
||||||
Classes that don't support this are serialized and stored with the
|
|
||||||
mimetype set.
|
|
||||||
|
|
||||||
The mimetype is used for serialized objects, and tells the
|
|
||||||
ResXResourceReader how to depersist the object. This is currently not
|
|
||||||
extensible. For a given mimetype the value must be set accordingly:
|
|
||||||
|
|
||||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
|
||||||
that the ResXResourceWriter will generate, however the reader can
|
|
||||||
read any of the formats listed below.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.binary.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.soap.base64
|
|
||||||
value : The object must be serialized with
|
|
||||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
|
|
||||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
|
||||||
value : The object must be serialized into a byte array
|
|
||||||
: using a System.ComponentModel.TypeConverter
|
|
||||||
: and then encoded with base64 encoding.
|
|
||||||
-->
|
|
||||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:choice maxOccurs="unbounded">
|
|
||||||
<xsd:element name="metadata">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
|
||||||
<xsd:attribute ref="xml:space" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="assembly">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:attribute name="alias" type="xsd:string" />
|
|
||||||
<xsd:attribute name="name" type="xsd:string" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="data">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
|
||||||
<xsd:attribute ref="xml:space" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
<xsd:element name="resheader">
|
|
||||||
<xsd:complexType>
|
|
||||||
<xsd:sequence>
|
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
|
||||||
</xsd:sequence>
|
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:choice>
|
|
||||||
</xsd:complexType>
|
|
||||||
</xsd:element>
|
|
||||||
</xsd:schema>
|
|
||||||
<resheader name="resmimetype">
|
|
||||||
<value>text/microsoft-resx</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="version">
|
|
||||||
<value>2.0</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="reader">
|
|
||||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
<resheader name="writer">
|
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
|
||||||
</resheader>
|
|
||||||
<metadata name="openFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
|
||||||
<value>7, 19</value>
|
|
||||||
</metadata>
|
|
||||||
</root>
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
namespace RVIP_Lab5
|
|
||||||
{
|
|
||||||
internal static class Program
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// The main entry point for the application.
|
|
||||||
/// </summary>
|
|
||||||
[STAThread]
|
|
||||||
static void Main()
|
|
||||||
{
|
|
||||||
// To customize application configuration such as set high DPI settings or default font,
|
|
||||||
// see https://aka.ms/applicationconfiguration.
|
|
||||||
ApplicationConfiguration.Initialize();
|
|
||||||
Application.Run(new Form1());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<OutputType>WinExe</OutputType>
|
|
||||||
<TargetFramework>net6.0-windows</TargetFramework>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
<UseWindowsForms>true</UseWindowsForms>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 41 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 41 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 54 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 56 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 56 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB |
Reference in New Issue
Block a user